karma-qunit 4.2.2 → 4.2.3

package/lib/adapter.js

@@ -20,12 +20,6 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
   return function () {
     var FIXTURE_ID = 'qunit-fixture'
     var runner = runnerPassedIn || window.QUnit
-    var totalNumberOfTest = 0
-    var timer = null
-    var testResult = {
-      errors: []
-    }
-    var supportsTestTracking = false
     var config = (tc.config && tc.config.qunit) || {}
     var qunitOldTimeout = 13
 
@@ -35,79 +29,48 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
       document.body.appendChild(ui)
     }
 
-    if (runner.begin) {
-      runner.begin(function (args) {
-        if (args && typeof args.totalTests === 'number') {
-          tc.info({ total: args.totalTests })
-          supportsTestTracking = true
-        }
-
-        if (typeof document !== 'undefined' && document.getElementById && document.createElement && document.body) {
-          // Create a qunit-fixture element to match behaviour of regular qunit runner.
-          // The fixture is only created once when the runner begins.
-          // Resetting is handled by qunit
-          var fixture = document.getElementById(FIXTURE_ID)
-          if (!fixture) {
-            fixture = document.createElement('div')
-            fixture.id = FIXTURE_ID
-            document.body.appendChild(fixture)
-            if (typeof runner.config.fixture === 'undefined') {
-              runner.config.fixture = ''
-            }
+    runner.begin(function (args) {
+      tc.info({ total: args.totalTests })
+
+      if (typeof document !== 'undefined' && document.getElementById && document.createElement && document.body) {
+        // Create a qunit-fixture element to match behaviour of regular qunit runner.
+        // The fixture is only created once when the runner begins.
+        // Resetting is handled by qunit
+        var fixture = document.getElementById(FIXTURE_ID)
+        if (!fixture) {
+          fixture = document.createElement('div')
+          fixture.id = FIXTURE_ID
+          document.body.appendChild(fixture)
+          if (typeof runner.config.fixture === 'undefined') {
+            runner.config.fixture = ''
           }
         }
-      })
-    }
-
-    runner.done(function () {
-      if (!supportsTestTracking) {
-        tc.info({ total: totalNumberOfTest })
       }
+    })
 
+    runner.done(function () {
       tc.complete({
         coverage: window.__coverage__
       })
     })
 
-    runner.testStart(function (test) {
-      totalNumberOfTest += 1
-      timer = new Date().getTime()
-      testResult = { success: true, errors: [] }
-    })
-
-    runner.log(function (details) {
-      if (!details.result) {
-        var msg = ''
-
-        if (details.message) {
-          msg += details.message + '\n'
-        }
-
-        if (typeof details.expected !== 'undefined') {
-          msg += 'Expected: ' + runner.dump.parse(details.expected) + '\n' + 'Actual: ' + runner.dump.parse(details.actual) + '\n'
-        }
-
-        if (details.source) {
-          msg += details.source + '\n'
-        }
-
-        testResult.success = false
-        testResult.errors.push(msg)
-      }
-    })
-
-    runner.testDone(function (test) {
+    runner.on('testEnd', function (test) {
       var result = {
         description: test.name,
-        suite: (test.module && [test.module]) || [],
-        success: testResult.success,
-        skipped: test.skipped,
-        log: testResult.errors,
-        time: new Date().getTime() - timer
-      }
-
-      if (result.description.indexOf('global failure') !== -1) {
-        return
+        suite: (test.suiteName && [test.suiteName]) || [],
+        success: test.status === 'passed' || test.status === 'skipped' || test.status === 'todo',
+        skipped: test.status === 'skipped',
+        log: (test.errors || []).map(function (details) {
+          var msg = details.message + '\n'
+          if (details.expected !== undefined) {
+            msg += 'Expected: ' + runner.dump.parse(details.expected) + '\n' + 'Actual: ' + runner.dump.parse(details.actual) + '\n'
+          }
+          if (details.stack) {
+            msg += details.stack + '\n'
+          }
+          return msg
+        }),
+        time: test.runtime
       }
 
       tc.result(result)
@@ -125,6 +88,10 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
     //
     // https://github.com/karma-runner/karma-qunit/issues/27
     if (config.autostart !== false) {
+      // If config.autostart is undefined (default) or explicitly true,
+      // start when Karma is ready. Otherwise, if the user explicitly
+      // sets it to false (instead of merely karma-qunit setting it to false),
+      // then we step out of the way and let the user call QUnit.start.
       setTimeout(function () {
         runner.start()
       }, qunitOldTimeout)

package/package.json

@@ -1,16 +1,14 @@
 {
   "name": "karma-qunit",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "A Karma plugin. Adapter for QUnit testing framework.",
   "main": "lib/index.js",
   "scripts": {
     "build": "grunt build",
-    "lint": "eslint .",
-    "karma": "npm run karma:adapter && npm run karma:simplequnit",
-    "karma:adapter": "karma start karma.conf.js --single-run",
-    "karma:simplequnit": "karma start examples/simple/karma.conf.js --single-run",
-    "unit": "qunit test/lib",
-    "test": "npm run lint && npm run build && npm run karma && npm run unit"
+    "lint": "eslint --cache .",
+    "lint-fix": "eslint --cache --fix .",
+    "unit": "qunit test/",
+    "test": "npm run lint && npm run build && npm run unit"
   },
   "repository": {
     "type": "git",
@@ -43,12 +41,13 @@
     "grunt-npm": "0.0.2",
     "karma": "^6.3.9",
     "karma-firefox-launcher": "^2.1.2",
-    "karma-jasmine": "^4.0.1",
-    "qunit": "^3.0.0"
+    "karma-mocha-reporter": "^2.2.5",
+    "qunit": "^2.26.0 || ^3.0.0",
+    "sinon": "^12.0.1"
   },
   "peerDependencies": {
     "karma": "^4.0.0 || ^5.0.0 || ^6.0.0",
-    "qunit": ">=2.1.1"
+    "qunit": ">=2.2.0"
   },
   "license": "MIT",
   "contributors": [