Permalink
Browse files

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

  • Loading branch information...
jrburke committed Oct 18, 2010
1 parent 3d4ae2f commit 88847fe53ab2e97e7ba7ec8f2afc056fb29b0a70
Showing with 27 additions and 1 deletion.
  1. +1 −1 require.js
  2. +11 −0 testBaseUrl.js
  3. +1 −0 tests/all.js
  4. +14 −0 tests/baseUrl.html
View
@@ -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");
View
@@ -0,0 +1,11 @@
+define(function() {
+ doh.register(
+ "testBaseUrl",
+ [
+ function testBaseUrl(t){
+ t.is(true, true);
+ }
+ ]
+ );
+ doh.run();
+});
View
@@ -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");
View
@@ -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>

0 comments on commit 88847fe

Please sign in to comment.