Merge pull request #17 from Jakobo/issue_13_14

Spec test update for define without dependencies, correction for anon_relative

Fixes #13 #14 #15 #16

Author: thecodedrift

impl/inject/config.js

@@ -26,7 +26,7 @@ var config = function(pathObj) {
         funcString: true,
         namedWrapped: true,
         require: true,
-        plugins: true
-        // pluginDynamic: true
+        plugins: true,
+        pathsConfig: true
     };
 require = undefined;

impl/lsjs/config.js

@@ -9,12 +9,13 @@ localStorage.clear();
 var config = lsjs,
     go = lsjs,
     implemented = {
-		basic: true,
-		anon: true,
-		funcString: true,
-        namedWrapped: true,
-		require: true,
-		plugins: true
-		//pluginDynamic: true
+      // SEE: tests/basic_empty_deps
+      // basic: true,
+      anon: true,
+      funcString: true,
+      namedWrapped: true,
+      require: true,
+      plugins: true
+      //pluginDynamic: true
     };
 require = undefined;

impl/needs/config.js

@@ -1,13 +1,13 @@
 var go = require,
-	config = require.config,
-	implemented = {
-		basic: true,
-		anon: true,
-		require: true,
-		funcString: true,
-		namedWrapped: true,
-		plugins: true,
-		pluginDynamic: false
-	};
+  config = require.config,
+  implemented = {
+    basic: true,
+    anon: true,
+    require: true,
+    funcString: true,
+    namedWrapped: true,
+    plugins: true,
+    pluginDynamic: false
+  };
 
 require = undefined;

impl/requirejs/config.js

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

impl/sample.js

@@ -0,0 +1,33 @@
+/*
+These are all the currently supported tests
+
+Use it as a template for your own impl
+*/
+
+var config, go, implemented;
+
+// config is a way to set up configuration for AMD tests
+config = function () {};
+
+// map this to your loader's entry point
+go = function () {};
+
+// comment out the tests you don't need
+implemented = {
+  basic: true,
+  anon: true,
+  funcString: true,
+  namedWrapped: true,
+  require: true,
+
+  // plugin support
+  plugins: true,
+  pluginDynamic: true,
+
+  // config proposal
+  pathsConfig: true,
+  packagesConfig: true,
+  mapConfig: true,
+  moduleConfig: true,
+  shimConfig: true
+};

server/resources/all.html

@@ -47,6 +47,9 @@ <h2>Tests <span class="or">for {{FRAMEWORK}}</span></h2>
         <li class="basic" id="basic_simple"><a href="/{{FRAMEWORK}}/basic_simple/test.html">
           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
+        </a></li>
       </ul>
     </li>
 
@@ -101,6 +104,9 @@ <h2>Tests <span class="or">for {{FRAMEWORK}}</span></h2>
         <li class="pathsConfig" id="config_paths"><a href="/{{FRAMEWORK}}/config_paths/test.html">
           config_paths: test for the "path" functionality of Common Config
         </a></li>
+        <li class="pathsConfig" id="config_paths"><a href="/{{FRAMEWORK}}/config_paths_relative/test.html">
+          config_paths_relative: ensure that the relative module ID rules still apply, even when using the path config</a></li>
+        </a></li>
       </ul>
     </li>
 

tests/anon_relative/_test.js

@@ -1,12 +1,7 @@
-config({
-  paths: {
-    "array": "impl/array"
-  }
-});
-
-go(     ["_reporter", "require", "array"],
+go(     ["_reporter", "require", "impl/array"],
 function (amdJS,       require,   array) {
     amdJS.assert('impl/array' === array.name, 'anon_relative: array.name');
-    amdJS.assert('util' === array.utilName, 'anon_relative: relative to module ID, not URL');
+    amdJS.assert('impl/util' === array.dotUtilName, 'anon_relative: resolved "./util" to impl/util');
+    amdJS.assert('util' === array.utilName, 'anon_relative: resolved "util" to impl/util');
     amdJS.print('DONE', 'done');
 });

tests/anon_relative/impl/array.js

@@ -1,6 +1,7 @@
-define(['./util'], function (util) {
+define(['./util', 'util'], function (dotUtil, util) {
     return {
         name: 'impl/array',
+        dotUtilName: dotUtil.name,
         utilName: util.name
     };
 });

tests/basic_empty_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_empty_deps/_test.js

@@ -0,0 +1,33 @@
+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();
+    });
+  }
+
+  // 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');
+        });
+      });
+    });
+  });
+  
+});

tests/config_paths_relative/_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/config_paths_relative/_test.js

@@ -0,0 +1,12 @@
+config({
+  paths: {
+    "array": "impl/array"
+  }
+});
+
+go(     ["_reporter", "require", "array"],
+function (amdJS,       require,   array) {
+    amdJS.assert('impl/array' === array.name, 'anon_relative: array.name');
+    amdJS.assert('util' === array.utilName, 'anon_relative: relative to module ID, not URL');
+    amdJS.print('DONE', 'done');
+});

tests/config_paths_relative/impl/array.js

@@ -0,0 +1,6 @@
+define(['./util'], function (util) {
+    return {
+        name: 'impl/array',
+        utilName: util.name
+    };
+});

tests/config_paths_relative/impl/util.js

@@ -0,0 +1,3 @@
+define({
+    name: 'impl/util'
+});

tests/config_paths_relative/util.js

@@ -0,0 +1,3 @@
+define({
+    name: 'util'
+});