Switch to pure CommonJS

Now that we have dependencies, anything else is just fiddly.
chaijs · Sep 27, 2016 · bb51e07 · bb51e07
1 parent fc9f868
commit bb51e07
Show file tree

Hide file tree

Showing 15 changed files with 333 additions and 531 deletions.
diff --git a/README.md b/README.md
@@ -218,30 +218,9 @@ chai.should();
 
 You can of course put this code in a common test fixture file; for an example using [Mocha][], see [the Chai as Promised tests themselves][fixturedemo].
 
-### AMD
+### In the Browser
 
-Chai as Promised supports being used as an [AMD][amd] module, registering itself anonymously (just like Chai). So, assuming you have configured your loader to map the Chai and Chai as Promised files to the respective module IDs `"chai"` and `"chai-as-promised"`, you can use them as follows:
-
-```javascript
-define(function (require, exports, module) {
-    var chai = require("chai");
-    var chaiAsPromised = require("chai-as-promised");
-
-    chai.use(chaiAsPromised);
-
-    // and Chai setup code as above
-});
-```
-
-### `<script>` tag
-
-If you include Chai as Promised directly with a `<script>` tag, after the one for Chai itself, then it will automatically plug in to Chai and be ready for use:
-
-```html
-<script src="chai.js"></script>
-<script src="chai-as-promised.js"></script>
-<!-- and Chai setup code as above -->
-```
+To use Chai as Promised in environments that don't support Node.js-like CommonJS modules, you'll need to use a bundling tool like [browserify][].
 
 ### Karma
 
@@ -265,3 +244,4 @@ Chai as Promised is only compatible with modern browsers (IE ≥9, Safari ≥6,
 [sinon-chai]: https://github.com/domenic/sinon-chai
 [Karma]: https://karma-runner.github.io/
 [karma-chai-as-promised]: https://github.com/vlkosinov/karma-chai-as-promised
+[browserify]: http://browserify.org/
diff --git a/lib/chai-as-promised.js b/lib/chai-as-promised.js
diff --git a/package.json b/package.json
@@ -23,16 +23,15 @@
     "test": "npm run test-plugin && npm run test-intercompatibility",
     "test-plugin": "mocha",
     "test-intercompatibility": "mocha test-intercompatibility --opts test-intercompatibility/mocha.opts",
-    "test-browser-jquery": "coffee ./test/browser/runner.coffee jquery",
-    "test-browser-q": "coffee ./test/browser/runner.coffee q",
-    "test-browser-when": "coffee ./test/browser/runner.coffee when",
     "lint": "jshint ./lib",
     "cover": "istanbul cover node_modules/mocha/bin/_mocha && opener ./coverage/lcov-report/lib/chai-as-promised.js.html"
   },
-  "peerDependencies": {
-    "chai": ">= 2.1.2 < 4",
+  "dependencies": {
     "check-error": "^1.0.2"
   },
+  "peerDependencies": {
+    "chai": ">= 2.1.2 < 4"
+  },
   "devDependencies": {
     "chai": "^3.0.0",
     "coffee-script": "1.10.0",

diff --git a/test/assert-eventually.coffee b/test/assert-eventually.coffee
@@ -1,4 +1,5 @@
 "use strict"
+{ shouldPass, shouldFail } = require("./support/common.js")
 
 describe "Assert interface with eventually extender:", =>
     promise = null

diff --git a/test/assert-promise-specific.coffee b/test/assert-promise-specific.coffee
@@ -1,4 +1,5 @@
 "use strict"
+{ shouldPass, shouldFail } = require("./support/common.js")
 
 describe "Assert interface:", =>
     promise = null

diff --git a/test/browser/libraries/jquery.coffee b/test/browser/libraries/jquery.coffee
diff --git a/test/browser/libraries/q.coffee b/test/browser/libraries/q.coffee
diff --git a/test/browser/libraries/when.coffee b/test/browser/libraries/when.coffee
diff --git a/test/browser/runner.coffee b/test/browser/runner.coffee
diff --git a/test/browser/template.html b/test/browser/template.html
diff --git a/test/custom-messages.coffee b/test/custom-messages.coffee
@@ -1,4 +1,5 @@
 "use strict"
+{ shouldPass, shouldFail } = require("./support/common.js")
 
 describe "Custom messages", =>
     promise = null

diff --git a/test/should-eventually.coffee b/test/should-eventually.coffee
@@ -1,4 +1,5 @@
 "use strict"
+{ shouldPass, shouldFail } = require("./support/common.js")
 
 describe "Fulfillment value assertions:", =>
     promise = null

diff --git a/test/should-promise-specific.coffee b/test/should-promise-specific.coffee
@@ -1,4 +1,5 @@
 "use strict"
+{ shouldPass, shouldFail } = require("./support/common.js")
 
 describe "Promise-specific extensions:", =>
     promise = null

diff --git a/test/support/browser.js b/test/support/browser.js
diff --git a/test/support/common.js b/test/support/common.js
@@ -1,15 +1,6 @@
 "use strict";
 
-// Note: this file is used both in the Node and browser tests.
-
-(function () {
-    var Q = global.Q || (typeof require === "function" && require("q"));
-    if (Q) {
-        Q.longStackSupport = true;
-    }
-}());
-
-global.shouldPass = function (promiseProducer) {
+exports.shouldPass = function (promiseProducer) {
     it("should return a fulfilled promise", function (done) {
         promiseProducer().then(
             function () {
@@ -22,7 +13,7 @@ global.shouldPass = function (promiseProducer) {
     });
 };
 
-global.shouldFail = function (options) {
+exports.shouldFail = function (options) {
     var promiseProducer = options.op;
     var desiredMessageSubstring = options.message;
     var nonDesiredMessageSubstring = options.notMessage;