Skip to content

Commit cbdaaf4

Browse files
authored
[Improvement] use ChromeHeadless instead of PhantomJS to run test cases (youzan#913)
1 parent 6d077f7 commit cbdaaf4

4 files changed

Lines changed: 24 additions & 20 deletions

File tree

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
language: node_js
2+
sudo: required
3+
addons:
4+
chrome: stable
25
node_js:
36
- 6
47
os: linux

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"css-loader": "^0.28.11",
7474
"dependency-tree": "^6.1.0",
7575
"eslint": "^4.19.1",
76-
"eslint-plugin-vue": "^4.4.0",
76+
"eslint-plugin-vue": "^4.5.0",
7777
"extract-text-webpack-plugin": "^4.0.0-beta.0",
7878
"fast-vue-md-loader": "^1.0.3",
7979
"gh-pages": "^1.0.0",
@@ -87,7 +87,7 @@
8787
"karma-phantomjs-launcher": "^1.0.4",
8888
"karma-sinon-chai": "^1.3.4",
8989
"karma-spec-reporter": "^0.0.32",
90-
"karma-webpack": "2.0.13",
90+
"karma-webpack": "3.0.0",
9191
"lint-staged": "^7.0.4",
9292
"mocha": "^5.1.1",
9393
"postcss": "^6.0.21",
@@ -112,7 +112,7 @@
112112
"vue-template-compiler": "2.5.16",
113113
"vue-template-es2015-compiler": "^1.6.0",
114114
"webpack": "^4.6.0",
115-
"webpack-cli": "^2.0.14",
115+
"webpack-cli": "^2.0.15",
116116
"webpack-dev-server": "3.1.3",
117117
"webpack-merge": "^4.1.2"
118118
}

test/karma.conf.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ require('babel-core/register')({
44
presets: [require('babel-preset-env')]
55
});
66

7-
var getWebpackConfig = require('./get-webpack-conf');
8-
var travis = process.env.TRAVIS;
7+
const getWebpackConfig = require('./get-webpack-conf');
98

109
module.exports = function(config) {
1110
config.set({
12-
browsers: travis ? ['PhantomJS'] : ['PhantomJS', 'Chrome'],
11+
browsers: ['ChromeHeadless'],
1312
frameworks: ['mocha', 'sinon-chai'],
1413
reporters: ['spec', 'coverage'],
1514
files: ['./index.js'],

yarn.lock

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5056,16 +5056,16 @@ karma-spec-reporter@^0.0.32:
50565056
dependencies:
50575057
colors "^1.1.2"
50585058

5059-
karma-webpack@2.0.13:
5060-
version "2.0.13"
5061-
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.13.tgz#cf56e3056c15b7747a0bb2140fc9a6be41dd9f02"
5059+
karma-webpack@3.0.0:
5060+
version "3.0.0"
5061+
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-3.0.0.tgz#bf009c5b73c667c11c015717e9e520f581317c44"
50625062
dependencies:
50635063
async "^2.0.0"
50645064
babel-runtime "^6.0.0"
50655065
loader-utils "^1.0.0"
50665066
lodash "^4.0.0"
50675067
source-map "^0.5.6"
5068-
webpack-dev-middleware "^1.12.0"
5068+
webpack-dev-middleware "^2.0.6"
50695069

50705070
karma@^2.0.0:
50715071
version "2.0.2"
@@ -5680,7 +5680,7 @@ mime@1.4.1:
56805680
version "1.4.1"
56815681
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
56825682

5683-
mime@^1.3.4, mime@^1.5.0:
5683+
mime@^1.3.4:
56845684
version "1.6.0"
56855685
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
56865686

@@ -8690,10 +8690,6 @@ thunky@^1.0.2:
86908690
version "1.0.2"
86918691
resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
86928692

8693-
time-stamp@^2.0.0:
8694-
version "2.0.0"
8695-
resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
8696-
86978693
timed-out@^4.0.0, timed-out@^4.0.1:
86988694
version "4.0.1"
86998695
resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
@@ -8964,6 +8960,10 @@ urix@^0.1.0:
89648960
version "0.1.0"
89658961
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
89668962

8963+
url-join@^2.0.2:
8964+
version "2.0.5"
8965+
resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
8966+
89678967
url-join@^4.0.0:
89688968
version "4.0.0"
89698969
resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
@@ -9302,15 +9302,17 @@ webpack-dev-middleware@3.1.2:
93029302
url-join "^4.0.0"
93039303
webpack-log "^1.0.1"
93049304

9305-
webpack-dev-middleware@^1.12.0:
9306-
version "1.12.2"
9307-
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
9305+
webpack-dev-middleware@^2.0.6:
9306+
version "2.0.6"
9307+
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz#a51692801e8310844ef3e3790e1eacfe52326fd4"
93089308
dependencies:
9309+
loud-rejection "^1.6.0"
93099310
memory-fs "~0.4.1"
9310-
mime "^1.5.0"
9311+
mime "^2.1.0"
93119312
path-is-absolute "^1.0.0"
93129313
range-parser "^1.0.3"
9313-
time-stamp "^2.0.0"
9314+
url-join "^2.0.2"
9315+
webpack-log "^1.0.1"
93149316

93159317
webpack-dev-server@3.1.3:
93169318
version "3.1.3"

0 commit comments

Comments
 (0)