karma-qunit 0.1.5 → 0.1.9

package/README.md

@@ -34,6 +34,28 @@ module.exports = function (config) {
 }
 ```
 
+You can also pass options for `QUnit.config` (documented [here](https://api.qunitjs.com/QUnit.config/)) as such:
+
+```js
+/// karma.conf.js
+module.exports = function (config) {
+  config.set({
+    frameworks: ['qunit'],
+    plugins: ['karma-qunit'],
+    files: [
+      '*.js'
+    ],
+
+    // client configuration
+    client: {
+      qunit: {
+        testTimeout: 5000
+      }
+    }
+  })
+}
+```
+
 ----
 
 For more information on Karma see the [homepage]. If you're using `karma-qunit` to test Ember.js, you might find Karma's [Ember guide](http://karma-runner.github.io/0.12/plus/emberjs.html) helpful.

package/lib/adapter.js

@@ -1,5 +1,19 @@
 (function(window) {
 
+function createQUnitConfig (karma, defaultConfig) { // eslint-disable-line no-unused-vars
+  var config = defaultConfig || {}
+
+  if (!karma.config || !karma.config.qunit) {
+    return config
+  }
+
+  for (var key in karma.config.qunit) {
+    config[key] = karma.config.qunit[key]
+  }
+
+  return config
+}
+
 function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unused-vars
   return function () {
     var FIXTURE_ID = 'qunit-fixture'
@@ -33,22 +47,24 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
       timer = new Date().getTime()
       testResult = { success: true, errors: [] }
 
-      // create a qunit-fixture element to match behaviour of regular qunit
-      // runner. The fixture is only removed at the start of a subsequent test
-      // so it can be inspected after a test run.
-      var fixture = document.getElementById(FIXTURE_ID)
-      if (fixture) {
-        fixture.parentNode.removeChild(fixture)
+      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 removed at the start of a subsequent test
+        // so it can be inspected after a test run.
+        var fixture = document.getElementById(FIXTURE_ID)
+        if (fixture) {
+          fixture.parentNode.removeChild(fixture)
+        }
+        fixture = document.createElement('div')
+        fixture.id = FIXTURE_ID
+        // style to match qunit runner's CSS
+        fixture.style.position = 'absolute'
+        fixture.style.left = '-10000px'
+        fixture.style.top = '-10000px'
+        fixture.style.width = '1000px'
+        fixture.style.height = '1000px'
+        document.body.appendChild(fixture)
       }
-      fixture = document.createElement('div')
-      fixture.id = FIXTURE_ID
-      // style to match qunit runner's CSS
-      fixture.style.position = 'absolute'
-      fixture.style.left = '-10000px'
-      fixture.style.top = '-10000px'
-      fixture.style.width = '1000px'
-      fixture.style.height = '1000px'
-      document.body.appendChild(fixture)
     })
 
     runner.log(function (details) {
@@ -60,7 +76,7 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
         }
 
         if (typeof details.expected !== 'undefined') {
-          msg += 'Expected: ' + details.expected + '\n' + 'Actual: ' + details.actual + '\n'
+          msg += 'Expected: ' + runner.dump.parse(details.expected) + '\n' + 'Actual: ' + runner.dump.parse(details.actual) + '\n'
         }
 
         if (details.source) {
@@ -89,13 +105,19 @@ function createQUnitStartFn (tc, runnerPassedIn) { // eslint-disable-line no-unu
   }
 }
 
-window.QUnit.config.autostart = false;
+var config = createQUnitConfig(window.__karma__, {
+  autostart: false
+});
+
+for (var key in config) {
+  window.QUnit.config[key] = config[key];
+}
 
 if (window.removeEventListener) {
   window.removeEventListener('load', window.QUnit.load, false);
-} else {
+} else if (window.detachEvent) {
   window.detachEvent('onload', window.QUnit.load);
 }
 
 window.__karma__.start = createQUnitStartFn(window.__karma__);
-})(window);
+})(typeof window !== 'undefined' ? window : global);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karma-qunit",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "description": "A Karma plugin. Adapter for QUnit testing framework.",
   "main": "lib/index.js",
   "scripts": {
@@ -42,17 +42,20 @@
   },
   "license": "MIT",
   "contributors": [
+    "dignifiedquire <dignifiedquire@gmail.com>",
+    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
+    "Matt DuVall <matt@stripe.com>",
     "Friedel Ziegelmayer <friedel.ziegelmayer@gmail.com>",
     "Aymeric Beaumet <aymeric@beaumet.me>",
-    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
-    "Marcin Szczepanski <mszczepanski@atlassian.com>",
-    "Sahat Yalkabov <sakhat@gmail.com>",
+    "Stefan Dragnev <dragnev@telerik.com>",
+    "Tim Robertson <trobertson@spredfast.com>",
     "Timo Tijhof <krinklemail@gmail.com>",
-    "dignifiedquire <dignifiedquire@gmail.com>",
     "Aymeric Beaumet <aymeric.beaumet@gmail.com>",
     "thenickcox <nick@nickcox.me>",
     "Brian Donovan <donovan@squareup.com>",
     "Daniel Herman <daniel.c.herman@gmail.com>",
-    "Kristof Neirynck <k.neirynck@gmail.com>"
+    "Kristof Neirynck <k.neirynck@gmail.com>",
+    "Marcin Szczepanski <mszczepanski@atlassian.com>",
+    "Sahat Yalkabov <sakhat@gmail.com>"
   ]
 }