Skip to content

Commit 85d8ad6

Browse files
committed
build: use headless chrome by default for unit tests
1 parent d40eb9c commit 85d8ad6

File tree

4 files changed

+39
-8
lines changed

4 files changed

+39
-8
lines changed

Diff for: package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
"nightwatch": "^0.9.16",
124124
"nightwatch-helpers": "^1.2.0",
125125
"phantomjs-prebuilt": "^2.1.14",
126+
"puppeteer": "^1.11.0",
126127
"resolve": "^1.3.3",
127128
"rollup": "^0.68.1",
128129
"rollup-plugin-alias": "^1.3.1",
@@ -135,8 +136,8 @@
135136
"selenium-server": "^2.53.1",
136137
"serialize-javascript": "^1.3.0",
137138
"shelljs": "^0.8.1",
138-
"typescript": "^3.1.3",
139139
"terser": "^3.10.2",
140+
"typescript": "^3.1.3",
140141
"webpack": "^4.22.0",
141142
"weex-js-runtime": "^0.23.6",
142143
"weex-styler": "^0.3.0",

Diff for: test/unit/karma.cover.config.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
const base = require('./karma.base.config.js')
22

3+
process.env.CHROME_BIN = require('puppeteer').executablePath()
4+
35
module.exports = function (config) {
46
const options = Object.assign(base, {
5-
browsers: ['PhantomJS'],
7+
browsers: ['ChromeHeadless'],
68
reporters: ['mocha', 'coverage'],
79
coverageReporter: {
810
reporters: [
@@ -13,7 +15,7 @@ module.exports = function (config) {
1315
singleRun: true,
1416
plugins: base.plugins.concat([
1517
'karma-coverage',
16-
'karma-phantomjs-launcher'
18+
'karma-chrome-launcher'
1719
])
1820
})
1921

Diff for: test/unit/karma.dev.config.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
const base = require('./karma.base.config.js')
22

3+
process.env.CHROME_BIN = require('puppeteer').executablePath()
4+
35
module.exports = function (config) {
46
config.set(Object.assign(base, {
5-
browsers: ['PhantomJS'],
7+
browsers: ['ChromeHeadless'],
68
reporters: ['progress'],
79
plugins: base.plugins.concat([
8-
'karma-phantomjs-launcher'
10+
'karma-chrome-launcher'
911
])
1012
}))
1113
}

Diff for: yarn.lock

+29-3
Original file line numberDiff line numberDiff line change
@@ -3364,7 +3364,7 @@ extglob@^2.0.4:
33643364
snapdragon "^0.8.1"
33653365
to-regex "^3.0.1"
33663366

3367-
extract-zip@^1.6.5, extract-zip@^1.6.7:
3367+
extract-zip@^1.6.5, extract-zip@^1.6.6, extract-zip@^1.6.7:
33683368
version "1.6.7"
33693369
resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
33703370
integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
@@ -5596,7 +5596,7 @@ mime@^1.6.0:
55965596
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
55975597
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
55985598

5599-
mime@^2.3.1:
5599+
mime@^2.0.3, mime@^2.3.1:
56005600
version "2.4.0"
56015601
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
56025602
integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
@@ -6527,7 +6527,7 @@ progress@^1.1.8:
65276527
resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
65286528
integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
65296529

6530-
progress@^2.0.0:
6530+
progress@^2.0.0, progress@^2.0.1:
65316531
version "2.0.3"
65326532
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
65336533
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -6551,6 +6551,11 @@ [email protected]:
65516551
pac-proxy-agent "1"
65526552
socks-proxy-agent "2"
65536553

6554+
proxy-from-env@^1.0.0:
6555+
version "1.0.0"
6556+
resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
6557+
integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
6558+
65546559
prr@~1.0.1:
65556560
version "1.0.1"
65566561
resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -6618,6 +6623,20 @@ punycode@^2.1.0:
66186623
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
66196624
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
66206625

6626+
puppeteer@^1.11.0:
6627+
version "1.11.0"
6628+
resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.11.0.tgz#63cdbe12b07275cd6e0b94bce41f3fcb20305770"
6629+
integrity sha512-iG4iMOHixc2EpzqRV+pv7o3GgmU2dNYEMkvKwSaQO/vMZURakwSOn/EYJ6OIRFYOque1qorzIBvrytPIQB3YzQ==
6630+
dependencies:
6631+
debug "^4.1.0"
6632+
extract-zip "^1.6.6"
6633+
https-proxy-agent "^2.2.1"
6634+
mime "^2.0.3"
6635+
progress "^2.0.1"
6636+
proxy-from-env "^1.0.0"
6637+
rimraf "^2.6.1"
6638+
ws "^6.1.0"
6639+
66216640
66226641
version "1.4.1"
66236642
resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
@@ -8377,6 +8396,13 @@ write@^0.2.1:
83778396
dependencies:
83788397
mkdirp "^0.5.1"
83798398

8399+
ws@^6.1.0:
8400+
version "6.1.2"
8401+
resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
8402+
integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
8403+
dependencies:
8404+
async-limiter "~1.0.0"
8405+
83808406
ws@~3.3.1:
83818407
version "3.3.3"
83828408
resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"

0 commit comments

Comments
 (0)