rewrite test/index.html to load renderjs using requirejs, still loading qunit directly on purpose.

d6d834b8 · Kazuhiko Shiozaki · 68198036 · d6d834b8 · d6d834b8
Commit d6d834b8 authored Jan 28, 2013 by Kazuhiko Shiozaki
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 13 deletions

test/index.html test/index.html +4 -13

test/require-renderjs_test.js test/require-renderjs_test.js +11 -0

No files found.
--- a/test/index.html
+++ b/test/index.html
@@ -3,11 +3,10 @@
 <html>
  <head>
    <link rel="stylesheet" href="../lib/qunit/qunit.css" type="text/css"/>
-    <script src="../lib/jquery/jquery.js"> </script>
    <script src="../lib/qunit/qunit.js" type="text/javascript"></script>
-    <script type="text/javascript" src="../renderjs.js"></script>
-    <script type="text/javascript" src="renderjs_test.js"></script>
-
+    <script data-main="require-renderjs_test.js"
+            type="text/javascript"
+            src="../lib/require/require.js"></script>
  </head>
  <body>
    <h1 id="qunit-header">QUnit RenderJS test suite</h1>
@@ -15,13 +14,5 @@
    <h2 id="qunit-userAgent"></h2>
    <ol id="qunit-tests"></ol>
    <div id="qunit-fixture"> </div>
-
-    <script type="text/javascript">
-     //<![CDATA[
-      $(document).ready(setupRenderJSTest());
-      //]]>
-    </script>
-
-
  </body>
 </html>
--- a/test/require-renderjs_test.js
+++ b/test/require-renderjs_test.js
+// JavaScript file that is used to load RenderJs depenencies
+require.config({
+  baseUrl: "..",
+  shim: {
+    "test/renderjs_test": [ "renderjs" ]
+  }
+});
+
+require([ "require-renderjs", "test/renderjs_test" ], function(domReady) {
+  setupRenderJSTest();
+});