Skip to content

Commit 2f85fed

Browse files
jshajsha
committed
Merge pull request EFForg#3854 from EFForg/firefox-latest2
Make Firefox run on the latest version in Travis.
2 parents 99feb73 + 944c7df commit 2f85fed

File tree

5 files changed

+49
-42
lines changed

5 files changed

+49
-42
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,22 @@ addons:
1717
- python-lxml
1818
- python-software-properties
1919
- chromium-browser
20-
firefox: "40.0"
2120
virtualenv:
2221
system_site_packages: true
2322
install:
2423
- pip install -r test/rules/requirements.txt
2524
- pip install -r test/chromium/requirements.txt
2625
env:
27-
- DISPLAY=':99.0'
26+
- FIREFOX_VERSION=firefox-latest
27+
- FIREFOX_VERSION=firefox-esr-latest
2828
before_script:
29-
- export DISPLAY=:99.0
3029
- sh -e /etc/init.d/xvfb start
3130
- wget https://chromedriver.storage.googleapis.com/2.20/chromedriver_linux64.zip
3231
- unzip chromedriver_linux64.zip
3332
- mv chromedriver test/chromium/chromedriver
33+
- wget -O /tmp/firefox.tar.bz2 'https://download.mozilla.org/?os=linux64&lang=en-US&product='$FIREFOX_VERSION
34+
- tar xpjf /tmp/firefox.tar.bz2
35+
- export DISPLAY=:99.0 FIREFOX=$PWD/firefox/firefox
3436
script:
3537
- ./test.sh
3638
sudo: required

‎test/firefox.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if [ "$1" == "--justrun" ]; then
6464
if [ $(uname) == Darwin ]; then
6565
open /Applications/Firefox.app --wait-apps --new --args -no-remote -profile "$PROFILE_DIRECTORY" "$@"
6666
else
67-
firefox -no-remote -profile "$PROFILE_DIRECTORY" "$@"
67+
${FIREFOX:-firefox} -no-remote -profile "$PROFILE_DIRECTORY" "$@"
6868
fi
6969
else
7070
echo "running tests"

‎test/firefox/test_profile_skeleton/extensions.json‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,43 @@
11
{
2-
"addons": [
3-
{
4-
"aboutURL": "chrome://https-everywhere/content/about.xul",
5-
"active": false,
6-
"appDisabled": false,
7-
"applyBackgroundUpdates": 1,
8-
"bootstrap": false,
9-
"defaultLocale": {
10-
"creator": "Mike Perry & Peter Eckersley",
11-
"description": "Encrypt the Web! Automatically use HTTPS security on many sites.",
12-
"homepageURL": "https://www.eff.org/https-everywhere",
13-
"name": "HTTPS-Everywhere"
14-
},
15-
"foreignInstall": true,
16-
"hasBinaryComponents": false,
17-
"icon64URL": null,
18-
"iconURL": "chrome://https-everywhere/skin/https-everywhere.png",
19-
"id": "https-everywhere-eff@eff.org",
20-
"installDate": 1407525887000,
21-
"internalName": null,
22-
"locales": [],
23-
"location": "app-profile",
24-
"optionsType": null,
25-
"optionsURL": "chrome://https-everywhere/content/meta-preferences.xul",
26-
"releaseNotesURI": null,
27-
"size": 5133044,
28-
"softDisabled": false,
29-
"sourceURI": null,
30-
"strictCompatibility": false,
31-
"syncGUID": "PbynBLfrwhTP",
32-
"targetPlatforms": [],
33-
"type": "extension",
34-
"userDisabled": false,
35-
"visible": true
36-
}],
37-
"schemaVersion": 16
2+
"addons": [
3+
{
4+
"aboutURL": "chrome://https-everywhere/content/about.xul",
5+
"active": true,
6+
"appDisabled": false,
7+
"applyBackgroundUpdates": 1,
8+
"bootstrap": false,
9+
"defaultLocale": {
10+
"creator": "EFF Technologists",
11+
"description": "Encrypt the Web! Automatically use HTTPS security on many sites.",
12+
"homepageURL": "https://www.eff.org/https-everywhere",
13+
"name": "HTTPS-Everywhere"
14+
},
15+
"descriptor": "/tmp/tmp.KvR5nzzEal/extensions/https-everywhere-eff@eff.org",
16+
"foreignInstall": false,
17+
"hasBinaryComponents": false,
18+
"icon64URL": null,
19+
"iconURL": "chrome://https-everywhere/skin/https-everywhere.png",
20+
"icons": {},
21+
"id": "https-everywhere-eff@eff.org",
22+
"installDate": 1451269062000,
23+
"internalName": null,
24+
"locales": [],
25+
"location": "app-profile",
26+
"multiprocessCompatible": true,
27+
"optionsType": null,
28+
"optionsURL": "chrome://https-everywhere/content/observatory-preferences.xul",
29+
"releaseNotesURI": null,
30+
"signedState": 1,
31+
"size": 9460335,
32+
"skinnable": false,
33+
"softDisabled": false,
34+
"strictCompatibility": false,
35+
"syncGUID": "L3vNFuFgQJ4m",
36+
"type": "extension",
37+
"updateDate": 1451269062000,
38+
"userDisabled": false,
39+
"visible": true
40+
}
41+
],
42+
"schemaVersion": 17
3843
}

‎test/rules‎

Submodule rules updated from 73d84b4 to e724346

‎translations‎

Submodule translations updated from d2f2597 to f81d74f

0 commit comments

Comments
 (0)