Merge pull request tj#174 from tonylukasavage/jQuery_check

Fixes jQuery checks in environments without DOM
qurio-za · Jan 28, 2014 · d621d5c · d621d5c
2 parents cd3b57a + 74e181c
commit d621d5c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/lib/ext/browser/jquery.js b/lib/ext/browser/jquery.js
@@ -22,16 +22,18 @@ module.exports = function(should, Assertion) {
     };
   }
 
-  jQuery.fn.inspect = function () {
-    var elementList = this.toArray().map(function (e) {
-      return util.inspect(e);
-    }).join(", ");
-    if (this.selector) {
-      return "SELECTOR(" + this.selector + ") matching " + this.length + " elements" + (elementList.length ? ": " + elementList : "");
-    } else {
-      return elementList;
-    }
-  };
+  if (typeof jQuery !== "undefined" && jQuery && !jQuery.prototype.inspect) {
+    jQuery.fn.inspect = function () {
+      var elementList = this.toArray().map(function (e) {
+        return util.inspect(e);
+      }).join(", ");
+      if (this.selector) {
+        return "SELECTOR(" + this.selector + ") matching " + this.length + " elements" + (elementList.length ? ": " + elementList : "");
+      } else {
+        return elementList;
+      }
+    };
+  }
 
   function jQueryAttributeTestHelper(method, singular, plural, nameOrHash, value) {
     var keys = util.isObject(nameOrHash) ? Object.keys(nameOrHash) : [nameOrHash];

diff --git a/should.js b/should.js
@@ -231,16 +231,18 @@ module.exports = function(should, Assertion) {
     };
   }
 
-  jQuery.fn.inspect = function () {
-    var elementList = this.toArray().map(function (e) {
-      return util.inspect(e);
-    }).join(", ");
-    if (this.selector) {
-      return "SELECTOR(" + this.selector + ") matching " + this.length + " elements" + (elementList.length ? ": " + elementList : "");
-    } else {
-      return elementList;
-    }
-  };
+  if (typeof jQuery !== "undefined" && jQuery && !jQuery.prototype.inspect) {
+    jQuery.fn.inspect = function () {
+      var elementList = this.toArray().map(function (e) {
+        return util.inspect(e);
+      }).join(", ");
+      if (this.selector) {
+        return "SELECTOR(" + this.selector + ") matching " + this.length + " elements" + (elementList.length ? ": " + elementList : "");
+      } else {
+        return elementList;
+      }
+    };
+  }
 
   function jQueryAttributeTestHelper(method, singular, plural, nameOrHash, value) {
     var keys = util.isObject(nameOrHash) ? Object.keys(nameOrHash) : [nameOrHash];