github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6807 from elastic/jasper/backport/6792/6802/4.2

Browse source 
[backport] PR #6792 to 4.2
This commit is contained in:
Court Ewing 2016-04-15 10:28:06 -04:00
commit 738b2c1138
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tasks/config/downloadSelenium.js
View file

@ -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')
}
}

4
tasks/config/run.js
View file

@ -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
]
@ -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
]

2
test/intern.js
View file

@ -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: [{