From 481297046def7542a2de4d13a6e3af178f2b3ebd Mon Sep 17 00:00:00 2001 From: hackerwins Date: Sat, 30 Mar 2019 09:04:54 +0900 Subject: [PATCH] Fix CI again. --- Gruntfile.js | 12 ++++++++---- karma.conf.js | 10 ++++++++-- package.json | 5 ++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index a8e9aa3b6..4d37b4aa3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -28,6 +28,10 @@ module.exports = function(grunt) { platform: 'windows 7' }, */ + ChromeHeadlessNoSandbox: { + base: 'ChromeHeadless', + flags: [ '--no-sandbox' ], + }, 'SL_IE10': { base: 'SauceLabs', browserName: 'internet explorer', @@ -199,17 +203,17 @@ module.exports = function(grunt) { singleRun: false, }, all: { - // Chrome, ChromeCanary, Firefox, Opera, Safari, PhantomJS, IE + // Chrome, ChromeCanary, Firefox, Opera, Safari, IE singleRun: true, - browsers: ['PhantomJS'], + browsers: ['ChromeHeadlessNoSandbox'], }, dist: { singleRun: true, - browsers: ['PhantomJS'], + browsers: ['ChromeHeadlessNoSandbox'], }, travis: { singleRun: true, - browsers: ['PhantomJS'], + browsers: ['ChromeHeadlessNoSandbox'], reporters: ['dots', 'coverage'], }, saucelabs: { diff --git a/karma.conf.js b/karma.conf.js index 1d2b94bc9..4af37a43d 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -7,8 +7,14 @@ module.exports = function (config) { { pattern: 'src/js/**/*.js' }, { pattern: 'test/**/*.spec.js' } ], - // Chrome, ChromeCanary, Firefox, Opera, Safari, PhantomJS, IE - browsers: ['ChromeHeadless'], + customLaunchers: { + ChromeHeadlessNoSandbox: { + base: "ChromeHeadless", + flags: [ "--no-sandbox" ] + } + }, + // Chrome, ChromeCanary, Firefox, Opera, Safari, IE + browsers: ['ChromeHeadlessNoSandbox'], preprocessors: { 'src/js/**/*.js': ['karma-typescript'], 'test/**/*.spec.js': ['karma-typescript'] diff --git a/package.json b/package.json index a623973e0..3197a8c75 100644 --- a/package.json +++ b/package.json @@ -72,14 +72,12 @@ "karma-ie-launcher": "^1.0.0", "karma-mocha": "^1.3.0", "karma-opera-launcher": "^1.0.0", - "karma-phantomjs-launcher": "^1.0.4", "karma-safari-launcher": "^1.0.0", "karma-sauce-launcher": "1.2.0", "karma-typescript": "^3.0.13", "karma-typescript-es6-transform": "^1.0.4", "load-grunt-tasks": "^4.0.0", "mocha": "^5.2.0", - "phantomjs-prebuilt": "^2.1.16", "popper.js": "^1.14.6", "rollup": "^0.68.1", "rollup-plugin-eslint": "^5.0.0", @@ -87,5 +85,6 @@ "rollup-plugin-typescript": "^1.0.0", "serve-static": "^1.13.2", "typescript": "3.2.2" - } + }, + "dependencies": {} }