From 782a46c1d8d91bbdb36db57ab6efca0a025a0a09 Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Sun, 27 Dec 2015 16:38:00 -0800 Subject: [PATCH 1/4] Allow custom path to Firefox. This allows specifying, e.g. Nightly or Developer Edition even if it's not your default Firefox. --- test/firefox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/firefox.sh b/test/firefox.sh index 674981c02d80..7778ff8fedb2 100755 --- a/test/firefox.sh +++ b/test/firefox.sh @@ -64,7 +64,7 @@ if [ "$1" == "--justrun" ]; then if [ $(uname) == Darwin ]; then open /Applications/Firefox.app --wait-apps --new --args -no-remote -profile "$PROFILE_DIRECTORY" "$@" else - firefox -no-remote -profile "$PROFILE_DIRECTORY" "$@" + ${FIREFOX:-firefox} -no-remote -profile "$PROFILE_DIRECTORY" "$@" fi else echo "running tests" From 07fb3ee8f00df4b8f87572ac4e5850cd5f6646d1 Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Sun, 27 Dec 2015 18:22:15 -0800 Subject: [PATCH 2/4] Update extensions.json. Without this, the profile brought up by test.sh has HTTPSE disabled by default. This changes makes it enabled by default. --- .../test_profile_skeleton/extensions.json | 77 ++++++++++--------- test/rules | 2 +- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/test/firefox/test_profile_skeleton/extensions.json b/test/firefox/test_profile_skeleton/extensions.json index 0d38b54ae368..cca45485fb69 100644 --- a/test/firefox/test_profile_skeleton/extensions.json +++ b/test/firefox/test_profile_skeleton/extensions.json @@ -1,38 +1,43 @@ { - "addons": [ - { - "aboutURL": "chrome://https-everywhere/content/about.xul", - "active": false, - "appDisabled": false, - "applyBackgroundUpdates": 1, - "bootstrap": false, - "defaultLocale": { - "creator": "Mike Perry & Peter Eckersley", - "description": "Encrypt the Web! Automatically use HTTPS security on many sites.", - "homepageURL": "https://www.eff.org/https-everywhere", - "name": "HTTPS-Everywhere" - }, - "foreignInstall": true, - "hasBinaryComponents": false, - "icon64URL": null, - "iconURL": "chrome://https-everywhere/skin/https-everywhere.png", - "id": "https-everywhere-eff@eff.org", - "installDate": 1407525887000, - "internalName": null, - "locales": [], - "location": "app-profile", - "optionsType": null, - "optionsURL": "chrome://https-everywhere/content/meta-preferences.xul", - "releaseNotesURI": null, - "size": 5133044, - "softDisabled": false, - "sourceURI": null, - "strictCompatibility": false, - "syncGUID": "PbynBLfrwhTP", - "targetPlatforms": [], - "type": "extension", - "userDisabled": false, - "visible": true - }], - "schemaVersion": 16 + "addons": [ + { + "aboutURL": "chrome://https-everywhere/content/about.xul", + "active": true, + "appDisabled": false, + "applyBackgroundUpdates": 1, + "bootstrap": false, + "defaultLocale": { + "creator": "EFF Technologists", + "description": "Encrypt the Web! Automatically use HTTPS security on many sites.", + "homepageURL": "https://www.eff.org/https-everywhere", + "name": "HTTPS-Everywhere" + }, + "descriptor": "/tmp/tmp.KvR5nzzEal/extensions/https-everywhere-eff@eff.org", + "foreignInstall": false, + "hasBinaryComponents": false, + "icon64URL": null, + "iconURL": "chrome://https-everywhere/skin/https-everywhere.png", + "icons": {}, + "id": "https-everywhere-eff@eff.org", + "installDate": 1451269062000, + "internalName": null, + "locales": [], + "location": "app-profile", + "multiprocessCompatible": true, + "optionsType": null, + "optionsURL": "chrome://https-everywhere/content/observatory-preferences.xul", + "releaseNotesURI": null, + "signedState": 1, + "size": 9460335, + "skinnable": false, + "softDisabled": false, + "strictCompatibility": false, + "syncGUID": "L3vNFuFgQJ4m", + "type": "extension", + "updateDate": 1451269062000, + "userDisabled": false, + "visible": true + } + ], + "schemaVersion": 17 } diff --git a/test/rules b/test/rules index 73d84b434c4a..e72434652f2e 160000 --- a/test/rules +++ b/test/rules @@ -1 +1 @@ -Subproject commit 73d84b434c4ab400f79fa6d8244300ec7630edb1 +Subproject commit e72434652f2e943fddda3d2ba54c79a67c3ab00a From b523cc97040aa8a93df698677c69d744d083eb22 Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Sun, 27 Dec 2015 18:29:50 -0800 Subject: [PATCH 3/4] Correct path to chromium test README. --- test/chromium/script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/chromium/script.py b/test/chromium/script.py index edfe746543e9..2a7872fc45a3 100644 --- a/test/chromium/script.py +++ b/test/chromium/script.py @@ -49,7 +49,7 @@ class bcolors: error = e.__str__() if "executable needs to be in PATH" in e.__str__(): - print "ChromeDriver isn't installed. Check test/chrome/README.md " \ + print "ChromeDriver isn't installed. Check test/chromium/README.md " \ "for instructions on how to install ChromeDriver" sys.exit(2) From 792b9e3faa1bece18ac25f750603b50bf080944c Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Sun, 27 Dec 2015 18:31:32 -0800 Subject: [PATCH 4/4] Make Firefox use latest in Travis. --- .travis.yml | 2 +- translations | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9103d21ee1e0..fa5dd011c4db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ addons: - python-lxml - python-software-properties - chromium-browser - firefox: "40.0" + firefox: "latest" virtualenv: system_site_packages: true install: diff --git a/translations b/translations index d2f2597874bc..f81d74fab705 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit d2f2597874bcd8408e0ca84e1bab37445eef0f5a +Subproject commit f81d74fab705af7493eda23b7e7daff2d64f5b55