chai-as-promised 5.2.0 → 5.3.0

package/README.md

@@ -144,7 +144,7 @@ Promise.resolve(2).should.eventually.be.within(Promise.resolve(1), Promise.resol
 
 ### Compatibility
 
-Chai as Promised is compatible with all promises following the [Promises/A+ specification][spec]. Notably, jQuery's so-called “promises” are not up to spec, and Chai as Promised will not work with them. In particular, Chai as Promised makes extensive use of the standard [transformation behavior][] of `then`, which jQuery does not support.
+Chai as Promised is compatible with all promises following the [Promises/A+ specification][spec]. Notably, jQuery's promises were not up to spec before jQuery 3.0, and Chai as Promised will not work with them. In particular, Chai as Promised makes extensive use of the standard [transformation behavior][] of `then`, which jQuery<3.0 does not support.
 
 ### Working with Non-Promise–Friendly Test Runners
 

package/lib/chai-as-promised.js

@@ -34,8 +34,11 @@
         var Assertion = chai.Assertion;
         var assert = chai.assert;
 
-        function isJQueryPromise(thenable) {
-            return typeof thenable.always === "function" &&
+        function isLegacyJQueryPromise(thenable) {
+            // jQuery promises are Promises/A+-compatible since 3.0.0. jQuery 3.0.0 is also the first version
+            // to define the catch method.
+            return typeof thenable.catch !== "function" &&
+                   typeof thenable.always === "function" &&
                    typeof thenable.done === "function" &&
                    typeof thenable.fail === "function" &&
                    typeof thenable.pipe === "function" &&
@@ -47,9 +50,10 @@
             if (typeof assertion._obj.then !== "function") {
                 throw new TypeError(utils.inspect(assertion._obj) + " is not a thenable.");
             }
-            if (isJQueryPromise(assertion._obj)) {
-                throw new TypeError("Chai as Promised is incompatible with jQuery's thenables, sorry! Please use a " +
-                                    "Promises/A+ compatible library (see http://promisesaplus.com/).");
+            if (isLegacyJQueryPromise(assertion._obj)) {
+                throw new TypeError("Chai as Promised is incompatible with thenables of jQuery<3.0.0, sorry! Please " +
+                                    "upgrade jQuery or use another Promises/A+ compatible library (see " +
+                                    "http://promisesaplus.com/).");
             }
         }
 

package/package.json

@@ -1,46 +1,47 @@
 {
-    "name": "chai-as-promised",
-    "description": "Extends Chai with assertions about promises.",
-    "keywords": [
-        "chai",
-        "chai-plugin",
-        "browser",
-        "async",
-        "testing",
-        "assertions",
-        "promises",
-        "promises-aplus"
-    ],
-    "version": "5.2.0",
-    "author": "Domenic Denicola <d@domenic.me> (https://domenic.me)",
-    "license": "WTFPL",
-    "repository": "domenic/chai-as-promised",
-    "main": "./lib/chai-as-promised.js",
-    "files": [
-        "lib"
-    ],
-    "scripts": {
-        "test": "npm run test-plugin && npm run test-intercompatibility",
-        "test-plugin": "mocha",
-        "test-intercompatibility": "mocha test-intercompatibility --opts test-intercompatibility/mocha.opts",
-        "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"
-    },
-    "devDependencies": {
-        "chai": "^3.0.0",
-        "coffee-script": "1.10.0",
-        "istanbul": "0.4.1",
-        "ecstatic": "^1.3.1",
-        "glob": "^6.0.1",
-        "jshint": "^2.8.0",
-        "mocha": "^2.3.4",
-        "opener": "^1.4.1",
-        "q": "^1.4.1",
-        "underscore": "1.8.3"
-    }
+  "name": "chai-as-promised",
+  "description": "Extends Chai with assertions about promises.",
+  "keywords": [
+    "chai",
+    "chai-plugin",
+    "browser",
+    "async",
+    "testing",
+    "assertions",
+    "promises",
+    "promises-aplus"
+  ],
+  "version": "5.3.0",
+  "author": "Domenic Denicola <d@domenic.me> (https://domenic.me)",
+  "license": "WTFPL",
+  "repository": "domenic/chai-as-promised",
+  "main": "./lib/chai-as-promised.js",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "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"
+  },
+  "devDependencies": {
+    "chai": "^3.0.0",
+    "coffee-script": "1.10.0",
+    "istanbul": "0.4.1",
+    "ecstatic": "^1.3.1",
+    "glob": "^6.0.1",
+    "jshint": "^2.8.0",
+    "mocha": "^2.3.4",
+    "opener": "^1.4.1",
+    "q": "^1.4.1",
+    "underscore": "1.8.3"
+  }
 }