From 7c7e6f2578c0031b8fe521fcfab01718881e507d Mon Sep 17 00:00:00 2001
From: Ghislain Seguin <ghislain@gmail.com>
Date: Fri, 13 Jan 2012 09:23:45 -0800
Subject: [PATCH] Backed out AMD changes to support test suite until we figure
 out how to make it stable

---
 tests/unit/support/index.html      | 21 +++-----
 tests/unit/support/support_core.js | 84 ++++++++++++------------------
 2 files changed, 41 insertions(+), 64 deletions(-)

diff --git a/tests/unit/support/index.html b/tests/unit/support/index.html
index fbbe6add..25061aae 100644
--- a/tests/unit/support/index.html
+++ b/tests/unit/support/index.html
@@ -5,23 +5,18 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery Mobile Support Test Suite</title>
 
-	<script src="../../../external/requirejs/require.js"></script>
 	<script src="../../../js/jquery.js"></script>
-	<script src="../../../external/qunit.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
-	<script>
-		$.testHelper.asyncLoad([
-			[
-				"jquery.mobile.support"
-			],
-			[
-				"support_core.js"
-			]
-		]);
-	</script>
+	<script src="../../../js/jquery.mobile.define.js"></script>
+	<script src="../../../js/jquery.ui.widget.js"></script>
+	<script src="../../../js/jquery.mobile.widget.js"></script>
+	<script src="../../../js/jquery.mobile.media.js"></script>
+	<script src="../../../js/jquery.mobile.support.js"></script>
 
-	<link rel="stylesheet"  href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<script src="../../../external/qunit.js"></script>
+
+	<script src="support_core.js"></script>
 
 	<script src="../swarminject.js"></script>
 </head>
diff --git a/tests/unit/support/support_core.js b/tests/unit/support/support_core.js
index 8a9b083a..f7a390e1 100644
--- a/tests/unit/support/support_core.js
+++ b/tests/unit/support/support_core.js
@@ -4,7 +4,7 @@
 
 $.testHelper.excludeFileProtocol(function(){
 	var	prependToFn = $.fn.prependTo,
-		libName = "jquery.mobile.support";
+			libName = "jquery.mobile.support.js";
 
 	module(libName, {
 		teardown: function(){
@@ -15,7 +15,7 @@ $.testHelper.excludeFileProtocol(function(){
 
 	// NOTE following two tests have debatable value as they only
 	//      prevent property name changes and improper attribute checks
-	asyncTest( "detects functionality from basic affirmative properties and attributes", 5, function(){
+	test( "detects functionality from basic affirmative properties and attributes", function(){
 		// TODO expose properties for less brittle tests
 		$.extend(window, {
 			WebKitTransitionEvent: true,
@@ -30,29 +30,23 @@ $.testHelper.excludeFileProtocol(function(){
 
 		$.mobile.media = function(){ return true; };
 
-		$.testHelper.reloadModule(libName).done(
-			function() {
-				ok($.support.orientation);
-				ok($.support.touch);
-				ok($.support.cssTransitions);
-				ok($.support.pushState);
-				ok($.support.mediaquery);
-				start();
-			}
-		);
+		$.testHelper.reloadLib(libName);
+
+		ok($.support.orientation);
+		ok($.support.touch);
+		ok($.support.cssTransitions);
+		ok($.support.pushState);
+		ok($.support.mediaquery);
 	});
 
-	asyncTest( "detects functionality from basic negative properties and attributes (where possible)", 2, function(){
+	test( "detects functionality from basic negative properties and attributes (where possible)", function(){
 		delete window["orientation"];
 		delete document["ontouchend"];
 
-		$.testHelper.reloadModule(libName).done(
-			function() {
-				ok(!$.support.orientation);
-				ok(!$.support.touch);
-				start();
-			}
-		);
+		$.testHelper.reloadLib(libName);
+
+		ok(!$.support.orientation);
+		ok(!$.support.touch);
 	});
 
 	// NOTE mocks prependTo to simulate base href updates or lack thereof
@@ -67,44 +61,32 @@ $.testHelper.excludeFileProtocol(function(){
 		};
 	};
 
-	asyncTest( "detects dynamic base tag when new base element added and base href updates", 1, function(){
+	test( "detects dynamic base tag when new base element added and base href updates", function(){
 		mockBaseCheck(location.protocol + '//' + location.host + location.pathname + "ui-dir/");
-		$.testHelper.reloadModule(libName).done(
-			function() {
-				ok($.support.dynamicBaseTag);
-				start();
-			}
-		);
+		$.testHelper.reloadLib(libName);
+		ok($.support.dynamicBaseTag);
 	});
 
-	asyncTest( "detects no dynamic base tag when new base element added and base href unchanged", 1, function(){
+	test( "detects no dynamic base tag when new base element added and base href unchanged", function(){
 		mockBaseCheck('testurl');
-
-		$.testHelper.reloadModule(libName).done(
-			function() {
-				ok(!$.support.dynamicBaseTag);
-				start();
-			}
-		);
+		$.testHelper.reloadLib(libName);
+		ok(!$.support.dynamicBaseTag);
 	});
 
-	asyncTest( "jQM's IE browser check properly detects IE versions", 1, function(){
-		//here we're just comparing our version to what the conditional compilation finds
-		var ie 			   = !!$.browser.msie, //get a boolean
-			version 	   = parseInt( $.browser.version, 10),
-			jqmdetectedver = $.mobile.browser.ie;
+	test( "jQM's IE browser check properly detects IE versions", function(){
+		$.testHelper.reloadLib(libName);
 
-		$.testHelper.reloadModule(libName).done(
-			function() {
-				if( ie ){
-					same(version, jqmdetectedver, "It's IE and the version is correct");
-				}
-				else{
-					same(ie, jqmdetectedver, "It's not IE");
-				}
-				start();
-			}
-		);
+		//here we're just comparing our version to what the conditional compilation finds
+		 var ie 			= !!$.browser.msie, //get a boolean
+		 	 version 		= parseInt( $.browser.version, 10),
+		 	 jqmdetectedver = $.mobile.browser.ie;
+
+		 	if( ie ){
+		 		same(version, jqmdetectedver, "It's IE and the version is correct");
+		 	}
+		 	else{
+		 		same(ie, jqmdetectedver, "It's not IE");
+		 	}
 	});