Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Make Firefox run on the latest version in Travis. #3854

Merged
jsha merged 1 commit into from
Jan 14, 2016
Merged

Make Firefox run on the latest version in Travis. #3854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/firefox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
77 changes: 41 additions & 36 deletions test/firefox/test_profile_skeleton/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion test/rules
Open in desktop
Submodule rules updated 0 files
2 changes: 1 addition & 1 deletion translations
Open in desktop
Submodule translations updated from d2f259 to f81d74