konacha-chai-matchers 0.1.1 → 0.1.2

data/VERSIONS

@@ -10,6 +10,6 @@ chai-changes: 1.3.1
 chai-backbone: 0.9.2
 js-factories: 0.9.0
 mocha-as-promised: 1.2.1
-chai-things: 0.1.1
+chai-things: 0.1.2
 chai-fuzzy: 1.1.1
 sinon: 1.6.0

data/lib/konacha-chai-matchers/version.rb

@@ -1,7 +1,7 @@
 module Konacha
   module Chai
     module Matchers
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

data/vendor/assets/javascripts/chai-things.js

@@ -14,23 +14,31 @@
 
   var Assertion = chai.Assertion,
       assertionPrototype = Assertion.prototype,
-      expect = chai.expect;
+      expect = chai.expect,
+      containPropertyDesc = Object.getOwnPropertyDescriptor(assertionPrototype, 'contain');
+  Object.defineProperty(assertionPrototype, 'contains', containPropertyDesc);
+  Object.defineProperty(assertionPrototype, 'includes', containPropertyDesc);
 
   // Handles the `something` chain property
   function chainSomething() {
     // `include` or `contains` should have been called before
     if (!utils.flag(this, "contains"))
       throw new Error("cannot use something without include or contains");
-    // `something` should not have been used already
-    if (utils.flag(this, "something"))
-      throw new Error("cannot use something twice in an assertion");
-    // flag that this is a `something` chain
-    utils.flag(this, "something", {
-      // remember if `something` was negated
-      negate: utils.flag(this, "negate")
-    });
-    // reset the negation flag for the coming assertion
-    utils.flag(this, "negate", false);
+    // Flag that this is a `something` chain
+    var lastSomething = this, newSomething = {};
+    while (utils.flag(lastSomething, "something")) {
+      lastSomething = utils.flag(lastSomething, "something");
+    }
+    // Transfer all the flags to the new `something` and remove them from `this`
+    utils.transferFlags(this, newSomething, false);
+    for (var prop in this.__flags)
+      if (!/^(?:something|object|ssfi|message)$/.test(prop))
+        delete this.__flags[prop];
+
+    // Add the `newSomething` to the `lastSomething` in the chain.
+    utils.flag(lastSomething, "something", newSomething);
+    // Clear the `something` flag from `newSomething`.
+    utils.flag(newSomething, "something", false);
   }
 
   // Performs the `something()` assertion
@@ -38,7 +46,8 @@
     // Undo the flags set by the `something` chain property
     var somethingFlags = utils.flag(this, "something");
     utils.flag(this, "something", false);
-    utils.flag(this, "negate", somethingFlags.negate);
+    if (somethingFlags)
+      utils.transferFlags(somethingFlags, this, true);
 
     // The assertion's object for `something` should be array-like
     var object = utils.flag(this, "object");
@@ -62,13 +71,13 @@
   // Override all methods to react on a possible `something` in the chain
   methodNames.forEach(function (methodName) {
     Assertion.overwriteMethod(methodName, function (_super) {
-      return function () {
+      return function somethingMethod() {
         // Return if no `something` has been used in the chain
         var somethingFlags = utils.flag(this, "something");
         if (!somethingFlags)
           return _super.apply(this, arguments);
-        // Clear the `something` flag; it should not be handled again
-        utils.flag(this, "something", false);
+        // Use the nested `something` flag as the new `something` flag for this.
+        utils.flag(this, "something", utils.flag(somethingFlags, "something"));
 
         // The assertion's object for `something` should be array-like
         var arrayObject = utils.flag(this, "object");
@@ -77,7 +86,7 @@
         expect(length).to.be.a("number", "something object length");
 
         // In the negative case, an empty array means success
-        var negate = somethingFlags.negate;
+        var negate = utils.flag(somethingFlags, "negate");
         if (negate && !length)
           return;
         // In the positive case, the array should not be empty
@@ -91,17 +100,19 @@
           var item = arrayObject[i],
               itemAssertion = copyAssertion(this, item, somethingAssert);
           assertionError = null;
-          try { _super.apply(itemAssertion, arguments); }
+          try { somethingMethod.apply(itemAssertion, arguments); }
           catch (error) { assertionError = error; }
           // If the element satisfies the assertion
           if (!assertionError) {
             // In case the base assertion is negated, a satisfying element
             // means the base assertion ("no element must satisfy x") fails
             if (negate) {
-              // Assert the negated item assertion, which should fail and throw an error
-              var negItemAssertion = copyAssertion(this, item, somethingAssert, true);
-              _super.apply(negItemAssertion, arguments);
-              // Throw here if, for some reason, the negated item assertion didn't throw
+              if (!utils.flag(somethingFlags, "something")) {
+                // If we have no child `something`s then assert the negated item assertion, which should fail and throw an error
+                var negItemAssertion = copyAssertion(this, item, somethingAssert, true);
+                somethingMethod.apply(negItemAssertion, arguments);
+              }
+              // Throw here if we have a child `something`, or, for some reason, the negated item assertion didn't throw
               new Assertion(arrayObject).assert(false,
                   "expected no element of #{this} to satisfy the assertion");
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha-chai-matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies: []
 description: A set of Chai.js libraries ready to use for Konacha
 email:
@@ -59,21 +59,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 567893281
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 567893281
 requirements: []
 rubyforge_project: konacha-chai-matchers
-rubygems_version: 1.8.25
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Chai.js plugins collection for Konacha