From 30f874a2d13dfe5601d94007004dab0d677b1ab2 Mon Sep 17 00:00:00 2001 From: Alexander Georgievskiy Date: Tue, 7 Mar 2017 02:48:12 +0300 Subject: [PATCH 1/2] Mixed --- .travis.yml | 8 +------- test/travis.sh | 5 +++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f92c74eaa9be..915c0d6a697f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 + - TEST=mixed diff --git a/test/travis.sh b/test/travis.sh index 782aee094bd1..7aed293688bc 100755 --- a/test/travis.sh +++ b/test/travis.sh @@ -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/&\n&g' | grep -v '*' | xargs -n1 -i bash -c 'check-mixed-content --depth=1 --url {} || exit 255'" + fi fi exit 0 From 59e1a892625661ac365f1ed875be285a99e06cc5 Mon Sep 17 00:00:00 2001 From: Alexander Georgievskiy Date: Tue, 7 Mar 2017 21:14:29 +0000 Subject: [PATCH 2/2] Show all domains --- src/chrome/content/rules/freerunet.ru.xml | 2 +- test/travis.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/freerunet.ru.xml b/src/chrome/content/rules/freerunet.ru.xml index e2e1604fa321..e93e6fbbbc40 100644 --- a/src/chrome/content/rules/freerunet.ru.xml +++ b/src/chrome/content/rules/freerunet.ru.xml @@ -1,7 +1,7 @@ - + diff --git a/test/travis.sh b/test/travis.sh index 7aed293688bc..ef66b1594ac9 100755 --- a/test/travis.sh +++ b/test/travis.sh @@ -82,7 +82,7 @@ if [ "$RULESETS_CHANGED" ]; then 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/&\n&g' | grep -v '*' | xargs -n1 -i bash -c 'check-mixed-content --depth=1 --url {} || exit 255'" + 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/&\n&g' | grep -v '*' | xargs -n1 -i bash -c 'check-mixed-content --depth=1 --url {}' | grep ' has active mixed content!' && exit 1" fi fi