Tests: Remove usage of QUnit.extend

Author: mgol

tests/lib/vendor/qunit-assert-classes/qunit-assert-classes.js

@@ -75,7 +75,9 @@
 		return message + ( classes.length > 1 ? "es" : "" );
 	}
 
-	QUnit.extend( QUnit.assert, {
+	// Custom modification: removing QUnit.extend
+	var key;
+	var qunitAssertExtensions = {
 		hasClasses: function( element, classes, message ) {
 			var classArray = splitClasses( classes ),
 				results = check( element, classArray );
@@ -233,5 +235,11 @@
 				message: message
 			} );
 		}
-	});
+	};
+
+	// Custom modification: removing QUnit.extend
+	for ( key in qunitAssertExtensions ) {
+		QUnit.assert[ key ] = qunitAssertExtensions[ key ];
+	}
+
 } ) );

tests/lib/vendor/qunit-assert-close/qunit-assert-close.js

@@ -14,11 +14,10 @@
   else if (typeof module !== "undefined" && module && module.exports && typeof require === "function") {
     module.exports = factory(require("qunitjs"));
   }
-  // For CommonJS with `exports`, but without `module.exports`, like Rhino
-  else if (typeof exports !== "undefined" && exports && typeof require === "function") {
-    var qunit = require("qunitjs");
-    qunit.extend(exports, factory(qunit));
-  }
+
+  // Custom modification: remove the non-Node.js CommonJS part due to its
+  // usage of QUnit.extend.
+  //
   // For browser globals
   else {
     factory(QUnit);
@@ -194,15 +193,17 @@
     });
   };
 
-
+  var key;
   var api = {
     close: close,
     notClose: notClose,
     closePercent: close.percent,
     notClosePercent: notClose.percent
   };
 
-  QUnit.extend(QUnit.assert, api);
+  for (key in api) {
+    QUnit.assert[key] = api[key];
+  }
 
   return api;
 }));