Refactored test suite and included RequireJS optimizer tests.

Author: tbranyen

.gitignore

@@ -1,3 +1,4 @@
 /test/reports/
+/test/build_tools/_output/
 /bower_components/
 /node_modules/

Gruntfile.coffee

@@ -1,12 +1,14 @@
 module.exports = ->
   @initConfig
 
+    clean: ["test/build_tools/_output"]
+
     jshint: ["loader.js"]
 
     connect:
       test:
         options:
-          port: 8000
+          port: 7357
 
     watch:
       files: ["loader.js", "test/**/*", "Gruntfile.coffee"]
@@ -16,15 +18,41 @@ module.exports = ->
       test:
         options:
           urls: [
-            "http://localhost:8000/test/requirejs.html"
-            "http://localhost:8000/test/dojo.html"
-            "http://localhost:8000/test/curl.html"
+            "http://localhost:7357/test/requirejs.html"
+            "http://localhost:7357/test/dojo.html"
+            "http://localhost:7357/test/curl.html"
           ]
 
+    requirejs:
+      test:
+        options:
+          baseUrl: "test/build_tools"
+          include: "r"
+          out: "test/build_tools/_output/r.js"
+          optimize: "none"
+          exclude: ["lodash", "ldsh"]
+
+          paths:
+            lodash: "../../bower_components/lodash/dist/lodash"
+            ldsh: "../../loader"
+
   @loadNpmTasks "grunt-contrib-jshint"
   @loadNpmTasks "grunt-contrib-watch"
   @loadNpmTasks "grunt-contrib-connect"
   @loadNpmTasks "grunt-contrib-qunit"
+  @loadNpmTasks "grunt-contrib-clean"
   @loadNpmTasks "grunt-clear"
 
-  @registerTask "default", ["jshint", "connect", "qunit"]
+  @loadNpmTasks "grunt-contrib-requirejs"
+
+  @registerTask "test", [
+    "clean"
+    "requirejs"
+    "qunit"
+  ]
+
+  @registerTask "default", [
+    "jshint"
+    "connect"
+    "test"
+  ]

loader.js

@@ -32,13 +32,28 @@ define(function(require, exports) {
 
     var settings = configure(config);
 
-    // Builds must happen with Node.
+    // Builds with r.js require Node.js to be installed.
     if (config.isBuild) {
       var path = settings.root + name + settings.ext;
+      var contents = "";
+
+      try {
+        // First try reading the filepath as-is.
+        contents = String(fs.readFileSync(path));
+      } catch(ex) {
+        // If it failed, it's most likely because of a leading `/` and not an
+        // absolute path.  Remove the leading slash and try again.
+        if (path[0] === "/") {
+          path = path.slice(1);
+        }
+
+        // Try reading again with the leading `/`.
+        contents = String(fs.readFileSync(path));
+      }
 
       // Read in the file synchronously, as RequireJS expects, and return the
       // contents.  Process as a Lo-Dash template.
-      buildMap[name] = _.template(String(fs.readFileSync(path)));
+      buildMap[name] = _.template(contents);
 
       return load();
     }
@@ -58,7 +73,7 @@ define(function(require, exports) {
     };
 
     // Initiate the fetch.
-    xhr.open("GET", "/" + settings.root + name + settings.ext, true);
+    xhr.open("GET", settings.root + name + settings.ext, true);
     xhr.send(null);
   };
 
@@ -106,6 +121,11 @@ define(function(require, exports) {
       templateSettings: {}
     }, config.lodashLoader);
 
+    // Ensure the root has been properly configured with a trailing slash.
+    if (settings.root[settings.root.length-1] !== "/") {
+      settings.root += "/";
+    }
+
     // Set the custom passed in template settings.
     _.extend(_.templateSettings, settings.templateSettings);
 

package.json

@@ -12,7 +12,9 @@
     "grunt-contrib-watch": "~0.5.3",
     "grunt-clear": "~0.2.1",
     "grunt-contrib-connect": "~0.5.0",
-    "grunt-contrib-qunit": "~0.3.0"
+    "grunt-contrib-qunit": "~0.3.0",
+    "grunt-dojo": "~0.2.4",
+    "grunt-contrib-requirejs": "~0.4.1"
   },
   "scripts": {
     "test": "grunt",

test/build_tools/fixtures/basic.html

@@ -0,0 +1 @@
+It works!

test/build_tools/r.js

@@ -0,0 +1 @@
+require(["ldsh!fixtures/basic"]);

test/spec/curl.js

@@ -7,12 +7,11 @@
 QUnit.module("curl");
 
 curl.config({
-  baseUrl: "../",
+  baseUrl: "/test",
 
   paths: {
-    "lodash": "bower_components/lodash/dist/lodash",
-    "ldsh": "loader",
-    "fixtures": "test/fixtures"
+    "lodash": "../bower_components/lodash/dist/lodash",
+    "ldsh": "../loader"
   }
 });
 

test/spec/dojo.js

@@ -5,16 +5,17 @@
  */
 QUnit.module("dojo");
 
-asyncTest("AMD support", 1, function() {
-  require({
-    baseUrl: "../",
+require({
+  baseUrl: "/test",
 
-    paths: {
-      lodash: "bower_components/lodash/dist/lodash",
-      ldsh: "loader",
-      fixtures: "test/fixtures"
-    }
-  }, ["ldsh!fixtures/template"], function(template) {
+  paths: {
+    lodash: "../bower_components/lodash/dist/lodash",
+    ldsh: "../loader"
+  }
+});
+
+asyncTest("AMD support", 1, function() {
+  require(["ldsh!fixtures/template"], function(template) {
     ok(template(), "It works!");
 
     start();
@@ -48,7 +49,7 @@ asyncTest("templateSettings", function() {
 });
 
 asyncTest("relative paths", 1, function() {
-  require(["fixtures/nested/module"], function(exports) {
+  require(["./fixtures/nested/module.js"], function(exports) {
     ok(exports.template(), "It works!");
 
     start();

test/spec/requirejs.js

@@ -7,12 +7,11 @@ QUnit.module("requirejs");
 
 asyncTest("AMD support", 1, function() {
   require.config({
-    baseUrl: "../",
+    baseUrl: "/test",
 
     paths: {
-      lodash: "bower_components/lodash/dist/lodash",
-      ldsh: "loader",
-      fixtures: "test/fixtures"
+      lodash: "../bower_components/lodash/dist/lodash",
+      ldsh: "../loader"
     }
   });
 
@@ -56,3 +55,15 @@ asyncTest("relative paths", 1, function() {
     start();
   });
 });
+
+asyncTest("plugin works with r.js optimizer", 1, function() {
+  // Load the module containing the build.
+  require(["build_tools/_output/r"], function() {
+    // Request the template.
+    require(["ldsh!fixtures/basic"], function(template) {
+      ok(template(), "It works!");
+
+      start();
+    });
+  });
+});