Merge pull request #140 from square/mbyczkowski/bump-karma-and-qunit

Update integration tests

Author: mbyczkowski

.gitignore

@@ -1,5 +1,6 @@
 coverage/
 node_modules
 .idea
+output.log
 
-package-lock.json
+package-lock.json

Gruntfile.js

@@ -1,14 +1,13 @@
 const webpackDevConfig = require('./webpack.dev');
 const webpackProdConfig = require('./webpack.prod');
 
-module.exports = function(grunt) {
-
+module.exports = function (grunt) {
   var config = {
     pkg: grunt.file.readJSON('package.json'),
 
     run: {
       jest: {
-        cmd: 'jest',
+        cmd: 'jest'
       }
     },
 
@@ -37,12 +36,17 @@ module.exports = function(grunt) {
           },
           frameworks: ['qunit'],
           files: [
-            { pattern: 'dist/jose.js', watching: false, included: false },
-            { pattern: 'test/qunit-promises.js', watching: false, included: false },
-            'test/jose-jwe-test.html',
-            'test/jose-jws-ecdsa-test.html',
-            'test/jose-jws-rsa-test.html'
+            { pattern: 'dist/jose.js', watching: false, included: true },
+            { pattern: 'test/qunit-promises.js', watching: false, included: true },
+            'test/jose-*.js'
           ],
+          client: {
+            clearContext: false,
+            qunit: {
+              showUI: true,
+              testTimeout: 5000
+            }
+          },
           autoWatch: true,
           browsers: ['Chrome', 'ChromeHeadless', 'ChromeHeadlessNoSandbox'],
           customLaunchers: {
@@ -59,21 +63,27 @@ module.exports = function(grunt) {
         options: {
           frameworks: ['qunit'],
           files: [
-            { pattern: 'dist/jose.js', watching: false, included: false },
-            { pattern: 'test/qunit-promises.js', watching: false, included: false },
-            'test/jose-jwe-test.html',
-            'test/jose-jws-ecdsa-test.html',
-            'test/jose-jws-rsa-test.html'
+            { pattern: 'dist/jose.js', watching: false, included: true },
+            { pattern: 'test/qunit-promises.js', watching: false, included: true },
+            'test/jose-*.js'
           ],
-          autoWatch: true,
-          browsers: ['Chrome', 'ChromeHeadless', 'ChromeHeadlessNoSandbox'],
-          customLaunchers: {
-            ChromeHeadlessNoSandbox: {
-              base: 'ChromeHeadless',
-              flags: ['--no-sandbox']
+          client: {
+            clearContext: false,
+            qunit: {
+              showUI: true,
+              testTimeout: 5000
             }
           },
-          singleRun: true
+          autoWatch: true,
+          browsers: ['Chrome'],
+          browserConsoleLogOptions: {
+            level: 'info',
+            format: '%b %T: %m',
+            path: 'output.log',
+            terminal: true
+          },
+          singleRun: true,
+          logLevel: 'info'
         }
       }
     },

dist/jose.js

@@ -42,17 +42,16 @@
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-uglify": "^4.0.1",
     "grunt-eslint": "^22.0.0",
-    "grunt-karma": "^3.0.0",
+    "grunt-karma": "^3.0.2",
     "grunt-karma-coveralls": "^2.5.4",
     "grunt-run": "^0.8.1",
     "grunt-webpack": "^3.1.3",
     "jest": "^24.8.0",
-    "karma": "^1.7.1",
-    "karma-chrome-launcher": "^3.0.0",
+    "karma": "^4.4.1",
+    "karma-chrome-launcher": "^3.1.0",
     "karma-coverage": "^2.0.1",
-    "karma-qunit": "^1.2.1",
+    "karma-qunit": "^4.0.0",
     "qunit": "^2.9.2",
-    "qunitjs": "^1.23.1",
     "terser": "^4.1.2",
     "uglifyjs-webpack-plugin": "^2.0.1",
     "webpack": "^4.20.2",