Skip to content
This repository was archived by the owner on Feb 27, 2023. It is now read-only.

Commit b2fadbe

Browse files
committed
Update integration tests
In order to update Karma and QUnit packages, the tests had to be rewritten slightly. The biggest change is that the tests are now loaded as JS files rather than HTML pages that include tests in a `<script>` tag.
1 parent c3ee697 commit b2fadbe

13 files changed

+733
-717
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
coverage/
22
node_modules
33
.idea
4+
output.log
45

5-
package-lock.json
6+
package-lock.json

Gruntfile.js

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
const webpackDevConfig = require('./webpack.dev');
22
const webpackProdConfig = require('./webpack.prod');
33

4-
module.exports = function(grunt) {
5-
4+
module.exports = function (grunt) {
65
var config = {
76
pkg: grunt.file.readJSON('package.json'),
87

98
run: {
109
jest: {
11-
cmd: 'jest',
10+
cmd: 'jest'
1211
}
1312
},
1413

@@ -37,12 +36,17 @@ module.exports = function(grunt) {
3736
},
3837
frameworks: ['qunit'],
3938
files: [
40-
{ pattern: 'dist/jose.js', watching: false, included: false },
41-
{ pattern: 'test/qunit-promises.js', watching: false, included: false },
42-
'test/jose-jwe-test.html',
43-
'test/jose-jws-ecdsa-test.html',
44-
'test/jose-jws-rsa-test.html'
39+
{ pattern: 'dist/jose.js', watching: false, included: true },
40+
{ pattern: 'test/qunit-promises.js', watching: false, included: true },
41+
'test/jose-*.js'
4542
],
43+
client: {
44+
clearContext: false,
45+
qunit: {
46+
showUI: true,
47+
testTimeout: 5000
48+
}
49+
},
4650
autoWatch: true,
4751
browsers: ['Chrome', 'ChromeHeadless', 'ChromeHeadlessNoSandbox'],
4852
customLaunchers: {
@@ -59,21 +63,27 @@ module.exports = function(grunt) {
5963
options: {
6064
frameworks: ['qunit'],
6165
files: [
62-
{ pattern: 'dist/jose.js', watching: false, included: false },
63-
{ pattern: 'test/qunit-promises.js', watching: false, included: false },
64-
'test/jose-jwe-test.html',
65-
'test/jose-jws-ecdsa-test.html',
66-
'test/jose-jws-rsa-test.html'
66+
{ pattern: 'dist/jose.js', watching: false, included: true },
67+
{ pattern: 'test/qunit-promises.js', watching: false, included: true },
68+
'test/jose-*.js'
6769
],
68-
autoWatch: true,
69-
browsers: ['Chrome', 'ChromeHeadless', 'ChromeHeadlessNoSandbox'],
70-
customLaunchers: {
71-
ChromeHeadlessNoSandbox: {
72-
base: 'ChromeHeadless',
73-
flags: ['--no-sandbox']
70+
client: {
71+
clearContext: false,
72+
qunit: {
73+
showUI: true,
74+
testTimeout: 5000
7475
}
7576
},
76-
singleRun: true
77+
autoWatch: true,
78+
browsers: ['Chrome'],
79+
browserConsoleLogOptions: {
80+
level: 'info',
81+
format: '%b %T: %m',
82+
path: 'output.log',
83+
terminal: true
84+
},
85+
singleRun: true,
86+
logLevel: 'info'
7787
}
7888
}
7989
},

dist/jose.js

Lines changed: 38 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jose.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jose.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,16 @@
4242
"grunt-contrib-concat": "^1.0.1",
4343
"grunt-contrib-uglify": "^4.0.1",
4444
"grunt-eslint": "^22.0.0",
45-
"grunt-karma": "^3.0.0",
45+
"grunt-karma": "^3.0.2",
4646
"grunt-karma-coveralls": "^2.5.4",
4747
"grunt-run": "^0.8.1",
4848
"grunt-webpack": "^3.1.3",
4949
"jest": "^24.8.0",
50-
"karma": "^1.7.1",
51-
"karma-chrome-launcher": "^3.0.0",
50+
"karma": "^4.4.1",
51+
"karma-chrome-launcher": "^3.1.0",
5252
"karma-coverage": "^2.0.1",
53-
"karma-qunit": "^1.2.1",
53+
"karma-qunit": "^4.0.0",
5454
"qunit": "^2.9.2",
55-
"qunitjs": "^1.23.1",
5655
"terser": "^4.1.2",
5756
"uglifyjs-webpack-plugin": "^2.0.1",
5857
"webpack": "^4.20.2",

0 commit comments

Comments
 (0)