Merge 7f9b04c into f6e74a3

square · Aug 1, 2019 · c74c6de · c74c6de
2 parents f6e74a3 + 7f9b04c
commit c74c6de
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,15 @@
 language: node_js
 node_js:
-  - 9.10.1
+  - "lts/*"
+  - "node"
+addons:
+  chrome: stable
 
 # Tests run in chromium
 before_install:
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+#- export CHROME_BIN=chromium-browser
+#- export DISPLAY=:99.0
+#- sh -e /etc/init.d/xvfb start
   - npm install -g grunt-cli
 
 install: npm install

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -44,10 +44,10 @@ module.exports = function(grunt) {
             'test/jose-jws-rsa-test.html'
           ],
           autoWatch: true,
-          browsers: ['Chrome'],
+          browsers: ['Chrome', 'ChromeHeadless', 'ChromeHeadlessNoSandbox'],
           customLaunchers: {
-            Chrome_travis_ci: {
-              base: 'Chrome',
+            ChromeHeadlessNoSandbox: {
+              base: 'ChromeHeadless',
               flags: ['--no-sandbox']
             }
           },
@@ -66,10 +66,10 @@ module.exports = function(grunt) {
             'test/jose-jws-rsa-test.html'
           ],
           autoWatch: true,
-          browsers: ['Chrome'],
+          browsers: ['Chrome', 'ChromeHeadless', 'ChromeHeadlessNoSandbox'],
           customLaunchers: {
-            Chrome_travis_ci: {
-              base: 'Chrome',
+            ChromeHeadlessNoSandbox: {
+              base: 'ChromeHeadless',
               flags: ['--no-sandbox']
             }
           },
@@ -89,8 +89,8 @@ module.exports = function(grunt) {
   };
 
   if (process.env.TRAVIS) {
-    config.karma.with_coverage.browsers = ['Chrome_travis_ci'];
-    config.karma.without_coverage.browsers = ['Chrome_travis_ci'];
+    config.karma.with_coverage.browsers = ['ChromeHeadlessNoSandbox'];
+    config.karma.without_coverage.browsers = ['ChromeHeadlessNoSandbox'];
   }
 
   grunt.initConfig(config);