Skip to content

Commit 5d97e37

Browse files
author
Mike Taylor
committed
Issue #942. Update Travis to use Firefox 44 and Selenium server 2.52.0.
Also update docs in CONTRIBUTING.md
1 parent 2e3d967 commit 5d97e37

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cache:
1414
- $HOME/.selenium/
1515

1616
addons:
17-
firefox: "42.0"
17+
firefox: "44.0"
1818

1919
env:
2020
global:
@@ -25,8 +25,8 @@ env:
2525
before_install:
2626
- "export DISPLAY=:99.0"
2727
- "sh -e /etc/init.d/xvfb start"
28-
- "mkdir -p $HOME/.selenium && cd $HOME/.selenium && wget -nc http://selenium-release.storage.googleapis.com/2.48/selenium-server-standalone-2.48.0.jar"
29-
- java -jar selenium-server-standalone-2.48.0.jar &> /dev/null &
28+
- "mkdir -p $HOME/.selenium && cd $HOME/.selenium && wget -nc http://selenium-release.storage.googleapis.com/2.52/selenium-server-standalone-2.52.0.jar"
29+
- java -jar selenium-server-standalone-2.52.0.jar &> /dev/null &
3030
- cd -
3131

3232
install:

CONTRIBUTING.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Note: If you install Python on Windows using the MSI installer, it is highly rec
196196
197197
Windows typically doesn't have the *make* tool installed. Windows users without *make* should look at the "detailed setup" section below.
198198
199-
As an alternative to Windows, a cloud IDE such as [Cloud 9](https://c9.io) can be used for a relatively easier setup. If you take this route, please update to the latest Python version with the following. (This is to avoid `InsecurePlatformWarning` errors that arise when the default Python 2.7.6 is used).
199+
As an alternative to Windows, a cloud IDE such as [Cloud 9](https://c9.io) can be used for a relatively easier setup. If you take this route, please update to the latest Python version with the following. (This is to avoid `InsecurePlatformWarning` errors that arise when the default Python 2.7.6 is used).
200200
201201
```
202202
sudo apt-add-repository ppa:fkrull/deadsnakes-python2.7
@@ -385,9 +385,12 @@ We use [Intern](http://theintern.io/) to run functional tests.
385385
To run them, make sure you download the Selenium standalone server from the repo root:
386386
387387
``` bash
388-
wget http://selenium-release.storage.googleapis.com/2.46/selenium-server-standalone-2.46.0.jar
388+
wget http://selenium-release.storage.googleapis.com/2.52/selenium-server-standalone-2.52.0.jar
389389
```
390390
391+
**Note: This version is known to work with Firefox 44. If things aren't working with the current stable version of Firefox, check to see
392+
if there isn't a newer version of the Selenium standalone server and file a bug on these docs!**
393+
391394
The `firefox` binary will also need to be in your `PATH`. Here's how this can be done on OS X:
392395
393396
``` bash
@@ -397,7 +400,7 @@ export PATH="/Applications/Firefox.app/Contents/MacOS/:$PATH"
397400
Now start Selenium:
398401
399402
``` bash
400-
java -jar selenium-server-standalone-2.46.0.jar
403+
java -jar selenium-server-standalone-2.52.0.jar
401404
```
402405
403406
In a separate terminal window or tab, start the application servers:

tests/intern.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Learn more about configuring this file at <https://github.com/theintern/intern/wiki/Configuring-Intern>.
66
// These default settings work OK for most people. The options that *must* be changed below are the
77
// packages, suites, excludeInstrumentation, and (if you want functional tests) functionalSuites.
8-
define(['intern/lib/args'], function (args) {
8+
define(['intern/lib/args'], function(args) {
99
'use strict';
1010

1111
var siteRoot = args.siteRoot ? args.siteRoot : 'http://localhost:5000';
@@ -15,8 +15,8 @@ define(['intern/lib/args'], function (args) {
1515
wc: {
1616
pageLoadTimeout: args.wcPageLoadTimeout ? parseInt(args.wcPageLoadTimeout, 10) : 10000,
1717
// user and pw need to be passed in as command-line arguments. See CONTRIBUTING.md
18-
user: args.user || "some username",
19-
pw: args.pw || "some password"
18+
user: args.user || 'some username',
19+
pw: args.pw || 'some password'
2020
},
2121

2222
// The port on which the instrumenting proxy will listen

0 commit comments

Comments
 (0)