Skip to content

Commit

Permalink
Merge pull request #6805 from elastic/jasper/backport/6792/6802/4.4
Browse files Browse the repository at this point in the history
[backport] PR #6792 to 4.4
  • Loading branch information
LeeDr committed Apr 6, 2016
2 parents 79b0d6b + c4a0c05 commit af1035f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions tasks/config/downloadSelenium.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ module.exports = function (grunt) {
return {
options: {
selenium: {
filename: 'selenium-server-standalone-2.48.2.jar',
server: 'https://selenium-release.storage.googleapis.com/2.48/',
md5: 'b2784fc67c149d3c13c83d2108104689',
filename: 'selenium-server-standalone-2.53.0.jar',
server: 'https://selenium-release.storage.googleapis.com/2.53/',
md5: '774efe2d84987fb679f2dea038c2fa32',
directory: path.join(grunt.config.get('root'), 'selenium')
}
}
Expand Down
4 changes: 2 additions & 2 deletions tasks/config/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ module.exports = function (grunt) {
cmd: 'java',
args: [
'-jar',
'selenium/selenium-server-standalone-2.48.2.jar',
'selenium/selenium-server-standalone-2.53.0.jar',
'-port',
uiConfig.servers.webdriver.port
]
Expand All @@ -104,7 +104,7 @@ module.exports = function (grunt) {
cmd: 'java',
args: [
'-jar',
'selenium/selenium-server-standalone-2.48.2.jar',
'selenium/selenium-server-standalone-2.53.0.jar',
'-port',
uiConfig.servers.webdriver.port
]
Expand Down
2 changes: 1 addition & 1 deletion test/intern.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ define(function (require) {
return _.assign({
debug: true,
capabilities: {
'selenium-version': '2.48.2',
'selenium-version': '2.53.0',
'idle-timeout': 99
},
environments: [{
Expand Down

0 comments on commit af1035f

Please sign in to comment.