Related to requirejs#325, organize dataMain tests in a folder, create a test for 325.

jrburke · jrburke · commit ecf43ffb7a96 · 2012-06-18T13:39:28.000-07:00
diff --git a/tests/all.js b/tests/all.js
@@ -11,8 +11,9 @@ doh.registerUrl("baseUrl", "../baseUrl.html");
 
 doh.registerUrl("config", "../config.html");
 doh.registerUrl("configRequirejs", "../configRequirejs.html");
-doh.registerUrl("dataMain", "../dataMain.html");
-doh.registerUrl("dataMainIndex", "../dataMainIndex/dataMainIndex.html");
+doh.registerUrl("dataMain", "../dataMain/dataMain.html");
+doh.registerUrl("dataMainIndex", "../dataMain/dataMainIndex/dataMainIndex.html");
+doh.registerUrl("dataMainBaseUrl", "../dataMain/baseUrl/dataMainBaseUrl.html");
 
 if (hasToString) {
     doh.registerUrl("anonSimple", "../anon/anonSimple.html");
diff --git a/tests/dataMain/baseUrl/dataMainBaseUrl.html b/tests/dataMain/baseUrl/dataMainBaseUrl.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>require.js: data-main baseUrl Test</title>
+    <script type="text/javascript" src="../../doh/runner.js"></script>
+    <script type="text/javascript" src="../../doh/_browserRunner.js"></script>
+    <script>
+    	var require = {
+            baseUrl: "./"
+        };
+    </script>
+    <script type="text/javascript" data-main="src/main" src="../../../require.js"></script>
+</head>
+<body>
+    <h1>require.js: data-main baseUrl Test</h1>
+
+    <p>Confirm that setting a baseUrl does not mess up the data-main module
+    ID. More info:
+    <a href="https://github.com/jrburke/requirejs/issues/325">325</a>.
+
+    <p>Check console for messages</p>
+</body>
+</html>
diff --git a/tests/dataMain/baseUrl/src/a.js b/tests/dataMain/baseUrl/src/a.js
@@ -0,0 +1,4 @@
+define({
+    name: 'a'
+});
+
diff --git a/tests/dataMain/baseUrl/src/main.js b/tests/dataMain/baseUrl/src/main.js
@@ -0,0 +1,11 @@
+define(['a'], function (a) {
+    doh.register(
+        "dataMainBaseUrl",
+        [
+            function dataMainBaseUrl(t){
+                t.is("a", a.name);
+            }
+        ]
+    );
+    doh.run();
+});
diff --git a/tests/dataMain/dataMain.html b/tests/dataMain/dataMain.html
@@ -2,9 +2,9 @@
 <html>
 <head>
     <title>require.js: data-main Test</title>
-    <script type="text/javascript" src="doh/runner.js"></script>
-    <script type="text/javascript" src="doh/_browserRunner.js"></script>
-    <script type="text/javascript" data-main="dataMain.js" src="../require.js"></script>
+    <script type="text/javascript" src="../doh/runner.js"></script>
+    <script type="text/javascript" src="../doh/_browserRunner.js"></script>
+    <script type="text/javascript" data-main="dataMain.js" src="../../require.js"></script>
 </head>
 <body>
     <h1>require.js: data-main Test</h1>
diff --git a/tests/dataMain/dataMain.js b/tests/dataMain/dataMain.js
@@ -1,10 +1,10 @@
 require({
-        baseUrl: "./"    
+        baseUrl: "../"
     },
     ["require", "simple"],
     function(require, simple) {
         doh.register(
-            "dataMain", 
+            "dataMain",
             [
                 function dataMain(t){
                     t.is("blue", simple.color);
diff --git a/tests/dataMain/dataMainIndex/dataMainIndex.html b/tests/dataMain/dataMainIndex/dataMainIndex.html
@@ -2,21 +2,21 @@
 <html>
 <head>
     <title>require.js: data-main index Test</title>
-    <script type="text/javascript" src="../doh/runner.js"></script>
-    <script type="text/javascript" src="../doh/_browserRunner.js"></script>
+    <script type="text/javascript" src="../../doh/runner.js"></script>
+    <script type="text/javascript" src="../../doh/_browserRunner.js"></script>
     <script>
     	var require = {
             baseUrl: "./"
         };
     </script>
-    <script type="text/javascript" data-main="index.js" src="../../require.js"></script>
+    <script type="text/javascript" data-main="index.js" src="../../../require.js"></script>
 </head>
 <body>
     <h1>require.js: data-main index Test</h1>
 
     <p>Confirm that a data-main="index.js" with an inline config with a baseUrl
     works with a built script that has "index" as the top level define call. More info:
-    <a href="https://github.com/jrburke/requirejs/issues/303"></a>.
+    <a href="https://github.com/jrburke/requirejs/issues/303">303</a>.
 
     <p>Check console for messages</p>
 </body>
diff --git a/tests/dataMain/dataMainIndex/index.js b/tests/dataMain/dataMainIndex/index.js

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +define({
 +    name: 'a'
 +});
++