Replacing use of Dojo with RequireJS in /tests

Author: Mark Healey

sdk/f2.no-third-party.js

@@ -5,7 +5,7 @@
 	}
 
 /*!
- * F2 v1.4.0 10-16-2013
+ * F2 v1.4.0 10-17-2013
  * Copyright (c) 2013 Markit On Demand, Inc. http://www.openf2.org
  *
  * "F2" is licensed under the Apache License, Version 2.0 (the "License"); 

tests/index-amd.html

@@ -33,7 +33,8 @@
 
 	<!-- include source files here... -->
 	<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-	<script type="text/javascript" data-dojo-config="async: true" src="https://ajax.googleapis.com/ajax/libs/dojo/1.9.1/dojo/dojo.js"></script>
+	<!--<script type="text/javascript" data-dojo-config="async: true, isJasmineTestRunner: true" src="https://ajax.googleapis.com/ajax/libs/dojo/1.9.1/dojo/dojo.js"></script>-->
+	<script type="text/javascript" src="../sdk/src/third-party/require.min.js"></script>
 
 	<!-- include spec files here... -->
 	<script type="text/javascript" src="spec/spec-helpers.js"></script>
@@ -46,46 +47,44 @@
 	<script type="text/javascript" src="js/preloadedTest-amd.js"></script>
 
 	<script type="text/javascript">
-		require(["dojo/ready"], function (ready) {
-			ready(function () {
-				var jasmineEnv = jasmine.getEnv();
-				jasmineEnv.updateInterval = 1000;
-
-				var htmlReporter = new jasmine.HtmlReporter();
-
-				jasmineEnv.addReporter(htmlReporter);
-
-				jasmineEnv.specFilter = function(spec) {
-					return htmlReporter.specFilter(spec);
-				};
-								
-				jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
-		
-				var console_reporter = new jasmine.ConsoleReporter()
-				jasmine.getEnv().addReporter(console_reporter);
-
-				var currentWindowOnload = window.onload;
-
-				window.onload = function() {
-					if (currentWindowOnload) {
-						currentWindowOnload();
-					}
-					execJasmine();
-				};
-
-				function execJasmine() {
-					// allow F2 to be reloaded on the fly
-					window.F2_TESTING_MODE = true;
-
-					// defined by the node test server, if it is running
-					if (typeof window.F2_NODE_TEST_SERVER === 'undefined') {
-						window.F2_NODE_TEST_SERVER = false; // just so we don't need to check for 'undefined' elsewhere
-						document.getElementById('test-server-failure').style.display = 'block';
-					}
-
-					jasmineEnv.execute();
+		$(function () {
+			var jasmineEnv = jasmine.getEnv();
+			jasmineEnv.updateInterval = 1000;
+
+			var htmlReporter = new jasmine.HtmlReporter();
+
+			jasmineEnv.addReporter(htmlReporter);
+
+			jasmineEnv.specFilter = function(spec) {
+				return htmlReporter.specFilter(spec);
+			};
+							
+			jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
+	
+			var console_reporter = new jasmine.ConsoleReporter()
+			jasmine.getEnv().addReporter(console_reporter);
+
+			var currentWindowOnload = window.onload;
+
+			window.onload = function() {
+				if (currentWindowOnload) {
+					currentWindowOnload();
 				}
-			})
+				execJasmine();
+			};
+
+			function execJasmine() {
+				// allow F2 to be reloaded on the fly
+				window.F2_TESTING_MODE = true;
+
+				// defined by the node test server, if it is running
+				if (typeof window.F2_NODE_TEST_SERVER === 'undefined') {
+					window.F2_NODE_TEST_SERVER = false; // just so we don't need to check for 'undefined' elsewhere
+					document.getElementById('test-server-failure').style.display = 'block';
+				}
+
+				jasmineEnv.execute();
+			}
 		});
 	</script>
 </body>