evergreen 0.3.0 → 0.4.0

data/lib/jasmine/lib/jasmine.js

@@ -21,11 +21,16 @@ jasmine.unimplementedMethod_ = function() {
 jasmine.undefined = jasmine.___undefined___;
 
 /**
- * Default interval for event loop yields. Small values here may result in slow test running. Zero means no updates until all tests have completed.
+ * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed.
  *
  */
 jasmine.DEFAULT_UPDATE_INTERVAL = 250;
 
+/**
+ * Default timeout interval in milliseconds for waitsFor() blocks.
+ */
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
+
 jasmine.getGlobal = function() {
   function getGlobal() {
     return this;
@@ -490,22 +495,24 @@ var runs = function(func) {
 };
 
 /**
- * Waits for a timeout before moving to the next runs()-defined block.
- * @param {Number} timeout
+ * Waits a fixed time period before moving to the next block.
+ *
+ * @deprecated Use waitsFor() instead
+ * @param {Number} timeout milliseconds to wait
  */
 var waits = function(timeout) {
   jasmine.getEnv().currentSpec.waits(timeout);
 };
 
 /**
- * Waits for the latchFunction to return true before proceeding to the next runs()-defined block.
+ * Waits for the latchFunction to return true before proceeding to the next block.
  *
- * @param {Number} timeout
  * @param {Function} latchFunction
- * @param {String} message
+ * @param {String} optional_timeoutMessage
+ * @param {Number} optional_timeout
  */
-var waitsFor = function(timeout, latchFunction, message) {
-  jasmine.getEnv().currentSpec.waitsFor(timeout, latchFunction, message);
+var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
+  jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments);
 };
 
 /**
@@ -660,6 +667,7 @@ jasmine.Env = function() {
   this.reporter = new jasmine.MultiReporter();
 
   this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL;
+  this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL;
   this.lastUpdate = 0;
   this.specFilter = function() {
     return true;
@@ -1135,7 +1143,7 @@ jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) {
       message: message
     });
     this.spec.addMatcherResult(expectationResult);
-    return result;
+    return jasmine.undefined;
   };
 };
 
@@ -1153,6 +1161,7 @@ jasmine.Matchers.prototype.toBe = function(expected) {
 /**
  * toNotBe: compares the actual to the expected using !==
  * @param expected
+ * @deprecated as of 1.0. Use not.toBe() instead.
  */
 jasmine.Matchers.prototype.toNotBe = function(expected) {
   return this.actual !== expected;
@@ -1170,6 +1179,7 @@ jasmine.Matchers.prototype.toEqual = function(expected) {
 /**
  * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual
  * @param expected
+ * @deprecated as of 1.0. Use not.toNotEqual() instead.
  */
 jasmine.Matchers.prototype.toNotEqual = function(expected) {
   return !this.env.equals_(this.actual, expected);
@@ -1188,6 +1198,7 @@ jasmine.Matchers.prototype.toMatch = function(expected) {
 /**
  * Matcher that compares the actual to the expected using the boolean inverse of jasmine.Matchers.toMatch
  * @param expected
+ * @deprecated as of 1.0. Use not.toMatch() instead.
  */
 jasmine.Matchers.prototype.toNotMatch = function(expected) {
   return !(new RegExp(expected).test(this.actual));
@@ -1230,11 +1241,6 @@ jasmine.Matchers.prototype.toBeFalsy = function() {
 };
 
 
-/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */
-jasmine.Matchers.prototype.wasCalled = function() {
-  return this.toHaveBeenCalled();
-};
-
 /**
  * Matcher that checks to see if the actual, a Jasmine spy, was called.
  */
@@ -1248,12 +1254,18 @@ jasmine.Matchers.prototype.toHaveBeenCalled = function() {
   }
 
   this.message = function() {
-    return "Expected spy " + this.actual.identity + " to have been called.";
+    return [
+      "Expected spy " + this.actual.identity + " to have been called.",
+      "Expected spy " + this.actual.identity + " not to have been called."
+    ];
   };
 
   return this.actual.wasCalled;
 };
 
+/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */
+jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCalled;
+
 /**
  * Matcher that checks to see if the actual, a Jasmine spy, was not called.
  *
@@ -1269,17 +1281,15 @@ jasmine.Matchers.prototype.wasNotCalled = function() {
   }
 
   this.message = function() {
-    return "Expected spy " + this.actual.identity + " to not have been called.";
+    return [
+      "Expected spy " + this.actual.identity + " to not have been called.",
+      "Expected spy " + this.actual.identity + " to have been called."
+    ];
   };
 
   return !this.actual.wasCalled;
 };
 
-/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */
-jasmine.Matchers.prototype.wasCalledWith = function() {
-  return this.toHaveBeenCalledWith.apply(this, arguments);
-};
-
 /**
  * Matcher that checks to see if the actual, a Jasmine spy, was called with a set of parameters.
  *
@@ -1293,15 +1303,25 @@ jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
   }
   this.message = function() {
     if (this.actual.callCount == 0) {
-      return "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.";
+      // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
+      return [
+        "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
+        "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
+      ];
     } else {
-      return "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall);
+      return [
+        "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
+        "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
+      ];
     }
   };
 
   return this.env.contains_(this.actual.argsForCall, expectedArgs);
 };
 
+/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */
+jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith;
+
 /** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */
 jasmine.Matchers.prototype.wasNotCalledWith = function() {
   var expectedArgs = jasmine.util.argsToArray(arguments);
@@ -1310,7 +1330,10 @@ jasmine.Matchers.prototype.wasNotCalledWith = function() {
   }
 
   this.message = function() {
-    return "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was";
+    return [
+      "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was",
+      "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was"
+    ]
   };
 
   return !this.env.contains_(this.actual.argsForCall, expectedArgs);
@@ -1329,6 +1352,7 @@ jasmine.Matchers.prototype.toContain = function(expected) {
  * Matcher that checks that the expected item is NOT an element in the actual Array.
  *
  * @param {Object} expected
+ * @deprecated as of 1.0. Use not.toNotContain() instead.
  */
 jasmine.Matchers.prototype.toNotContain = function(expected) {
   return !this.env.contains_(this.actual, expected);
@@ -1362,9 +1386,11 @@ jasmine.Matchers.prototype.toThrow = function(expected) {
     result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected));
   }
 
+  var not = this.isNot ? "not " : "";
+
   this.message = function() {
     if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) {
-      return ["Expected function to throw", expected.message || expected, ", but it threw", exception.message || exception].join(' ');
+      return ["Expected function " + not + "to throw", expected ? expected.message || expected : " an exception", ", but it threw", exception.message || exception].join(' ');
     } else {
       return "Expected function to throw an exception.";
     }
@@ -1644,6 +1670,7 @@ jasmine.Queue = function(env) {
   this.running = false;
   this.index = 0;
   this.offset = 0;
+  this.abort = false;
 };
 
 jasmine.Queue.prototype.addBefore = function(block) {
@@ -1678,7 +1705,7 @@ jasmine.Queue.prototype.next_ = function() {
   while (goAgain) {
     goAgain = false;
     
-    if (self.index < self.blocks.length) {
+    if (self.index < self.blocks.length && !this.abort) {
       var calledSynchronously = true;
       var completedSynchronously = false;
 
@@ -1688,6 +1715,10 @@ jasmine.Queue.prototype.next_ = function() {
           return;
         }
 
+        if (self.blocks[self.index].abort) {
+          self.abort = true;
+        }
+
         self.offset = 0;
         self.index++;
 
@@ -1884,14 +1915,46 @@ jasmine.Spec.prototype.expect = function(actual) {
   return positive;
 };
 
+/**
+ * Waits a fixed time period before moving to the next block.
+ *
+ * @deprecated Use waitsFor() instead
+ * @param {Number} timeout milliseconds to wait
+ */
 jasmine.Spec.prototype.waits = function(timeout) {
   var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this);
   this.addToQueue(waitsFunc);
   return this;
 };
 
-jasmine.Spec.prototype.waitsFor = function(timeout, latchFunction, timeoutMessage) {
-  var waitsForFunc = new jasmine.WaitsForBlock(this.env, timeout, latchFunction, timeoutMessage, this);
+/**
+ * Waits for the latchFunction to return true before proceeding to the next block.
+ *
+ * @param {Function} latchFunction
+ * @param {String} optional_timeoutMessage
+ * @param {Number} optional_timeout
+ */
+jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
+  var latchFunction_ = null;
+  var optional_timeoutMessage_ = null;
+  var optional_timeout_ = null;
+
+  for (var i = 0; i < arguments.length; i++) {
+    var arg = arguments[i];
+    switch (typeof arg) {
+      case 'function':
+        latchFunction_ = arg;
+        break;
+      case 'string':
+        optional_timeoutMessage_ = arg;
+        break;
+      case 'number':
+        optional_timeout_ = arg;
+        break;
+    }
+  }
+
+  var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this);
   this.addToQueue(waitsForFunc);
   return this;
 };
@@ -2114,41 +2177,56 @@ jasmine.WaitsBlock.prototype.execute = function (onComplete) {
     onComplete();
   }, this.timeout);
 };
+/**
+ * A block which waits for some condition to become true, with timeout.
+ *
+ * @constructor
+ * @extends jasmine.Block
+ * @param {jasmine.Env} env The Jasmine environment.
+ * @param {Number} timeout The maximum time in milliseconds to wait for the condition to become true.
+ * @param {Function} latchFunction A function which returns true when the desired condition has been met.
+ * @param {String} message The message to display if the desired condition hasn't been met within the given time period.
+ * @param {jasmine.Spec} spec The Jasmine spec.
+ */
 jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) {
-  this.timeout = timeout;
+  this.timeout = timeout || env.defaultTimeoutInterval;
   this.latchFunction = latchFunction;
   this.message = message;
   this.totalTimeSpentWaitingForLatch = 0;
   jasmine.Block.call(this, env, null, spec);
 };
-
 jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block);
 
-jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 100;
+jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10;
 
-jasmine.WaitsForBlock.prototype.execute = function (onComplete) {
-  var self = this;
-  self.env.reporter.log('>> Jasmine waiting for ' + (self.message || 'something to happen'));
+jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
+  this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
   var latchFunctionResult;
   try {
-    latchFunctionResult = self.latchFunction.apply(self.spec);
+    latchFunctionResult = this.latchFunction.apply(this.spec);
   } catch (e) {
-    self.spec.fail(e);
+    this.spec.fail(e);
     onComplete();
     return;
   }
 
   if (latchFunctionResult) {
     onComplete();
-  } else if (self.totalTimeSpentWaitingForLatch >= self.timeout) {
-    var message = 'timed out after ' + self.timeout + ' msec waiting for ' + (self.message || 'something to happen');
-    self.spec.fail({
+  } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) {
+    var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen');
+    this.spec.fail({
       name: 'timeout',
       message: message
     });
+
+    this.abort = true;
+    onComplete();
   } else {
-    self.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
-    self.env.setTimeout(function () { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
+    this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
+    var self = this;
+    this.env.setTimeout(function() {
+      self.execute(onComplete);
+    }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
   }
 };
 // Mock setTimeout, clearTimeout
@@ -2336,8 +2414,8 @@ jasmine.getGlobal().clearInterval = function(timeoutKey) {
 
 
 jasmine.version_= {
-  "major": 0,
-  "minor": 11,
+  "major": 1,
+  "minor": 0,
   "build": 1,
-  "revision": 1277514571
+  "revision": 1286311016
 };

data/lib/jasmine/spec/runner.html

@@ -29,7 +29,6 @@
   <script type="text/javascript" src="../src/WaitsForBlock.js"></script>
 
   <script type="text/javascript" src="../src/html/TrivialReporter.js"></script>
-  <script type="text/javascript" src="../lib/consolex.js"></script>
 
 
 

data/lib/jasmine/spec/suites/CustomMatchersSpec.js

@@ -11,15 +11,21 @@ describe("Custom Matchers", function() {
     var spec1, spec2, spec1Matcher, spec2Matcher;
     var suite = env.describe('some suite', function() {
       env.beforeEach(function() {
-        this.addMatchers({ matcherForSuite: function(expected) {
-          return "matcherForSuite: actual: " + this.actual + "; expected: " + expected;
-        } });
+        this.addMatchers({
+          matcherForSuite: function(expected) {
+            this.message = "matcherForSuite: actual: " + this.actual + "; expected: " + expected;
+            return true;
+          }
+        });
       });
 
       spec1 = env.it('spec with an expectation').runs(function () {
-        this.addMatchers({ matcherForSpec: function(expected) {
-          return "matcherForSpec: actual: " + this.actual + "; expected: " + expected;
-        } });
+        this.addMatchers({
+          matcherForSpec: function(expected) {
+            this.message = "matcherForSpec: actual: " + this.actual + "; expected: " + expected;
+            return true;
+          }
+        });
         spec1Matcher = this.expect("xxx");
       });
 
@@ -30,10 +36,13 @@ describe("Custom Matchers", function() {
 
     suite.execute();
 
-    expect(spec1Matcher.matcherForSuite("expected")).toEqual("matcherForSuite: actual: xxx; expected: expected");
-    expect(spec1Matcher.matcherForSpec("expected")).toEqual("matcherForSpec: actual: xxx; expected: expected");
+    spec1Matcher.matcherForSuite("expected");
+    expect(spec1Matcher.message).toEqual("matcherForSuite: actual: xxx; expected: expected");
+    spec1Matcher.matcherForSpec("expected");
+    expect(spec1Matcher.message).toEqual("matcherForSpec: actual: xxx; expected: expected");
 
-    expect(spec2Matcher.matcherForSuite("expected")).toEqual("matcherForSuite: actual: yyy; expected: expected");
+    spec2Matcher.matcherForSuite("expected");
+    expect(spec2Matcher.message).toEqual("matcherForSuite: actual: yyy; expected: expected");
     expect(spec2Matcher.matcherForSpec).toBe(jasmine.undefined);
   });
 

data/lib/jasmine/spec/suites/MatchersSpec.js

@@ -10,6 +10,15 @@ describe("jasmine.Matchers", function() {
       });
     });
     spyOn(spec, 'addMatcherResult');
+
+    this.addMatchers({
+      toPass: function() {
+        return lastResult().passed();
+      },
+      toFail: function() {
+        return !lastResult().passed();
+      }
+    })
   });
 
   function match(value) {
@@ -20,10 +29,19 @@ describe("jasmine.Matchers", function() {
     return spec.addMatcherResult.mostRecentCall.args[0];
   }
 
+  function catchException(fn) {
+    try {
+      fn.call();
+    } catch (e) {
+      return e;
+    }
+    throw new Error("expected function to throw an exception");
+  }
+
   it("toEqual with primitives, objects, dates, etc.", function() {
-    expect(match(true).toEqual(true)).toEqual(true);
+    expect(match(true).toEqual(true)).toPass();
 
-    expect(match({foo:'bar'}).toEqual(null)).toEqual(false);
+    expect(match({foo:'bar'}).toEqual(null)).toFail();
 
     var functionA = function() {
       return 'hi';
@@ -31,39 +49,39 @@ describe("jasmine.Matchers", function() {
     var functionB = function() {
       return 'hi';
     };
-    expect(match({foo:functionA}).toEqual({foo:functionB})).toEqual(false);
-    expect(match({foo:functionA}).toEqual({foo:functionA})).toEqual(true);
+    expect(match({foo:functionA}).toEqual({foo:functionB})).toFail();
+    expect(match({foo:functionA}).toEqual({foo:functionA})).toPass();
 
-    expect((match(false).toEqual(true))).toEqual(false);
+    expect((match(false).toEqual(true))).toFail();
 
     var circularGraph = {};
     circularGraph.referenceToSelf = circularGraph;
-    expect((match(circularGraph).toEqual(circularGraph))).toEqual(true);
+    expect((match(circularGraph).toEqual(circularGraph))).toPass();
 
-    expect((match(new Date(2008, 1, 3, 15, 17, 19, 1234)).toEqual(new Date(2009, 1, 3, 15, 17, 19, 1234)))).toEqual(false);
-    expect((match(new Date(2008, 1, 3, 15, 17, 19, 1234)).toEqual(new Date(2008, 1, 3, 15, 17, 19, 1234)))).toEqual(true);
+    expect((match(new Date(2008, 1, 3, 15, 17, 19, 1234)).toEqual(new Date(2009, 1, 3, 15, 17, 19, 1234)))).toFail();
+    expect((match(new Date(2008, 1, 3, 15, 17, 19, 1234)).toEqual(new Date(2008, 1, 3, 15, 17, 19, 1234)))).toPass();
 
 
-    expect(match(true).toNotEqual(false)).toEqual(true);
-    expect((match(true).toNotEqual(true))).toEqual(false);
+    expect(match(true).toNotEqual(false)).toPass();
+    expect((match(true).toNotEqual(true))).toFail();
 
-    expect((match(['a', 'b']).toEqual(['a', jasmine.undefined]))).toEqual(false);
-    expect((match(['a', 'b']).toEqual(['a', 'b', jasmine.undefined]))).toEqual(false);
+    expect((match(['a', 'b']).toEqual(['a', jasmine.undefined]))).toFail();
+    expect((match(['a', 'b']).toEqual(['a', 'b', jasmine.undefined]))).toFail();
 
-    expect((match(new String("cat")).toEqual("cat"))).toBe(true);
-    expect((match(new String("cat")).toNotEqual("cat"))).toBe(false);
+    expect((match(new String("cat")).toEqual("cat"))).toPass();
+    expect((match(new String("cat")).toNotEqual("cat"))).toFail();
 
-    expect((match(new Number(5)).toEqual(5))).toBe(true);
-    expect((match(new Number('5')).toEqual(5))).toBe(true);
-    expect((match(new Number(5)).toNotEqual(5))).toBe(false);
-    expect((match(new Number('5')).toNotEqual(5))).toBe(false);
+    expect((match(new Number(5)).toEqual(5))).toPass();
+    expect((match(new Number('5')).toEqual(5))).toPass();
+    expect((match(new Number(5)).toNotEqual(5))).toFail();
+    expect((match(new Number('5')).toNotEqual(5))).toFail();
   });
 
   it("toEqual with DOM nodes", function() {
     var nodeA = document.createElement('div');
     var nodeB = document.createElement('div');
-    expect((match(nodeA).toEqual(nodeA))).toEqual(true);
-    expect((match(nodeA).toEqual(nodeB))).toEqual(false);
+    expect((match(nodeA).toEqual(nodeA))).toPass();
+    expect((match(nodeA).toEqual(nodeB))).toFail();
   });
 
   it("toEqual to build an Expectation Result", function() {
@@ -75,7 +93,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toEqual");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual));
     expect(result.message).toMatch(jasmine.pp(expected));
     expect(result.expected).toEqual(expected);
@@ -90,7 +108,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toNotEqual");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(str));
     expect(result.message).toMatch('not');
     expect(result.expected).toEqual(str);
@@ -102,12 +120,12 @@ describe("jasmine.Matchers", function() {
     var b = {};
     //noinspection UnnecessaryLocalVariableJS
     var c = a;
-    expect((match(a).toBe(b))).toEqual(false);
-    expect((match(a).toBe(a))).toEqual(true);
-    expect((match(a).toBe(c))).toEqual(true);
-    expect((match(a).toNotBe(b))).toEqual(true);
-    expect((match(a).toNotBe(a))).toEqual(false);
-    expect((match(a).toNotBe(c))).toEqual(false);
+    expect((match(a).toBe(b))).toFail();
+    expect((match(a).toBe(a))).toPass();
+    expect((match(a).toBe(c))).toPass();
+    expect((match(a).toNotBe(b))).toPass();
+    expect((match(a).toNotBe(a))).toFail();
+    expect((match(a).toNotBe(c))).toFail();
   });
 
   it("toBe to build an ExpectationResult", function() {
@@ -119,7 +137,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toBe");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual));
     expect(result.message).toMatch(jasmine.pp(expected));
     expect(result.expected).toEqual(expected);
@@ -134,24 +152,24 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toNotBe");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(str);
     expect(result.expected).toEqual(str);
     expect(result.actual).toEqual(str);
   });
 
   it("toMatch and #toNotMatch should perform regular expression matching on strings", function() {
-    expect((match('foobarbel').toMatch(/bar/))).toEqual(true);
-    expect((match('foobazbel').toMatch(/bar/))).toEqual(false);
+    expect((match('foobarbel').toMatch(/bar/))).toPass();
+    expect((match('foobazbel').toMatch(/bar/))).toFail();
 
-    expect((match('foobarbel').toMatch("bar"))).toEqual(true);
-    expect((match('foobazbel').toMatch("bar"))).toEqual(false);
+    expect((match('foobarbel').toMatch("bar"))).toPass();
+    expect((match('foobazbel').toMatch("bar"))).toFail();
 
-    expect((match('foobarbel').toNotMatch(/bar/))).toEqual(false);
-    expect((match('foobazbel').toNotMatch(/bar/))).toEqual(true);
+    expect((match('foobarbel').toNotMatch(/bar/))).toFail();
+    expect((match('foobazbel').toNotMatch(/bar/))).toPass();
 
-    expect((match('foobarbel').toNotMatch("bar"))).toEqual(false);
-    expect((match('foobazbel').toNotMatch("bar"))).toEqual(true);
+    expect((match('foobarbel').toNotMatch("bar"))).toFail();
+    expect((match('foobazbel').toNotMatch("bar"))).toPass();
   });
 
   it("toMatch w/ RegExp to build an ExpectationResult", function() {
@@ -163,7 +181,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toMatch");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual));
     expect(result.message).toMatch(expected.toString());
     expect(result.expected).toEqual(expected);
@@ -179,7 +197,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toMatch");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toEqual("Expected 'a' to match 'b'.");
     expect(result.expected).toEqual(expected);
     expect(result.actual).toEqual(actual);
@@ -194,7 +212,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toNotMatch");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toEqual("Expected 'a' to not match /a/.");
     expect(result.expected).toEqual(expected);
     expect(result.actual).toEqual(actual);
@@ -208,15 +226,15 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toNotMatch");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toEqual("Expected 'a' to not match 'a'.");
     expect(result.expected).toEqual(str);
     expect(result.actual).toEqual(str);
   });
 
   it("toBeDefined", function() {
-    expect(match('foo').toBeDefined()).toEqual(true);
-    expect(match(jasmine.undefined).toBeDefined()).toEqual(false);
+    expect(match('foo').toBeDefined()).toPass();
+    expect(match(jasmine.undefined).toBeDefined()).toFail();
   });
 
   it("toBeDefined to build an ExpectationResult", function() {
@@ -226,20 +244,20 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toBeDefined");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toEqual('Expected undefined to be defined.');
     expect(result.actual).toEqual(jasmine.undefined);
   });
 
   it("toBeUndefined", function() {
-    expect(match('foo').toBeUndefined()).toEqual(false);
-    expect(match(jasmine.undefined).toBeUndefined()).toEqual(true);
+    expect(match('foo').toBeUndefined()).toFail();
+    expect(match(jasmine.undefined).toBeUndefined()).toPass();
   });
 
   it("toBeNull", function() {
-    expect(match(null).toBeNull()).toEqual(true);
-    expect(match(jasmine.undefined).toBeNull()).toEqual(false);
-    expect(match("foo").toBeNull()).toEqual(false);
+    expect(match(null).toBeNull()).toPass();
+    expect(match(jasmine.undefined).toBeNull()).toFail();
+    expect(match("foo").toBeNull()).toFail();
   });
 
   it("toBeNull w/ String to build an ExpectationResult", function() {
@@ -250,7 +268,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toBeNull");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual));
     expect(result.message).toMatch('null');
     expect(result.actual).toEqual(actual);
@@ -264,18 +282,18 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toBeNull");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual));
     expect(result.message).toMatch('null');
     expect(result.actual).toEqual(actual);
   });
 
   it("toBeFalsy", function() {
-    expect(match(false).toBeFalsy()).toEqual(true);
-    expect(match(true).toBeFalsy()).toEqual(false);
-    expect(match(jasmine.undefined).toBeFalsy()).toEqual(true);
-    expect(match(0).toBeFalsy()).toEqual(true);
-    expect(match("").toBeFalsy()).toEqual(true);
+    expect(match(false).toBeFalsy()).toPass();
+    expect(match(true).toBeFalsy()).toFail();
+    expect(match(jasmine.undefined).toBeFalsy()).toPass();
+    expect(match(0).toBeFalsy()).toPass();
+    expect(match("").toBeFalsy()).toPass();
   });
 
   it("toBeFalsy to build an ExpectationResult", function() {
@@ -286,21 +304,21 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toBeFalsy");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual));
     expect(result.message).toMatch('falsy');
     expect(result.actual).toEqual(actual);
   });
 
   it("toBeTruthy", function() {
-    expect(match(false).toBeTruthy()).toEqual(false);
-    expect(match(true).toBeTruthy()).toEqual(true);
-    expect(match(jasmine.undefined).toBeTruthy()).toEqual(false);
-    expect(match(0).toBeTruthy()).toEqual(false);
-    expect(match("").toBeTruthy()).toEqual(false);
-    expect(match("hi").toBeTruthy()).toEqual(true);
-    expect(match(5).toBeTruthy()).toEqual(true);
-    expect(match({foo: 1}).toBeTruthy()).toEqual(true);
+    expect(match(false).toBeTruthy()).toFail();
+    expect(match(true).toBeTruthy()).toPass();
+    expect(match(jasmine.undefined).toBeTruthy()).toFail();
+    expect(match(0).toBeTruthy()).toFail();
+    expect(match("").toBeTruthy()).toFail();
+    expect(match("hi").toBeTruthy()).toPass();
+    expect(match(5).toBeTruthy()).toPass();
+    expect(match({foo: 1}).toBeTruthy()).toPass();
   });
 
   it("toBeTruthy to build an ExpectationResult", function() {
@@ -310,69 +328,69 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toBeTruthy");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toEqual("Expected false to be truthy.");
-    expect(result.actual).toEqual(false);
+    expect(result.actual).toFail();
   });
 
   it("toEqual", function() {
-    expect(match(jasmine.undefined).toEqual(jasmine.undefined)).toEqual(true);
-    expect(match({foo:'bar'}).toEqual({foo:'bar'})).toEqual(true);
-    expect(match("foo").toEqual({bar: jasmine.undefined})).toEqual(false);
-    expect(match({foo: jasmine.undefined}).toEqual("goo")).toEqual(false);
-    expect(match({foo: {bar :jasmine.undefined}}).toEqual("goo")).toEqual(false);
+    expect(match(jasmine.undefined).toEqual(jasmine.undefined)).toPass();
+    expect(match({foo:'bar'}).toEqual({foo:'bar'})).toPass();
+    expect(match("foo").toEqual({bar: jasmine.undefined})).toFail();
+    expect(match({foo: jasmine.undefined}).toEqual("goo")).toFail();
+    expect(match({foo: {bar :jasmine.undefined}}).toEqual("goo")).toFail();
   });
 
   it("toEqual with jasmine.any()", function() {
-    expect(match("foo").toEqual(jasmine.any(String))).toEqual(true);
-    expect(match(3).toEqual(jasmine.any(Number))).toEqual(true);
-    expect(match("foo").toEqual(jasmine.any(Function))).toEqual(false);
-    expect(match("foo").toEqual(jasmine.any(Object))).toEqual(false);
-    expect(match({someObj:'foo'}).toEqual(jasmine.any(Object))).toEqual(true);
-    expect(match({someObj:'foo'}).toEqual(jasmine.any(Function))).toEqual(false);
+    expect(match("foo").toEqual(jasmine.any(String))).toPass();
+    expect(match(3).toEqual(jasmine.any(Number))).toPass();
+    expect(match("foo").toEqual(jasmine.any(Function))).toFail();
+    expect(match("foo").toEqual(jasmine.any(Object))).toFail();
+    expect(match({someObj:'foo'}).toEqual(jasmine.any(Object))).toPass();
+    expect(match({someObj:'foo'}).toEqual(jasmine.any(Function))).toFail();
     expect(match(function() {
-    }).toEqual(jasmine.any(Object))).toEqual(false);
-    expect(match(["foo", "goo"]).toEqual(["foo", jasmine.any(String)])).toEqual(true);
+    }).toEqual(jasmine.any(Object))).toFail();
+    expect(match(["foo", "goo"]).toEqual(["foo", jasmine.any(String)])).toPass();
     expect(match(function() {
-    }).toEqual(jasmine.any(Function))).toEqual(true);
+    }).toEqual(jasmine.any(Function))).toPass();
     expect(match(["a", function() {
-    }]).toEqual(["a", jasmine.any(Function)])).toEqual(true);
+    }]).toEqual(["a", jasmine.any(Function)])).toPass();
   });
 
   it("toEqual handles circular objects ok", function() {
-    expect(match({foo: "bar", baz: jasmine.undefined}).toEqual({foo: "bar", baz: jasmine.undefined})).toEqual(true);
-    expect(match({foo:['bar','baz','quux']}).toEqual({foo:['bar','baz','quux']})).toEqual(true);
-    expect(match({foo: {bar:'baz'}, quux:'corge'}).toEqual({foo:{bar:'baz'}, quux:'corge'})).toEqual(true);
+    expect(match({foo: "bar", baz: jasmine.undefined}).toEqual({foo: "bar", baz: jasmine.undefined})).toPass();
+    expect(match({foo:['bar','baz','quux']}).toEqual({foo:['bar','baz','quux']})).toPass();
+    expect(match({foo: {bar:'baz'}, quux:'corge'}).toEqual({foo:{bar:'baz'}, quux:'corge'})).toPass();
 
     var circularObject = {};
     var secondCircularObject = {};
     circularObject.field = circularObject;
     secondCircularObject.field = secondCircularObject;
-    expect(match(circularObject).toEqual(secondCircularObject)).toEqual(true);
+    expect(match(circularObject).toEqual(secondCircularObject)).toPass();
   });
 
   it("toNotEqual as slightly surprising behavior, but is it intentional?", function() {
-    expect(match({x:"x", y:"y", z:"w"}).toNotEqual({x:"x", y:"y", z:"z"})).toEqual(true);
-    expect(match({x:"x", y:"y", w:"z"}).toNotEqual({x:"x", y:"y", z:"z"})).toEqual(true);
-    expect(match({x:"x", y:"y", z:"z"}).toNotEqual({w: "w", x:"x", y:"y", z:"z"})).toEqual(true);
-    expect(match({w: "w", x:"x", y:"y", z:"z"}).toNotEqual({x:"x", y:"y", z:"z"})).toEqual(true);
+    expect(match({x:"x", y:"y", z:"w"}).toNotEqual({x:"x", y:"y", z:"z"})).toPass();
+    expect(match({x:"x", y:"y", w:"z"}).toNotEqual({x:"x", y:"y", z:"z"})).toPass();
+    expect(match({x:"x", y:"y", z:"z"}).toNotEqual({w: "w", x:"x", y:"y", z:"z"})).toPass();
+    expect(match({w: "w", x:"x", y:"y", z:"z"}).toNotEqual({x:"x", y:"y", z:"z"})).toPass();
   });
 
   it("toEqual handles arrays", function() {
-    expect(match([1, "A"]).toEqual([1, "A"])).toEqual(true);
+    expect(match([1, "A"]).toEqual([1, "A"])).toPass();
   });
 
   it("toContain and toNotContain", function() {
-    expect(match('ABC').toContain('A')).toEqual(true);
-    expect(match('ABC').toContain('X')).toEqual(false);
+    expect(match('ABC').toContain('A')).toPass();
+    expect(match('ABC').toContain('X')).toFail();
 
-    expect(match(['A', 'B', 'C']).toContain('A')).toEqual(true);
-    expect(match(['A', 'B', 'C']).toContain('F')).toEqual(false);
-    expect(match(['A', 'B', 'C']).toNotContain('F')).toEqual(true);
-    expect(match(['A', 'B', 'C']).toNotContain('A')).toEqual(false);
+    expect(match(['A', 'B', 'C']).toContain('A')).toPass();
+    expect(match(['A', 'B', 'C']).toContain('F')).toFail();
+    expect(match(['A', 'B', 'C']).toNotContain('F')).toPass();
+    expect(match(['A', 'B', 'C']).toNotContain('A')).toFail();
 
-    expect(match(['A', {some:'object'}, 'C']).toContain({some:'object'})).toEqual(true);
-    expect(match(['A', {some:'object'}, 'C']).toContain({some:'other object'})).toEqual(false);
+    expect(match(['A', {some:'object'}, 'C']).toContain({some:'object'})).toPass();
+    expect(match(['A', {some:'object'}, 'C']).toContain({some:'other object'})).toFail();
   });
 
   it("toContain to build an ExpectationResult", function() {
@@ -384,7 +402,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toContain");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual));
     expect(result.message).toMatch('contain');
     expect(result.message).toMatch(jasmine.pp(expected));
@@ -401,7 +419,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toNotContain");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual));
     expect(result.message).toMatch('not contain');
     expect(result.message).toMatch(jasmine.pp(expected));
@@ -410,9 +428,9 @@ describe("jasmine.Matchers", function() {
   });
 
   it("toBeLessThan should pass if actual is less than expected", function() {
-    expect(match(37).toBeLessThan(42)).toEqual(true);
-    expect(match(37).toBeLessThan(-42)).toEqual(false);
-    expect(match(37).toBeLessThan(37)).toEqual(false);
+    expect(match(37).toBeLessThan(42)).toPass();
+    expect(match(37).toBeLessThan(-42)).toFail();
+    expect(match(37).toBeLessThan(37)).toFail();
   });
 
   it("toBeLessThan to build an ExpectationResult", function() {
@@ -424,7 +442,7 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toBeLessThan");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual) + ' to be less than');
     expect(result.message).toMatch(jasmine.pp(expected));
     expect(result.actual).toEqual(actual);
@@ -432,9 +450,9 @@ describe("jasmine.Matchers", function() {
   });
 
   it("toBeGreaterThan should pass if actual is greater than expected", function() {
-    expect(match(37).toBeGreaterThan(42)).toEqual(false);
-    expect(match(37).toBeGreaterThan(-42)).toEqual(true);
-    expect(match(37).toBeGreaterThan(37)).toEqual(false);
+    expect(match(37).toBeGreaterThan(42)).toFail();
+    expect(match(37).toBeGreaterThan(-42)).toPass();
+    expect(match(37).toBeGreaterThan(37)).toFail();
   });
 
   it("toBeGreaterThan to build an ExpectationResult", function() {
@@ -446,54 +464,95 @@ describe("jasmine.Matchers", function() {
     var result = lastResult();
 
     expect(result.matcherName).toEqual("toBeGreaterThan");
-    expect(result.passed()).toEqual(false);
+    expect(result.passed()).toFail();
     expect(result.message).toMatch(jasmine.pp(actual) + ' to be greater than');
     expect(result.message).toMatch(jasmine.pp(expected));
     expect(result.actual).toEqual(actual);
     expect(result.expected).toEqual(expected);
   });
 
-  it("toThrow", function() {
-    var expected = match(function() {
-      throw new Error("Fake Error");
-    });
-    expect(expected.toThrow()).toEqual(true);
-    expect(expected.toThrow("Fake Error")).toEqual(true);
-    expect(expected.toThrow(new Error("Fake Error"))).toEqual(true);
+  describe("toThrow", function() {
+    describe("when code block throws an exception", function() {
+      var throwingFn;
 
-    expect(expected.toThrow("Other Error")).toEqual(false);
-    var result = lastResult();
-    expect(result.message).toMatch("Other Error");
+      beforeEach(function() {
+        throwingFn = function() {
+          throw new Error("Fake Error");
+        };
+      });
 
-    expect(expected.toThrow(new Error("Other Error"))).toEqual(false);
-    result = lastResult();
-    expect(result.message).toMatch("Other Error");
+      it("should match any exception", function() {
+        expect(match(throwingFn).toThrow()).toPass();
+      });
 
-    var exception;
-    try {
-      (function () {
-        new jasmine.Matchers(env, 'not-a-function', spec).toThrow();
-      })();
-    } catch (e) {
-      exception = e;
-    }
+      it("should match exceptions specified by message", function() {
+        expect(match(throwingFn).toThrow("Fake Error")).toPass();
+        expect(match(throwingFn).toThrow("Other Error")).toFail();
+        expect(lastResult().message).toMatch("Other Error");
+      });
 
-    expect(exception).toBeDefined();
-    expect(exception.message).toEqual('Actual is not a function');
+      it("should match exceptions specified by Error", function() {
+        expect(match(throwingFn).toThrow(new Error("Fake Error"))).toPass();
+        expect(match(throwingFn).toThrow(new Error("Other Error"))).toFail();
+        expect(lastResult().message).toMatch("Other Error");
+      });
 
+      describe("and matcher is inverted with .not", function() {
+        it("should match any exception", function() {
+          expect(match(throwingFn).not.toThrow()).toFail();
+          expect(lastResult().message).toMatch(/Expected function not to throw  an exception/);
+        });
 
-    expect(match(function() {
-    }).toThrow()).toEqual(false);
-    result = lastResult();
-    expect(result.message).toEqual('Expected function to throw an exception.');
+        it("should match exceptions specified by message", function() {
+          expect(match(throwingFn).not.toThrow("Fake Error")).toFail();
+//          expect(lastResult().message).toMatch(/Expected function not to throw Fake Error./);
+          expect(match(throwingFn).not.toThrow("Other Error")).toPass();
+        });
+
+        it("should match exceptions specified by Error", function() {
+          expect(match(throwingFn).not.toThrow(new Error("Fake Error"))).toFail();
+//          expect(lastResult().message).toMatch("Other Error");
+          expect(match(throwingFn).not.toThrow(new Error("Other Error"))).toPass();
+        });
+      });
+    });
+
+    describe("when actual is not a function", function() {
+      it("should fail with an exception", function() {
+        var exception = catchException(function() {
+          match('not-a-function').toThrow();
+        });
+        expect(exception).toBeDefined();
+        expect(exception.message).toEqual('Actual is not a function');
+      });
+
+      describe("and matcher is inverted with .not", function() {
+        it("should fail with an exception", function() {
+          var exception = catchException(function() {
+            match('not-a-function').not.toThrow();
+          });
+          expect(exception).toBeDefined();
+          expect(exception.message).toEqual('Actual is not a function');
+        });
+      });
+    });
+
+
+    describe("when code block does not throw an exception", function() {
+      it("should fail (or pass when inverted with .not)", function() {
+        expect(match(function() {
+        }).toThrow()).toFail();
+        expect(lastResult().message).toEqual('Expected function to throw an exception.');
+      });
+    });
   });
 
   describe(".not.matcher", function() {
     it("should invert the sense of any matcher", function() {
-      expect(match(37).not.toBeGreaterThan(42)).toEqual(true);
-      expect(match(42).not.toBeGreaterThan(37)).toEqual(false);
-      expect(match("abc").not.toEqual("def")).toEqual(true);
-      expect(match("abc").not.toEqual("abc")).toEqual(false);
+      expect(match(37).not.toBeGreaterThan(42)).toPass();
+      expect(match(42).not.toBeGreaterThan(37)).toFail();
+      expect(match("abc").not.toEqual("def")).toPass();
+      expect(match("abc").not.toEqual("abc")).toFail();
     });
 
     it("should provide an inverted default message", function() {
@@ -557,10 +616,10 @@ describe("jasmine.Matchers", function() {
 
     describe("toHaveBeenCalled", function() {
       it("should pass if the spy was called", function() {
-        expect(match(TestClass.spyFunction).toHaveBeenCalled()).toEqual(false);
+        expect(match(TestClass.spyFunction).toHaveBeenCalled()).toFail();
 
         TestClass.spyFunction();
-        expect(match(TestClass.spyFunction).toHaveBeenCalled()).toEqual(true);
+        expect(match(TestClass.spyFunction).toHaveBeenCalled()).toPass();
       });
 
       it("should throw an exception when invoked with any arguments", function() {
@@ -585,10 +644,10 @@ describe("jasmine.Matchers", function() {
 
     describe("wasNotCalled", function() {
       it("should pass iff the spy was not called", function() {
-        expect(match(TestClass.spyFunction).wasNotCalled()).toEqual(true);
+        expect(match(TestClass.spyFunction).wasNotCalled()).toPass();
 
         TestClass.spyFunction();
-        expect(match(TestClass.spyFunction).wasNotCalled()).toEqual(false);
+        expect(match(TestClass.spyFunction).wasNotCalled()).toFail();
       });
 
       it("should throw an exception when invoked with any arguments", function() {
@@ -603,15 +662,15 @@ describe("jasmine.Matchers", function() {
     describe("toHaveBeenCalledWith", function() {
       it('toHaveBeenCalledWith should return true if it was called with the expected args', function() {
         TestClass.spyFunction('a', 'b', 'c');
-        expect(match(TestClass.spyFunction).toHaveBeenCalledWith('a', 'b', 'c')).toEqual(true);
+        expect(match(TestClass.spyFunction).toHaveBeenCalledWith('a', 'b', 'c')).toPass();
       });
 
       it('should return false if it was not called with the expected args', function() {
         TestClass.spyFunction('a', 'b', 'c');
         var expected = match(TestClass.spyFunction);
-        expect(expected.toHaveBeenCalledWith('c', 'b', 'a')).toEqual(false);
+        expect(expected.toHaveBeenCalledWith('c', 'b', 'a')).toFail();
         var result = lastResult();
-        expect(result.passed()).toEqual(false);
+        expect(result.passed()).toFail();
         expect(result.expected).toEqual(['c', 'b', 'a']);
         expect(result.actual.mostRecentCall.args).toEqual(['a', 'b', 'c']);
         expect(result.message).toContain(jasmine.pp(result.expected));
@@ -620,21 +679,37 @@ describe("jasmine.Matchers", function() {
 
       it('should return false if it was not called', function() {
         var expected = match(TestClass.spyFunction);
-        expect(expected.toHaveBeenCalledWith('c', 'b', 'a')).toEqual(false);
+        expect(expected.toHaveBeenCalledWith('c', 'b', 'a')).toFail();
         var result = lastResult();
-        expect(result.passed()).toEqual(false);
+        expect(result.passed()).toFail();
         expect(result.expected).toEqual(['c', 'b', 'a']);
         expect(result.actual.argsForCall).toEqual([]);
         expect(result.message).toContain(jasmine.pp(result.expected));
       });
 
       it('should allow matches across multiple calls', function() {
+        TestClass.spyFunction('a', 'b', 'c');
+        TestClass.spyFunction('d', 'e', 'f');
         var expected = match(TestClass.spyFunction);
+        expect(expected.toHaveBeenCalledWith('a', 'b', 'c')).toPass();
+        expect(expected.toHaveBeenCalledWith('d', 'e', 'f')).toPass();
+        expect(expected.toHaveBeenCalledWith('x', 'y', 'z')).toFail();
+      });
+
+      it("should return a decent message", function() {
         TestClass.spyFunction('a', 'b', 'c');
         TestClass.spyFunction('d', 'e', 'f');
-        expect(expected.toHaveBeenCalledWith('a', 'b', 'c')).toEqual(true);
-        expect(expected.toHaveBeenCalledWith('d', 'e', 'f')).toEqual(true);
-        expect(expected.toHaveBeenCalledWith('x', 'y', 'z')).toEqual(false);
+        var expected = match(TestClass.spyFunction);
+        expect(expected.toHaveBeenCalledWith('a', 'b')).toFail();
+        expect(lastResult().message).toEqual("Expected spy to have been called with [ 'a', 'b' ] but was called with [ [ 'a', 'b', 'c' ], [ 'd', 'e', 'f' ] ]");
+      });
+
+      it("should return a decent message when inverted", function() {
+        TestClass.spyFunction('a', 'b', 'c');
+        TestClass.spyFunction('d', 'e', 'f');
+        var expected = match(TestClass.spyFunction);
+        expect(expected.not.toHaveBeenCalledWith('a', 'b', 'c')).toFail();
+        expect(lastResult().message).toEqual("Expected spy not to have been called with [ 'a', 'b', 'c' ] but was called with [ [ 'a', 'b', 'c' ], [ 'd', 'e', 'f' ] ]");
       });
 
       it('should throw an exception when invoked on a non-spy', shouldThrowAnExceptionWhenInvokedOnANonSpy('toHaveBeenCalledWith'));
@@ -658,7 +733,7 @@ describe("jasmine.Matchers", function() {
 
           var result = lastResult();
           expect(result.matcherName).toEqual("toHaveBeenCalledWith");
-          expect(result.passed()).toEqual(false);
+          expect(result.passed()).toFail();
           expect(result.message).toContain(jasmine.pp(['a', 'b']));
           expect(result.message).toContain(jasmine.pp(['a', 'c']));
           expect(result.actual).toEqual(TestClass.someFunction);
@@ -680,15 +755,15 @@ describe("jasmine.Matchers", function() {
     describe("wasNotCalledWith", function() {
       it('should return true if the spy was NOT called with the expected args', function() {
         TestClass.spyFunction('a', 'b', 'c');
-        expect(match(TestClass.spyFunction).wasNotCalledWith('c', 'b', 'a')).toEqual(true);
+        expect(match(TestClass.spyFunction).wasNotCalledWith('c', 'b', 'a')).toPass();
       });
 
       it('should return false if it WAS called with the expected args', function() {
         TestClass.spyFunction('a', 'b', 'c');
         var expected = match(TestClass.spyFunction);
-        expect(expected.wasNotCalledWith('a', 'b', 'c')).toEqual(false);
+        expect(expected.wasNotCalledWith('a', 'b', 'c')).toFail();
         var result = lastResult();
-        expect(result.passed()).toEqual(false);
+        expect(result.passed()).toFail();
         expect(result.expected).toEqual(['a', 'b', 'c']);
         expect(result.actual.mostRecentCall.args).toEqual(['a', 'b', 'c']);
         expect(result.message).toContain(jasmine.pp(result.expected));
@@ -696,21 +771,25 @@ describe("jasmine.Matchers", function() {
 
       it('should return true if it was not called', function() {
         var expected = match(TestClass.spyFunction);
-        expect(expected.wasNotCalledWith('c', 'b', 'a')).toEqual(true);
+        expect(expected.wasNotCalledWith('c', 'b', 'a')).toPass();
       });
 
       it('should allow matches across multiple calls', function() {
         var expected = match(TestClass.spyFunction);
         TestClass.spyFunction('a', 'b', 'c');
         TestClass.spyFunction('d', 'e', 'f');
-        expect(expected.wasNotCalledWith('a', 'b', 'c')).toEqual(false);
-        expect(expected.wasNotCalledWith('d', 'e', 'f')).toEqual(false);
-        expect(expected.wasNotCalledWith('x', 'y', 'z')).toEqual(true);
+        expect(expected.wasNotCalledWith('a', 'b', 'c')).toFail();
+        expect(expected.wasNotCalledWith('d', 'e', 'f')).toFail();
+        expect(expected.wasNotCalledWith('x', 'y', 'z')).toPass();
       });
 
       it('should throw an exception when invoked on a non-spy', shouldThrowAnExceptionWhenInvokedOnANonSpy('wasNotCalledWith'));
-
     });
+  });
 
+  describe("all matchers", function() {
+    it("should return null, for future-proofing, since we might eventually allow matcher chaining", function() {
+      expect(match(true).toBe(true)).toBeUndefined();
+    });
   });
 });