Update to Unit-Composite 2.0.0

Author: mar10

lib/qunit-composite.js

@@ -14,7 +14,7 @@
 		factory( QUnit );
 	}
 }(function( QUnit ) {
-var iframe, hasBound,
+var iframe, hasBound, resumeTests, suiteAssert,
 	modules = 1,
 	executingComposite = false;
 
@@ -48,7 +48,9 @@ function runSuite( suite ) {
 		path = suite;
 	}
 
-	QUnit.asyncTest( suite, function() {
+	QUnit.test( suite, function( assert ) {
+		resumeTests = assert.async();
+		suiteAssert = assert;
 		iframe.setAttribute( "src", path );
 		// QUnit.start is called from the child iframe's QUnit.done hook.
 	});
@@ -90,13 +92,13 @@ function initIframe() {
 			}
 			// Pass all test details through to the main page
 			var message = ( moduleName ? moduleName + ": " : "" ) + testName + ": " + ( data.message || ( data.result ? "okay" : "failed" ) );
-			expect( ++count );
-			QUnit.push( data.result, data.actual, data.expected, message );
+			suiteAssert.expect( ++count );
+			suiteAssert.push( data.result, data.actual, data.expected, message );
 		});
 
 		// Continue the outer test when the iframe's test is done
 		iframeWin.QUnit.done(function() {
-			QUnit.start();
+			resumeTests();
 		});
 	}
 
@@ -177,7 +179,7 @@ QUnit.testSuites = function( name, suites ) {
 	}
 
 	QUnit.module( name, {
-		setup: function () {
+		beforeEach: function () {
 			executingComposite = true;
 		}
 	});
@@ -193,16 +195,8 @@ QUnit.testDone(function( data ) {
 	}
 
 	var i, len,
-		testId = data.testId || QUnit.config.current.testId || data.testNumber || QUnit.config.current.testNumber,
-		current = testId ?
-			(
-				// QUnit @^1.16.0
-				document.getElementById( "qunit-test-output-" + testId ) ||
-				// QUnit @1.15.x
-				document.getElementById( "qunit-test-output" + testId )
-			) :
-			// QUnit @<1.15.0
-			document.getElementById( QUnit.config.current.id ),
+		testId = data.testId,
+		current = document.getElementById( "qunit-test-output-" + testId ),
 		children = current && current.children,
 		src = iframe.src;
 
@@ -231,4 +225,4 @@ QUnit.testDone(function( data ) {
 	current.getElementsByTagName( "a" )[ 0 ].href = src;
 });
 
-}));
+}));