Move testsuite files around so that all external data providers are in the data directory

Author: mikesherov

grunt.js

@@ -17,7 +17,7 @@ grunt.initConfig({
 	lint: {
 		src: [ "jquery.simulate.js" ],
 		grunt: "grunt.js",
-		test: "test/unit/**"
+		test: [ "test/*.js", "test/unit/*.js" ]
 	},
 
 	jshint: (function() {
@@ -39,7 +39,7 @@ grunt.initConfig({
 		return {
 			src: parserc(),
 			grunt: parserc(),
-			test: parserc( "test/unit/" )
+			test: parserc( "test/" )
 		};
 	})(),
 

test/unit/.jshintrc renamed to test/.jshintrc

@@ -21,6 +21,7 @@
 		"module",
 		"notEqual",
 		"ok",
+		"QUnit",
 		"start",
 		"stop",
 		"strictEqual",

test/jquery-1.6.1.js renamed to test/data/jquery-1.6.1.js

@@ -18,7 +18,7 @@ for ( ; i < length; i++ ) {
 if ( version === "git" ) {
 	url = "http://code.jquery.com/jquery-git.js";
 } else {
-	url = "jquery-" + ( version || "1.7.2" ) + ".js";
+	url = "data/jquery-" + ( version || "1.7.2" ) + ".js";
 }
 
 document.write( "<script src='" + url + "'></script>" );

test/jquery-1.6.2.js renamed to test/data/jquery-1.6.2.js

@@ -4,10 +4,10 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>jQuery-Simulate Test Suite</title>
 	<link rel="Stylesheet" media="screen" href="qunit/qunit/qunit.css" />
-	<script src="data/testinit.js"></script>
-	<script src="jquery.js"></script>
-	<script src="../jquery.simulate.js"></script>
 	<script src="qunit/qunit/qunit.js"></script>
+	<script src="testinit.js"></script>
+	<script src="data/jquery.js"></script>
+	<script src="../jquery.simulate.js"></script>
 	<script src="unit/simulate.js"></script>
 	<script src="data/swarminject.js"></script>
 </head>

test/jquery-1.6.3.js renamed to test/data/jquery-1.6.3.js

@@ -0,0 +1,11 @@
+(function() {
+
+var reset = QUnit.reset;
+QUnit.reset = function() {
+	// Ensure jQuery events and data on the fixture are properly removed
+	jQuery("#qunit-fixture").empty();
+	// Let QUnit reset the fixture
+	reset.apply( this, arguments );
+};
+
+})();