Merge branch 'master' into refactor/remove-greenkeeper-lockfile

uPortal-Attic · Jan 23, 2018 · 5b8325a · 5b8325a
2 parents 64de473 + 5de33b7
commit 5b8325a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,11 @@ matrix:
     - os: linux
       dist: trusty
       jdk: oraclejdk8
-      env: BROWSERS=ChromeHeadless,FirefoxHeadless
+      env: BROWSERS=ChromeHeadlessNoSandbox,FirefoxHeadless
     - os: linux
       dist: trusty
       jdk: openjdk8
-      env: BROWSERS=ChromeHeadless,FirefoxHeadless
+      env: BROWSERS=ChromeHeadlessNoSandbox,FirefoxHeadless
     - os: osx
       osx_image: xcode8.3
       env: BROWSERS=ChromeHeadless,Safari

diff --git a/web/src/main/webapp/karma.conf.js b/web/src/main/webapp/karma.conf.js
@@ -36,13 +36,13 @@ module.exports = function(config) {
         frameworks: ['jasmine', 'requirejs'],
 
         customLaunchers: {
-            FirefoxHeadless: {
-                base: 'Firefox',
-                flags: ['-headless'],
-            },
+          ChromeHeadlessNoSandbox: {
+            base: 'ChromeHeadless',
+            flags: ['--no-sandbox'],
+          },
         },
 
-        browsers: ['ChromeHeadless'], // or 'Chrome'
+        browsers: ['ChromeHeadless', 'FirefoxHeadless'], // or 'Chrome'
 
         plugins: [
             'karma-htmlfile-reporter',