Tests: Must not require() and include js/ at the same time

Author: Gabriel Schulhof

tests/integration/navigation/index.html

@@ -13,10 +13,6 @@
 				$.testHelper.setPushState();
 		});
 	</script>
-	<!-- Because our reloading code reloads our AMD modules
-	but now tests are running against the built bundle, we need to include the define shim
-	in order for the reload to work -->
-	<script src="../../../js/jquery.mobile.define.js"></script>
 	<script src="../../../js/"></script>
 	<link rel="stylesheet"	href="../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>

tests/unit/event/index.html

@@ -12,7 +12,6 @@
 		$.testHelper.setPushState();
 	</script>
 
-	<script src="../../../js/jquery.mobile.define.js"></script>
 	<script src="../../../js/ns.js"></script>
 	<script src="../../../js/support/touch.js"></script>
 	<script src="../../../js/events.js"></script>

tests/unit/kitchensink/index.html

@@ -4,14 +4,11 @@
 	<meta charset="UTF-8" />
 	<title>jQuery Mobile Kitchen Sink Test Suite</title>
 	<!-- meta viewport left out on purpose for test append -->
-	<script src="../../../external/requirejs/require.js"></script>
-	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
 	<script src="../../../external/jquery/jquery.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../jquery.testHelper.js"></script>
-	<script src="../../../js/jquery.mobile.define.js"></script>
 	<script src="preinit.js"></script>
 	<script src="../../../js/"></script>
 	<script src="kitchensink_core.js"></script>

tests/unit/path/index.html

@@ -4,18 +4,12 @@
 	<meta charset="UTF-8" />
 	<title>jQuery Mobile Navigate Path Helpers Test Suite</title>
 
-	<script src="../../../external/requirejs/require.js"></script>
-	<script src="../../../js/requirejs.config.js"></script>
 	<script src="../../../js/jquery.tag.inserter.js"></script>
 	<script src="../../jquery.setNameSpace.js"></script>
 	<script src="../../../tests/jquery.testHelper.js"></script>
 	<script src="../../../external/qunit/qunit.js"></script>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../jqm-tests.css"/>
-	<!-- Because our reloading code reloads our AMD modules
-	but now tests are running against the built bundle, we need to include the define shim
-	in order for the reload to work -->
-	<script src="../../../js/jquery.mobile.define.js"></script>
 	<script src="../../../js/"></script>
 	<script type="text/javascript" src="path_core.js"></script>
 	<script src="../../swarminject.js"></script>