Skip to content

Commit 1a63532

Browse files
mivtachyahuJohn Doherty
authored and
John Doherty
committed
Updated geckodriver version, selenium-webdriver (#74)
* Updated geckodriver version, selenium-webdriver and firefox version for shippable For geckodriver driver.quit is redundant after driver.close in single window * Fixing typo * Adding firefox switch on driver.quit()
1 parent c56e235 commit 1a63532

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
"electron-prebuilt": "^1.4.13",
5252
"eyes.selenium": "0.0.72",
5353
"fs-plus": "2.9.1",
54-
"geckodriver": "1.1.2",
54+
"geckodriver": "^1.12.2",
5555
"merge": "1.2.0",
5656
"phantomjs-prebuilt": "2.1.12",
5757
"require-dir": "0.3.2",
58-
"selenium-webdriver": "3.0.0"
58+
"selenium-webdriver": "3.5.0"
5959
},
6060
"devDependencies": {
6161
"eslint": "^3.19.0",

runtime/world.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -219,16 +219,16 @@ module.exports = function () {
219219

220220
// executed after each scenario (always closes the browser to ensure fresh tests)
221221
this.After(function (scenario) {
222-
223222
if (scenario.isFailed() && !global.noScreenshot) {
224-
225223
// add a screenshot to the error report
226224
return driver.takeScreenshot().then(function (screenShot) {
227225

228226
scenario.attach(new Buffer(screenShot, 'base64'), 'image/png');
229-
227+
// firefox quits on driver.close on the last window
230228
return driver.close().then(function () {
231-
return driver.quit();
229+
if (browserName !== 'firefox'){
230+
return driver.quit();
231+
}
232232
})
233233
.then(function() {
234234

@@ -241,9 +241,11 @@ module.exports = function () {
241241
});
242242
});
243243
}
244-
244+
// firefox quits on driver.close on the last window
245245
return driver.close().then(function () {
246-
return driver.quit();
246+
if (browserName !== 'firefox'){
247+
return driver.quit();
248+
}
247249
})
248250
});
249251
};

shippable.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ node_js:
44
- 6.9.0
55

66
addons:
7-
firefox: "49.0"
7+
firefox: "57.0"
88

99
env:
1010
global:

0 commit comments

Comments
 (0)