Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,4 @@ services:
script:
- test/travis.sh
env:
- TEST=firefox FIREFOX=firefox-dev
- TEST=firefox FIREFOX=firefox-latest
- TEST=firefox FIREFOX=firefox-esr-latest
- TEST=chromium
- TEST=rules
- TEST=fetch
- TEST=preloaded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

- TEST=mixed
2 changes: 1 addition & 1 deletion src/chrome/content/rules/freerunet.ru.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
www.freerunet.ru self signed
-->
<ruleset name="freerunet.ru" platform="mixedcontent">
<ruleset name="freerunet.ru">

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's keep changes granular. this belongs in another PR

<target host="freerunet.ru" />
<target host="www.freerunet.ru" />

Expand Down
5 changes: 5 additions & 0 deletions test/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ if [ "$RULESETS_CHANGED" ]; then
docker run --rm -ti -v $(pwd):/opt -e RULESETS_CHANGED="$RULESETS_CHANGED" node bash -c "cd /opt/utils/hsts-prune && npm install && node index.js"
[ `git diff --name-only | wc -l` -eq 0 ]
fi

if [ "$TEST" == "mixed" ]; then
echo >&2 "Ensuring rulesets do not introduce targets containing active mixed content."
docker run --rm -ti -v $(pwd):/opt -e RULESETS_CHANGED="$RULESETS_CHANGED" node bash -c "cd /opt && apt-get update && apt-get install -y libxml2-utils && npm install -g galeksandrp/check-mixed-content#245e56ad5fd5412bdad986276911e5460d9e48c6 && xmllint --xpath '//ruleset[not(@platform)]/target' $RULESETS_CHANGED | grep -q -v '^$' || exit 0 && xmllint --xpath '//ruleset[not(@platform)]/target' $RULESETS_CHANGED | sed 's/<target host=\"//g' | sed 's&\"/>&\n&g' | grep -v '*' | xargs -n1 -i bash -c 'check-mixed-content --depth=1 --url {}' | grep ' has active mixed content!' && exit 1"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This belongs in a utils/ subpath, as we've done before for other tests.

fi
fi

exit 0