From 44669d10970b8b8bf3b8fff1bf398bea4560c1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?= Date: Wed, 17 Oct 2018 13:09:03 +0800 Subject: [PATCH 1/3] Revert "Revert "Build: Use karma-chrome-launcher to run tests (#10898)" (#10973)" This reverts commit 536611ae7e9b752b1c0dcc0e7f5def861a88aee0. --- karma.conf.js | 9 +++++++-- package.json | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 0ffab8bc520..29a8cdc8f7b 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -67,8 +67,13 @@ module.exports = function(config) { // start these browsers // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ["PhantomJS"], - + browsers: ["HeadlessChrome"], + customLaunchers: { + HeadlessChrome: { + base: 'ChromeHeadless', + flags: [ '--no-sandbox', ], + }, + }, // Continuous Integration mode // if true, Karma captures browsers, runs the tests and exits diff --git a/package.json b/package.json index c2f7626dca6..1c44dcd2d55 100644 --- a/package.json +++ b/package.json @@ -100,14 +100,13 @@ "karma-babel-preprocessor": "^7.0.0", "karma-mocha": "^1.3.0", "karma-mocha-reporter": "^2.2.3", - "karma-phantomjs-launcher": "^1.0.4", + "karma-chrome-launcher": "^2.2.0", "leche": "^2.2.3", "load-perf": "^0.2.0", "markdownlint": "^0.11.0", "mocha": "^5.0.5", "mock-fs": "^4.6.0", "npm-license": "^0.3.3", - "phantomjs-prebuilt": "^2.1.16", "proxyquire": "^2.0.1", "shelljs": "^0.8.2", "sinon": "^3.3.0", From 193e6f3ff48601d4ad917b0c31d091239c0ab98e Mon Sep 17 00:00:00 2001 From: "weiran.zsd" Date: Thu, 25 Oct 2018 20:05:20 +0800 Subject: [PATCH 2/3] Build: add devdeps puppeteer@1.9.0 --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c44dcd2d55..51783d1ea2e 100644 --- a/package.json +++ b/package.json @@ -98,9 +98,9 @@ "jsdoc": "^3.5.5", "karma": "^3.0.0", "karma-babel-preprocessor": "^7.0.0", + "karma-chrome-launcher": "^2.2.0", "karma-mocha": "^1.3.0", "karma-mocha-reporter": "^2.2.3", - "karma-chrome-launcher": "^2.2.0", "leche": "^2.2.3", "load-perf": "^0.2.0", "markdownlint": "^0.11.0", @@ -108,6 +108,7 @@ "mock-fs": "^4.6.0", "npm-license": "^0.3.3", "proxyquire": "^2.0.1", + "puppeteer": "^1.9.0", "shelljs": "^0.8.2", "sinon": "^3.3.0", "temp": "^0.8.3", From c3a7aaa842bc1f9216872105d841c9f8a48c7700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?= Date: Wed, 7 Nov 2018 22:18:15 +0800 Subject: [PATCH 3/3] Chore: set the path to chromium binary --- karma.conf.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/karma.conf.js b/karma.conf.js index 29a8cdc8f7b..e8a027e540e 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,5 +1,7 @@ "use strict"; +process.env.CHROME_BIN = require("puppeteer").executablePath(); + module.exports = function(config) { config.set({