Skip to content

Commit 24604e7

Browse files
committed
bump dependencies
1 parent 438b517 commit 24604e7

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

build/nightwatch.config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ module.exports = {
77

88
'selenium': {
99
'start_process': true,
10-
'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.53.1.jar',
10+
'server_path': 'node_modules/selenium-server/lib/runner/selenium-server-standalone-3.0.1.jar',
1111
'host': '127.0.0.1',
1212
'port': 4444,
1313
'cli_args': {
1414
'webdriver.chrome.driver': require('chromedriver').path
15+
// , 'webdriver.gecko.driver': require('geckodriver').path
1516
}
1617
},
1718

@@ -40,7 +41,8 @@ module.exports = {
4041
'desiredCapabilities': {
4142
'browserName': 'firefox',
4243
'javascriptEnabled': true,
43-
'acceptSslCerts': true
44+
'acceptSslCerts': true,
45+
'marionette': true
4446
}
4547
},
4648

package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,27 @@
5858
"homepage": "https://github.com/vuejs/vue#readme",
5959
"devDependencies": {
6060
"babel-core": "^6.9.0",
61-
"babel-eslint": "^6.0.4",
61+
"babel-eslint": "^7.1.0",
6262
"babel-loader": "^6.2.4",
6363
"babel-plugin-coverage": "^1.0.0",
6464
"babel-preset-es2015": "^6.9.0",
6565
"babel-preset-flow-vue": "^1.0.0",
6666
"buble": "^0.14.0",
6767
"chromedriver": "^2.21.2",
6868
"codecov.io": "^0.1.6",
69-
"cross-spawn": "^4.0.0",
69+
"cross-spawn": "^5.0.1",
7070
"de-indent": "^1.0.2",
71-
"es6-promise": "^3.2.1",
72-
"eslint": "^3.4.0",
73-
"eslint-config-vue": "^2.0.0",
71+
"es6-promise": "^4.0.5",
72+
"eslint": "^3.10.1",
73+
"eslint-config-vue": "^2.0.1",
7474
"eslint-loader": "^1.3.0",
7575
"eslint-plugin-flowtype": "^2.16.0",
7676
"eslint-plugin-vue": "^1.0.0",
7777
"flow-bin": "^0.33.0",
7878
"he": "^1.1.0",
7979
"http-server": "^0.9.0",
80-
"jasmine": "2.4.x",
81-
"jasmine-core": "2.4.x",
80+
"jasmine": "^2.5.2",
81+
"jasmine-core": "^2.5.2",
8282
"karma": "^1.1.0",
8383
"karma-chrome-launcher": "^2.0.0",
8484
"karma-coverage": "^1.0.0",
@@ -90,8 +90,8 @@
9090
"karma-sauce-launcher": "^1.0.0",
9191
"karma-sourcemap-loader": "^0.3.0",
9292
"karma-webpack": "^1.7.0",
93-
"lodash": "^4.13.1",
94-
"nightwatch": "^0.9.0",
93+
"lodash": "^4.17.1",
94+
"nightwatch": "^0.9.9",
9595
"nightwatch-helpers": "^1.2.0",
9696
"phantomjs-prebuilt": "^2.1.1",
9797
"rollup": "^0.36.1",
@@ -101,11 +101,12 @@
101101
"rollup-plugin-flow-no-whitespace": "^1.0.0",
102102
"rollup-plugin-replace": "^1.1.0",
103103
"rollup-watch": "^2.5.0",
104-
"selenium-server": "2.53.1",
105-
"typescript": "^2.0.2",
104+
"selenium-server": "3.0.1",
105+
"typescript": "^2.0.9",
106106
"uglify-js": "^2.6.2",
107107
"webpack": "^1.13.2",
108108
"weex-js-runtime": "^0.17.0-alpha4",
109109
"weex-vdom-tester": "^0.1.3"
110-
}
110+
},
111+
"dependencies": {}
111112
}

test/e2e/runner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (args.indexOf('--env') === -1) {
1616
}
1717
var i = args.indexOf('--test')
1818
if (i > -1) {
19-
args[i + 1] = 'test/e2e/specs/' + args[i + 1]
19+
args[i + 1] = 'test/e2e/specs/' + args[i + 1] + '.js'
2020
}
2121

2222
var runner = spawn('./node_modules/.bin/nightwatch', args, {

test/e2e/specs/select2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
.assert.containsText('p', 'Selected: 0')
99
.assert.containsText('span.select2', 'Select one')
1010

11-
.moveToElement('span.select2', 5, 5).mouseButtonClick()
11+
.click('.select2-selection__rendered')
1212
.assert.count('.select2-results__option', 3)
1313
.assert.containsText('.select2-results__option:nth-child(1)', 'Select one')
1414
.assert.containsText('.select2-results__option:nth-child(2)', 'Hello')
@@ -24,7 +24,7 @@ module.exports = {
2424
.execute(function () {
2525
vm.options.push({ id: 3, text: 'Vue' })
2626
})
27-
.moveToElement('span.select2', 5, 5).mouseButtonClick()
27+
.click('.select2-selection__rendered')
2828
.assert.count('.select2-results__option', 4)
2929
.assert.containsText('.select2-results__option:nth-child(1)', 'Select one')
3030
.assert.containsText('.select2-results__option:nth-child(2)', 'Hello')

0 commit comments

Comments
 (0)