From 944c7df11d2d589e7c344dc2a87f994c65365ebb Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Mon, 11 Jan 2016 18:57:27 -0800
Subject: [PATCH] Make Firefox run on latest and latest-esr in Travis.

---
 .travis.yml                                   |  8 +-
 test/firefox.sh                               |  2 +-
 .../test_profile_skeleton/extensions.json     | 77 ++++++++++---------
 test/rules                                    |  2 +-
 translations                                  |  2 +-
 5 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bafca35c3760..38a58c558436 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,20 +17,22 @@ addons:
       - python-lxml
       - python-software-properties
       - chromium-browser
-  firefox: "40.0"
 virtualenv:
   system_site_packages: true
 install:
   - pip install -r test/rules/requirements.txt
   - pip install -r test/chromium/requirements.txt
 env:
-  - DISPLAY=':99.0'
+  - FIREFOX_VERSION=firefox-latest
+  - FIREFOX_VERSION=firefox-esr-latest
 before_script:
-  - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - wget https://chromedriver.storage.googleapis.com/2.12/chromedriver_linux64.zip
   - unzip chromedriver_linux64.zip
   - mv chromedriver test/chromium/chromedriver
+  - wget -O /tmp/firefox.tar.bz2 'https://download.mozilla.org/?os=linux64&lang=en-US&product='$FIREFOX_VERSION
+  - tar xpjf /tmp/firefox.tar.bz2
+  - export DISPLAY=:99.0 FIREFOX=$PWD/firefox/firefox
 script:
   - ./test.sh
 sudo: required
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"
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
diff --git a/translations b/translations
index d2f2597874bc..f81d74fab705 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d2f2597874bcd8408e0ca84e1bab37445eef0f5a
+Subproject commit f81d74fab705af7493eda23b7e7daff2d64f5b55