Merge pull request #799 from vieiralucas/consistency-return-new-asser…

…tion Return new assertion with flags copied over instead of this. Fix #791
chaijs · Sep 19, 2016 · 7683356 · 7683356
2 parents dfbcf8f + 5d11228
commit 7683356
Show file tree

Hide file tree

Showing 5 changed files with 493 additions and 229 deletions.
diff --git a/lib/chai/utils/addChainableMethod.js b/lib/chai/utils/addChainableMethod.js
@@ -8,9 +8,10 @@
  * Module dependencies
  */
 
-var transferFlags = require('./transferFlags');
+var chai = require('../../chai');
 var flag = require('./flag');
 var proxify = require('./proxify');
+var transferFlags = require('./transferFlags');
 
 /*!
  * Module variables
@@ -82,7 +83,14 @@ module.exports = function (ctx, name, method, chainingBehavior) {
           if (old_ssfi)
             flag(this, 'ssfi', assert);
           var result = chainableBehavior.method.apply(this, arguments);
-          return result === undefined ? this : result;
+
+          if (result !== undefined) {
+            return result;
+          }
+
+          var newAssertion = new chai.Assertion();
+          transferFlags(this, newAssertion);
+          return newAssertion;
         };
 
         // Use `__proto__` if available

diff --git a/lib/chai/utils/overwriteChainableMethod.js b/lib/chai/utils/overwriteChainableMethod.js
@@ -4,6 +4,9 @@
  * MIT Licensed
  */
 
+var chai = require('../../chai');
+var transferFlags = require('./transferFlags');
+
 /**
  * ### overwriteChainableMethod (ctx, name, method, chainingBehavior)
  *
@@ -43,12 +46,24 @@ module.exports = function (ctx, name, method, chainingBehavior) {
   var _chainingBehavior = chainableBehavior.chainingBehavior;
   chainableBehavior.chainingBehavior = function () {
     var result = chainingBehavior(_chainingBehavior).call(this);
-    return result === undefined ? this : result;
+    if (result !== undefined) {
+      return result;
+    }
+
+    var newAssertion = new chai.Assertion();
+    transferFlags(this, newAssertion);
+    return newAssertion;
   };
 
   var _method = chainableBehavior.method;
   chainableBehavior.method = function () {
     var result = method(_method).apply(this, arguments);
-    return result === undefined ? this : result;
+    if (result !== undefined) {
+      return result;
+    }
+
+    var newAssertion = new chai.Assertion();
+    transferFlags(this, newAssertion);
+    return newAssertion;
   };
 };
diff --git a/lib/chai/utils/overwriteMethod.js b/lib/chai/utils/overwriteMethod.js
@@ -4,7 +4,9 @@
  * MIT Licensed
  */
 
+var chai = require('../../chai');
 var flag = require('./flag');
+var transferFlags = require('./transferFlags');
 
 /**
  * ### overwriteMethod (ctx, name, fn)
@@ -59,6 +61,12 @@ module.exports = function (ctx, name, method) {
     var result = method(_super).apply(this, arguments);
     flag(this, 'keep_ssfi', false);
 
-    return result === undefined ? this : result;
+    if (result !== undefined) {
+      return result;
+    }
+
+    var newAssertion = new chai.Assertion();
+    transferFlags(this, newAssertion);
+    return newAssertion;
   }
 };
diff --git a/lib/chai/utils/overwriteProperty.js b/lib/chai/utils/overwriteProperty.js
@@ -4,7 +4,9 @@
  * MIT Licensed
  */
 
+var chai = require('../../chai');
 var flag = require('./flag');
+var transferFlags = require('./transferFlags');
 
 /**
  * ### overwriteProperty (ctx, name, fn)
@@ -58,7 +60,13 @@ module.exports = function (ctx, name, getter) {
         var result = getter(_super).call(this);
         flag(this, 'keep_ssfi', false);
 
-        return result === undefined ? this : result;
+        if (result !== undefined) {
+          return result;
+        }
+
+        var newAssertion = new chai.Assertion();
+        transferFlags(this, newAssertion);
+        return newAssertion;
       }
     , configurable: true
   });