Merge pull request #18 from Jakobo/master

Update on #17, Splits tests, uses internal require

Author: thecodedrift

impl/requirejs/config.js

@@ -8,8 +8,7 @@ var config = require,
     //Indicate what levels of the API are implemented by this loader,
     //and therefore which tests to run.
     implemented = {
-        // SEE: tests/basic_empty_deps
-        // basic: true,
+        basic: true,
         anon: true,
         funcString: true,
         namedWrapped: true,

server/resources/all.html

@@ -48,7 +48,10 @@ <h2>Tests <span class="or">for {{FRAMEWORK}}</span></h2>
           basic_simple: amd simple includes for named AMD modules
         </a></li>
         <li class="basic" id="basic_empty_deps"><a href="/{{FRAMEWORK}}/basic_empty_deps/test.html">
-          basic_empty_defs: [] should imply no dependencies, while an empty "dependencies" variable defaults to require, exports, module
+          basic_empty_deps: [] should imply no dependencies, while an empty "dependencies" variable defaults to require, exports, module
+        </a></li>
+        <li class="basic" id="basic_no_deps"><a href="/{{FRAMEWORK}}/basic_no_deps/test.html">
+          basic_no_deps: [] should imply no dependencies, while an empty "dependencies" variable defaults to require, exports, module
         </a></li>
       </ul>
     </li>

tests/basic_empty_deps/_test.js

@@ -1,33 +1,14 @@
 go(["_reporter", "require"], function(amdJS, require) {
 
-  function emptyDeps(then) {
-    define('emptyDeps', [], function() {
-      amdJS.assert(arguments.length === 0, 'basic_empty_deps: [] should be treated as no dependencies instead of the default require, exports, module');
-      then();
-    });
-  }
-
-  function noDeps(then) {
-    define('noDeps', function(require, exports, module) {
-      amdJS.assert(typeof(require) === 'function', 'basic_empty_deps: no dependencies case uses require in first slot. Is a function');
-      amdJS.assert(typeof(exports) === 'object', 'basic_empty_deps: no dependencies case uses exports in second slot. Is an object.');
-      amdJS.assert(typeof(module) === 'object', 'basic_empty_deps: no dependencies case uses module in third slot. Is an object.');
-      then();
-    });
-  }
+  // tests if there are empty dependencies, no arguments are
+  // available in the factory's method
+  define('emptyDeps', [], function() {
+    amdJS.assert(arguments.length === 0, 'basic_empty_deps: [] should be treated as no dependencies instead of the default require, exports, module');
+  });
 
-  // this nesting structure ensures that the AMD define will resolve
-  // before we call the next by after the tests are ran in each use
-  // case. We use named define calls to ensure there are not module
-  // conflicts or mismatches that can occur using anonymous modules.
-  emptyDeps(function () {
-    window.setTimeout(function () {
-      noDeps(function () {
-        window.setTimeout(function () {
-          amdJS.print('DONE', 'done');
-        });
-      });
+  window.setTimeout(function() {
+    require(['emptyDeps'], function () {
+      amdJS.print('DONE', 'done');
     });
   });
-  
-});
+});

tests/basic_no_deps/_reporter.js

@@ -0,0 +1,31 @@
+// _reporter.js
+(function() {
+  var factory = function () {
+    var exports = {};
+
+    exports.print = function () {
+      // global print
+      if (typeof amdJSPrint !== "undefined") {
+        amdJSPrint.apply(undefined, arguments);
+      }
+      else {
+        var stdout = require("system").stdout;
+        stdout.print.apply(stdout, arguments);
+      }
+    };
+
+    exports.assert = function (guard, message) {
+      if (guard) {
+        exports.print("PASS " + message, "pass");
+      } else {
+        exports.print("FAIL " + message, "fail");
+      }
+    };
+
+    return exports;
+  };
+
+  // define this module
+  define("_reporter", [], factory);
+
+})();

tests/basic_no_deps/_test.js

@@ -0,0 +1,16 @@
+go(["_reporter", "require"], function(amdJS, require) {
+
+  // tests if there are NO dependencies, the default
+  // values of "require, exports, module" are used
+  define('noDeps', function(require, exports, module) {
+    amdJS.assert(typeof(require) === 'function', 'basic_empty_deps: no dependencies case uses require in first slot. Is a function');
+    amdJS.assert(typeof(exports) === 'object', 'basic_empty_deps: no dependencies case uses exports in second slot. Is an object.');
+    amdJS.assert(typeof(module) === 'object', 'basic_empty_deps: no dependencies case uses module in third slot. Is an object.');
+  });
+
+  window.setTimeout(function() {
+    require(['noDeps'], function () {
+      amdJS.print('DONE', 'done');
+    });
+  });
+});