From 579794666aad8f2050bfcf0b099e4679c7d52c88 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Sat, 13 Dec 2014 22:46:35 -0800
Subject: [PATCH] Update QUnit to 1.16.0.

---
 package.json |  2 +-
 test/test.js | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 2700e7b3e..2eff5b5f3 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "jquery": "~1.11.1",
     "platform": "~1.3.0",
     "qunit-extras": "~1.3.0",
-    "qunitjs": "~1.11.0",
+    "qunitjs": "~1.16.0",
     "requirejs": "~2.1.15"
   },
   "engines": [
diff --git a/test/test.js b/test/test.js
index 88850c0ff..b50348bef 100644
--- a/test/test.js
+++ b/test/test.js
@@ -131,18 +131,10 @@
   /** Use a single "load" function. */
   var load = (typeof require == 'function' && !amd)
     ? require
-    : (isJava && root.load) || noop;
+    : (isJava ? root.load : noop);
 
   /** The unit testing framework. */
-  var QUnit = (function() {
-    return  root.QUnit || (
-      root.addEventListener || (root.addEventListener = noop),
-      root.setTimeout || (root.setTimeout = noop),
-      root.QUnit = load('../node_modules/qunitjs/qunit/qunit.js') || root.QUnit,
-      addEventListener === noop && delete root.addEventListener,
-      root.QUnit
-    );
-  }());
+  var QUnit = root.QUnit || (root.QUnit = load('../node_modules/qunitjs/qunit/qunit.js') || root.QUnit);
 
   /** Load and install QUnit Extras and ES6 Set/WeakMap shims. */
   (function() {
@@ -13953,6 +13945,6 @@
 
   if (!document) {
     QUnit.config.noglobals = true;
-    QUnit.start();
+    QUnit.load();
   }
 }.call(this));