From 963e2c23b0183080a1f90c7f653285c9299876eb Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Sat, 30 Apr 2016 11:59:06 -0700
Subject: [PATCH] Upgrade to qunit-extras 2.0.

---
 package.json    |  2 +-
 test/test-fp.js | 31 ++++++++-----------------------
 test/test.js    | 11 +++--------
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index d39f5244a..af441b22c 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "lodash": "4.10.0",
     "markdown-doctest": "^0.3.4",
     "platform": "^1.3.1",
-    "qunit-extras": "^1.5.0",
+    "qunit-extras": "^2.0.0",
     "qunitjs": "~1.23.1",
     "request": "^2.69.0",
     "requirejs": "^2.2.0",
diff --git a/test/test-fp.js b/test/test-fp.js
index f4354795a..6a471bf7b 100644
--- a/test/test-fp.js
+++ b/test/test-fp.js
@@ -14,10 +14,8 @@
 
   /** Method and object shortcuts. */
   var phantom = root.phantom,
-      amd = root.define && define.amd,
       argv = root.process && process.argv,
       document = !phantom && root.document,
-      noop = function() {},
       slice = arrayProto.slice,
       WeakMap = root.WeakMap;
 
@@ -26,30 +24,17 @@
 
   /*--------------------------------------------------------------------------*/
 
-  /** Use a single "load" function. */
-  var load = (!amd && typeof require == 'function')
-    ? require
-    : noop;
+  /** Load QUnit and extras. */
+  var QUnit = root.QUnit || require('qunit-extras');
 
-  /** The unit testing framework. */
-  var QUnit = root.QUnit || (root.QUnit = (
-    QUnit = load('../node_modules/qunitjs/qunit/qunit.js') || root.QUnit,
-    QUnit = QUnit.QUnit || QUnit
-  ));
-
-  /** Load stable Lodash and QUnit Extras. */
-  var _ = root._ || (root._ = (
-    _ = load('../lodash.js'),
+  /** Load stable Lodash. */
+  var _ = root._ || (
+    _ = require('../lodash.js'),
     _.runInContext(root)
-  ));
-
-  var QUnitExtras = load('../node_modules/qunit-extras/qunit-extras.js');
-  if (QUnitExtras) {
-    QUnitExtras.runInContext(root);
-  }
+  );
 
   var convert = (function() {
-    var baseConvert = root.fp || load('../fp/_baseConvert.js');
+    var baseConvert = root.fp || require('../fp/_baseConvert.js');
     if (!root.fp) {
       return function(name, func, options) {
         return baseConvert(_, name, func, options);
@@ -79,7 +64,7 @@
     ? (fp = _.noConflict(), _ = root._, fp)
     : convert(_.runInContext());
 
-  var mapping = root.mapping || load('../fp/_mapping.js');
+  var mapping = root.mapping || require('../fp/_mapping.js');
 
   /*--------------------------------------------------------------------------*/
 
diff --git a/test/test.js b/test/test.js
index 0f8bb231e..2e6bf6c50 100644
--- a/test/test.js
+++ b/test/test.js
@@ -300,10 +300,10 @@
     ? require
     : noop;
 
-  /** The unit testing framework. */
-  var QUnit = root.QUnit || (root.QUnit = load('../node_modules/qunitjs/qunit/qunit.js'));
+  /** Load QUnit and extras. */
+  var QUnit = root.QUnit || load('qunit-extras');
 
-  /** Load stable Lodash and QUnit Extras. */
+  /** Load stable Lodash. */
   var lodashStable = root.lodashStable;
   if (!lodashStable) {
     try {
@@ -316,11 +316,6 @@
   }
   lodashStable = lodashStable.runInContext(root);
 
-  var QUnitExtras = load('../node_modules/qunit-extras/qunit-extras.js');
-  if (QUnitExtras) {
-    QUnitExtras.runInContext(root);
-  }
-
   /** The `lodash` function to test. */
   var _ = root._ || (root._ = (
     _ = load(filePath),