diff options
author | isaacs <i@izs.me> | 2011-07-29 11:56:05 -0700 |
---|---|---|
committer | isaacs <i@izs.me> | 2011-07-29 11:56:38 -0700 |
commit | 703a1ffe52b66972f38db19fb68e0f70c3dd2631 (patch) | |
tree | c9c3c65d0706a42c990ad62d02d1861722704080 /test | |
parent | bffb758243ca19d334696a07c8091cf5fb75fe7b (diff) | |
download | node-new-703a1ffe52b66972f38db19fb68e0f70c3dd2631.tar.gz |
Revert "AMD compatibility for node"
This reverts commit 9967c369c9272335bb0343558673b689725c6d7c.
Conflicts:
test/simple/test-module-loading.js
Diffstat (limited to 'test')
-rw-r--r-- | test/fixtures/amd-modules/extra-args.js | 3 | ||||
-rw-r--r-- | test/fixtures/amd-modules/module-exports.js | 3 | ||||
-rw-r--r-- | test/fixtures/amd-modules/object.js | 1 | ||||
-rw-r--r-- | test/fixtures/amd-modules/regular.js | 14 | ||||
-rw-r--r-- | test/fixtures/amd-modules/return.js | 3 | ||||
-rw-r--r-- | test/simple/test-module-loading.js | 19 |
6 files changed, 0 insertions, 43 deletions
diff --git a/test/fixtures/amd-modules/extra-args.js b/test/fixtures/amd-modules/extra-args.js deleted file mode 100644 index a81d48c3b2..0000000000 --- a/test/fixtures/amd-modules/extra-args.js +++ /dev/null @@ -1,3 +0,0 @@ -define(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, function(r, e, m) { - exports.ok = require("./regular.js").ok; -}); diff --git a/test/fixtures/amd-modules/module-exports.js b/test/fixtures/amd-modules/module-exports.js deleted file mode 100644 index 496440eedf..0000000000 --- a/test/fixtures/amd-modules/module-exports.js +++ /dev/null @@ -1,3 +0,0 @@ -define(function(require, exports, module) { - module.exports = { ok: require("./regular.js").ok }; -}); diff --git a/test/fixtures/amd-modules/object.js b/test/fixtures/amd-modules/object.js deleted file mode 100644 index 93b840b61b..0000000000 --- a/test/fixtures/amd-modules/object.js +++ /dev/null @@ -1 +0,0 @@ -define({ ok: require("./regular.js").ok }); diff --git a/test/fixtures/amd-modules/regular.js b/test/fixtures/amd-modules/regular.js deleted file mode 100644 index 013a6cfd43..0000000000 --- a/test/fixtures/amd-modules/regular.js +++ /dev/null @@ -1,14 +0,0 @@ -var R = require; -var E = exports; -var M = module; - -define(function(require, exports, module, nothingHere) { - if (R !== require) throw new Error("invalid require in AMD cb"); - if (E !== exports) throw new Error("invalid exports in AMD cb"); - if (M !== module) throw new Error("invalid module in AMD cb"); - if (nothingHere !== undefined) { - throw new Error("unknown args to AMD cb"); - } - - exports.ok = { ok: true }; -}); diff --git a/test/fixtures/amd-modules/return.js b/test/fixtures/amd-modules/return.js deleted file mode 100644 index 6ad01321c2..0000000000 --- a/test/fixtures/amd-modules/return.js +++ /dev/null @@ -1,3 +0,0 @@ -define(function() { - return { ok: require("./regular.js").ok }; -}); diff --git a/test/simple/test-module-loading.js b/test/simple/test-module-loading.js index 4d683ebf27..823488556f 100644 --- a/test/simple/test-module-loading.js +++ b/test/simple/test-module-loading.js @@ -187,25 +187,6 @@ assert.equal(require(loadOrder + 'file8').file8, 'file8/index.reg', msg); assert.equal(require(loadOrder + 'file9').file9, 'file9/index.reg2', msg); -// test the async module definition pattern modules -var amdFolder = '../fixtures/amd-modules'; -var amdreg = require(amdFolder + '/regular.js'); -assert.deepEqual(amdreg.ok, {ok: true}, 'regular amd module failed'); - -// make sure they all get the same 'ok' object. -var amdModuleExports = require(amdFolder + '/module-exports.js'); -assert.equal(amdModuleExports.ok, amdreg.ok, 'amd module.exports failed'); - -var amdReturn = require(amdFolder + '/return.js'); -assert.equal(amdReturn.ok, amdreg.ok, 'amd return failed'); - -var amdObj = require(amdFolder + '/object.js'); -assert.equal(amdObj.ok, amdreg.ok, 'amd object literal failed'); - -var amdExtraArgs = require(amdFolder + '/extra-args.js'); -assert.equal(amdExtraArgs.ok, amdreg.ok, 'amd extra args failed'); - - // make sure that module.require() is the same as // doing require() inside of that module. var parent = require('../fixtures/module-require/parent/'); |