Implemented matcher negation as a filter

lib/jasmine-core/jasmine.js

@@ -2611,17 +2611,11 @@ getJasmineRequireObj().Expectation = function() {
   Expectation.prototype.instantiateMatcher = function(matcherFactory) {
     var matcher = matcherFactory(this.util, this.customEqualityTesters);
 
-    function defaultNegativeCompare() {
+    if (this.filter && this.filter.selectComparisonFunc) {
-      var result = matcher.compare.apply(null, arguments);
+      return this.filter.selectComparisonFunc(matcher);
-      result.pass = !result.pass;
-      return result;
     }
 
-    if (this.isNot) {
+    return matcher.compare;
-      return matcher.negativeCompare || defaultNegativeCompare;
-    } else {
-      return matcher.compare;
-    }
   };
 
   Expectation.prototype.processResult = function(result, name, expected, args) {
@@ -2648,9 +2642,11 @@ getJasmineRequireObj().Expectation = function() {
   Expectation.prototype.buildMessage = function(result, name, args) {
     if (result.pass) {
       return '';
+    } else if (this.filter && this.filter.buildFailureMessage) {
+      return this.filter.buildFailureMessage(result, name, args, this.util);
     } else if (!result.message) {
       args = args.slice();
-      args.unshift(this.isNot);
+      args.unshift(false);
       args.unshift(name);
       return this.util.buildFailureMessage.apply(null, args);
     } else if (Object.prototype.toString.apply(result.message) === '[object Function]') {
@@ -2677,10 +2673,33 @@ getJasmineRequireObj().Expectation = function() {
     // TODO: copy instead of mutate options
     options.isNot = true;
     expect.not = new Expectation(options);
+    expect.not.filter = negatingFilter;
 
     return expect;
   };
 
+  var negatingFilter = {
+    selectComparisonFunc: function(matcher) {
+      function defaultNegativeCompare() {
+        var result = matcher.compare.apply(null, arguments);
+        result.pass = !result.pass;
+        return result;
+      }
+
+      return matcher.negativeCompare || defaultNegativeCompare;
+    },
+    buildFailureMessage: function(result, matcherName, args, util) {
+      if (result.message) {
+        return result.message;
+      }
+
+      args = args.slice();
+      args.unshift(true);
+      args.unshift(matcherName);
+      return util.buildFailureMessage.apply(null, args);
+    }
+  };
+
   return Expectation;
 };
 

spec/core/ExpectationSpec.js

@@ -488,6 +488,5 @@ describe("Expectation", function() {
       error: customError
     });
   });
-
 });
 

src/core/Expectation.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().Expectation = function() {
+getJasmineRequireObj().Expectation = function(j$) {
 
   /**
    * Matchers that come with Jasmine out of the box.
@@ -33,17 +33,11 @@ getJasmineRequireObj().Expectation = function() {
   Expectation.prototype.instantiateMatcher = function(matcherFactory) {
     var matcher = matcherFactory(this.util, this.customEqualityTesters);
 
-    function defaultNegativeCompare() {
+    if (this.filter && this.filter.selectComparisonFunc) {
-      var result = matcher.compare.apply(null, arguments);
+      return this.filter.selectComparisonFunc(matcher);
-      result.pass = !result.pass;
-      return result;
     }
 
-    if (this.isNot) {
+    return matcher.compare;
-      return matcher.negativeCompare || defaultNegativeCompare;
-    } else {
-      return matcher.compare;
-    }
   };
 
   Expectation.prototype.processResult = function(result, name, expected, args) {
@@ -70,12 +64,14 @@ getJasmineRequireObj().Expectation = function() {
   Expectation.prototype.buildMessage = function(result, name, args) {
     if (result.pass) {
       return '';
+    } else if (this.filter && this.filter.buildFailureMessage) {
+      return this.filter.buildFailureMessage(result, name, args, this.util);
     } else if (!result.message) {
       args = args.slice();
-      args.unshift(this.isNot);
+      args.unshift(false);
       args.unshift(name);
       return this.util.buildFailureMessage.apply(null, args);
-    } else if (Object.prototype.toString.apply(result.message) === '[object Function]') {
+    } else if (j$.isFunction_(result.message)) {
       return result.message();
     } else {
       return result.message;
@@ -91,17 +87,38 @@ getJasmineRequireObj().Expectation = function() {
   };
 
   Expectation.Factory = function(options) {
-    options = options || {};
+    var expect = new Expectation(options || {});
-
+    expect.not = Object.create(expect);
-    var expect = new Expectation(options);
+    expect.not.filter = negatingFilter;
-
-    // TODO: this would be nice as its own Object - NegativeExpectation
-    // TODO: copy instead of mutate options
-    options.isNot = true;
-    expect.not = new Expectation(options);
 
     return expect;
   };
 
+  var negatingFilter = {
+    selectComparisonFunc: function(matcher) {
+      function defaultNegativeCompare() {
+        var result = matcher.compare.apply(null, arguments);
+        result.pass = !result.pass;
+        return result;
+      }
+
+      return matcher.negativeCompare || defaultNegativeCompare;
+    },
+    buildFailureMessage: function(result, matcherName, args, util) {
+      if (result.message) {
+        if (j$.isFunction_(result.message)) {
+          return result.message();
+        } else {
+          return result.message;
+        }
+      }
+
+      args = args.slice();
+      args.unshift(true);
+      args.unshift(matcherName);
+      return util.buildFailureMessage.apply(null, args);
+    }
+  };
+
   return Expectation;
 };

src/core/requireCore.js

@@ -37,7 +37,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
     j$.Env = jRequire.Env(j$);
     j$.StackTrace = jRequire.StackTrace(j$);
     j$.ExceptionFormatter = jRequire.ExceptionFormatter(j$);
-    j$.Expectation = jRequire.Expectation();
+    j$.Expectation = jRequire.Expectation(j$);
     j$.buildExpectationResult = jRequire.buildExpectationResult();
     j$.JsApiReporter = jRequire.JsApiReporter();
     j$.matchersUtil = jRequire.matchersUtil(j$);