Fix bone-headed regexp mistake, and add test so I do not do it again.

requirejs · Oct 18, 2010 · 88847fe · 88847fe
1 parent 3d4ae2f
commit 88847fe
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/require.js b/require.js
@@ -1579,7 +1579,7 @@ var require, define;
             //>>excludeStart("dojoConvert", pragmas.dojoConvert);
 
             //>>excludeStart("jquery", pragmas.jquery);
-            rePkg = /allplugins-?require\.js(\W|$)/i;
+            rePkg = /(allplugins-)?require\.js(\W|$)/i;
             //>>excludeEnd("jquery");
 
             //>>excludeEnd("dojoConvert");

diff --git a/testBaseUrl.js b/testBaseUrl.js
@@ -0,0 +1,11 @@
+define(function() {
+    doh.register(
+        "testBaseUrl", 
+        [
+            function testBaseUrl(t){
+                t.is(true, true);
+            }
+        ]
+    );
+    doh.run();
+});
diff --git a/tests/all.js b/tests/all.js
@@ -1,4 +1,5 @@
 doh.registerUrl("simple", "../simple.html");
+doh.registerUrl("baseUrl", "../baseUrl.html");
 doh.registerUrl("config", "../config.html");
 doh.registerUrl("dataMain", "../dataMain.html");
 doh.registerUrl("anonSimple", "../anon/anonSimple.html");

diff --git a/tests/baseUrl.html b/tests/baseUrl.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Default baseUrl Test</title>
+    <script type="text/javascript" src="doh/runner.js"></script>
+    <script type="text/javascript" src="doh/_browserRunner.js"></script>
+    <script data-main="testBaseUrl" src="../require.js"></script>
+    </head>
+    <body>
+        <h1>require.js: Default baseUrl Test</h1>
+        <p>Test for usage of text! require plugin.
+        <p>Check console for messages</p>
+    </body>
+</html>