Skip to content

Commit

Permalink
feat: update all dependencies
Browse files Browse the repository at this point in the history
Closes #98
  • Loading branch information
dignifiedquire committed Mar 14, 2018
1 parent 5778b0f commit 6204b20
Show file tree
Hide file tree
Showing 4 changed files with 4,696 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
lib/adapter.js
node_modules
*.log
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"description": "A Karma plugin. Adapter for QUnit testing framework.",
"main": "lib/index.js",
"scripts": {
"lint": "grunt eslint",
"test": "grunt"
},
"repository": {
Expand All @@ -22,25 +23,27 @@
"author": "Vojta Jina <[email protected]>",
"dependencies": {},
"devDependencies": {
"eslint": "^2.13.1",
"eslint-config-standard": "^5.3.1",
"eslint-plugin-promise": "^1.3.2",
"eslint-plugin-standard": "^1.3.2",
"eslint": "^4.18.2",
"eslint-config-standard": "^11.0.0",
"eslint-plugin-import": "^2.9.0",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-promise": "^3.7.0",
"eslint-plugin-standard": "^3.0.1",
"grunt": "^1.0.1",
"grunt-bump": "^0.8.0",
"grunt-eslint": "^18.1.0",
"grunt-eslint": "^20.1.0",
"grunt-karma": "2.x",
"grunt-npm": "0.0.2",
"jasmine-core": "^2.3.4",
"karma": "1.x || ^0.13.3",
"karma-chrome-launcher": "1.x || ^0.2.0",
"jasmine-core": "^3.1.0",
"karma": "^2.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-firefox-launcher": "1.x || ^0.1.6",
"karma-jasmine": "1.x || ^0.3.6",
"load-grunt-tasks": "^3.2.0",
"qunitjs": "^2.0.0"
"qunit": "^2.5.1"
},
"peerDependencies": {
"qunitjs": "^1.14.0 || ^2.0.0"
"qunit": "^2.0.0"
},
"license": "MIT",
"contributors": [
Expand Down
6 changes: 4 additions & 2 deletions src/adapter.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict'

function createQUnitConfig (karma, defaultConfig) { // eslint-disable-line no-unused-vars
var config = defaultConfig || {}

Expand Down Expand Up @@ -95,7 +97,7 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
runner.testDone(function (test) {
var result = {
description: test.name,
suite: test.module && [test.module] || [],
suite: (test.module && [test.module]) || [],
success: testResult.success,
skipped: test.skipped,
log: testResult.errors || [],
Expand All @@ -110,7 +112,7 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
})

runner.load()

// honor autostart config, useful for tests loaded asynchronously
if (config.autostart !== false) {
runner.start()
Expand Down
Loading

0 comments on commit 6204b20

Please sign in to comment.