Merge pull request #3193 from summernote/fix/ci-201903

Fix broken CI again.
summernote · Mar 30, 2019 · 99926b0 · 99926b0
2 parents 9cd52e4 + 4812970
commit 99926b0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git 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
@@ -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
@@ -72,20 +72,19 @@
     "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",
     "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-typescript": "^1.0.0",
     "serve-static": "^1.13.2",
     "typescript": "3.2.2"
-  }
+  },
+  "dependencies": {}
 }