evergreen 0.1 → 0.2.0

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

@@ -210,11 +210,11 @@ describe('RunnerTest', function() {
       });
 
       env.currentRunner().execute();
-      expect(fakeReporter.reportRunnerResults).wasNotCalled();
+      expect(fakeReporter.reportRunnerResults).not.toHaveBeenCalled();
       fakeTimer.tick(200);
       //This blows up the JSApiReporter.
-      //expect(fakeReporter.reportRunnerResults).wasCalledWith(env.currentRunner);
-      expect(fakeReporter.reportRunnerResults).wasCalled();
+      //expect(fakeReporter.reportRunnerResults).toHaveBeenCalledWith(env.currentRunner);
+      expect(fakeReporter.reportRunnerResults).toHaveBeenCalled();
       expect(fakeReporter.reportRunnerResults.mostRecentCall.args[0].results()).toEqual(env.currentRunner().results());
     });
   });
@@ -227,12 +227,12 @@ describe('RunnerTest', function() {
     var runner = new jasmine.Runner(env);
     runner.arbitraryVariable = 'foo';
     spyOn(runner.queue, 'start');
-    expect(fakeReporter.reportRunnerStarting).wasNotCalled();
+    expect(fakeReporter.reportRunnerStarting).not.toHaveBeenCalled();
     runner.execute();
-    expect(fakeReporter.reportRunnerStarting).wasCalled();
+    expect(fakeReporter.reportRunnerStarting).toHaveBeenCalled();
     var reportedRunner = fakeReporter.reportRunnerStarting.mostRecentCall.args[0];
     expect(reportedRunner.arbitraryVariable).toEqual('foo');
-    expect(runner.queue.start).wasCalled();
+    expect(runner.queue.start).toHaveBeenCalled();
   });
 
   describe("when suites are nested", function() {

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

@@ -1118,7 +1118,7 @@ describe("jasmine spec running", function () {
 
     disabledSuite.execute();
 
-    expect(spy).wasNotCalled();
+    expect(spy).not.toHaveBeenCalled();
   });
 
   it('#explodes should throw an exception when it is called inside a spec', function() {

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

@@ -34,7 +34,6 @@ describe('Spec', function () {
       expect(spec2.id).toEqual(1);
       expect(spec3.id).toEqual(2);
     });
-
   });
 
   it('getFullName returns suite & spec description', function () {
@@ -106,5 +105,20 @@ describe('Spec', function () {
         expect(results.passed()).toEqual(true);
       });
     });
+
+    it("includes log messages, which may contain arbitary objects", function() {
+      spec.runs(function() {
+        this.log("here's some log message", {key: 'value'}, 123);
+      });
+      spec.execute();
+      var items = results.getItems();
+      expect(items).toEqual([
+          jasmine.any(jasmine.ExpectationResult),
+          jasmine.any(jasmine.ExpectationResult),
+          jasmine.any(jasmine.MessageResult)
+      ]);
+      var logResult = items[2];
+      expect(logResult.values).toEqual(["here's some log message", {key: 'value'}, 123]);
+    });
   });
 });

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

@@ -169,11 +169,11 @@ describe('Spies', function () {
     var TestClass = { someFunction: function() {} };
     this.spyOn(TestClass, 'someFunction');
 
-    expect(TestClass.someFunction).wasNotCalled();
+    expect(TestClass.someFunction).not.toHaveBeenCalled();
     TestClass.someFunction();
-    expect(TestClass.someFunction).wasCalled();
+    expect(TestClass.someFunction).toHaveBeenCalled();
     TestClass.someFunction.reset();
-    expect(TestClass.someFunction).wasNotCalled();
+    expect(TestClass.someFunction).not.toHaveBeenCalled();
     expect(TestClass.someFunction.callCount).toEqual(0);
   });
 

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

@@ -1,9 +1,16 @@
 describe("TrivialReporter", function() {
+  var env;
   var trivialReporter;
   var body;
+  var fakeDocument;
 
   beforeEach(function() {
+    env = new jasmine.Env();
+    env.updateInterval = 0;
+
     body = document.createElement("body");
+    fakeDocument = { body: body, location: { search: "" } };
+    trivialReporter = new jasmine.TrivialReporter(fakeDocument);
   });
 
   function fakeSpec(name) {
@@ -29,16 +36,15 @@ describe("TrivialReporter", function() {
   }
 
   it("should run only specs beginning with spec parameter", function() {
-    var trivialReporter = new jasmine.TrivialReporter({ location: {search: "?spec=run%20this"} });
+    fakeDocument.location.search = "?spec=run%20this";
     expect(trivialReporter.specFilter(fakeSpec("run this"))).toBeTruthy();
     expect(trivialReporter.specFilter(fakeSpec("not the right spec"))).toBeFalsy();
     expect(trivialReporter.specFilter(fakeSpec("not run this"))).toBeFalsy();
   });
 
   it("should display empty divs for every suite when the runner is starting", function() {
-    var trivialReporter = new jasmine.TrivialReporter({ body: body });
     trivialReporter.reportRunnerStarting({
-      env: new jasmine.Env(),
+      env: env,
       suites: function() {
         return [ new jasmine.Suite({}, "suite 1", null, null) ];
       }
@@ -61,7 +67,6 @@ describe("TrivialReporter", function() {
 
     var runner, spec, fakeTimer;
     beforeEach(function () {
-      var env = new jasmine.Env();
       fakeTimer = new jasmine.FakeTimer();
       env.setTimeout = fakeTimer.setTimeout;
       env.clearTimeout = fakeTimer.clearTimeout;
@@ -72,7 +77,7 @@ describe("TrivialReporter", function() {
       runner.add(suite);
       spec = new jasmine.Spec(env, suite, 'some spec');
       suite.add(spec);
-      var trivialReporter = new jasmine.TrivialReporter({ body: body, location: {search: "?"} });
+      fakeDocument.location.search = "?";
       env.addReporter(trivialReporter);
     });
 
@@ -103,12 +108,10 @@ describe("TrivialReporter", function() {
         getItems: function() {
         }};
 
+      var suite1 = new jasmine.Suite(env, "suite 1", null, null);
+
       spec = {
-        suite: {
-          getFullName: function() {
-            return "suite 1";
-          }
-        },
+        suite: suite1,
         getFullName: function() {
           return "foo";
         },
@@ -117,11 +120,10 @@ describe("TrivialReporter", function() {
         }
       };
 
-      trivialReporter = new jasmine.TrivialReporter({ body: body });
       trivialReporter.reportRunnerStarting({
-        env: new jasmine.Env(),
+        env: env,
         suites: function() {
-          return [ new jasmine.Suite({}, "suite 1", null, null) ];
+          return [ suite1 ];
         }
       });
     });
@@ -130,7 +132,7 @@ describe("TrivialReporter", function() {
       expectationResult = new jasmine.ExpectationResult({
         matcherName: "toBeNull", passed: false, message: "Expected 'a' to be null, but it was not"
       });
-    
+
       spyOn(results, 'getItems').andReturn([expectationResult]);
 
       trivialReporter.reportSpecResults(spec);
@@ -155,4 +157,79 @@ describe("TrivialReporter", function() {
     });
   });
 
+  describe("log messages", function() {
+    it("should appear in the report", function() {
+      env.describe("suite", function() {
+        env.it("will have log messages", function() {
+          this.log("this is a", "multipart log message");
+        });
+      });
+
+      env.addReporter(trivialReporter);
+      env.execute();
+
+      var divs = body.getElementsByTagName("div");
+      var errorDiv = findElement(divs, 'resultMessage log');
+      expect(errorDiv.innerHTML).toEqual("this is a multipart log message");
+    });
+  });
+
+  describe("duplicate example names", function() {
+    it("should report failures correctly", function() {
+      var suite1 = env.describe("suite", function() {
+        env.it("will have log messages", function() {
+          this.log("this one fails!");
+          this.expect(true).toBeFalsy();
+        });
+      });
+
+      var suite2 = env.describe("suite", function() {
+        env.it("will have log messages", function() {
+          this.log("this one passes!");
+          this.expect(true).toBeTruthy();
+        });
+      });
+
+      env.addReporter(trivialReporter);
+      env.execute();
+
+      var divs = body.getElementsByTagName("div");
+      var passedSpecDiv = findElement(divs, 'suite passed');
+      expect(passedSpecDiv.className).toEqual('suite passed');
+      expect(passedSpecDiv.innerHTML).toContain("this one passes!");
+      expect(passedSpecDiv.innerHTML).not.toContain("this one fails!");
+
+      var failedSpecDiv = findElement(divs, 'suite failed');
+      expect(failedSpecDiv.className).toEqual('suite failed');
+      expect(failedSpecDiv.innerHTML).toContain("this one fails!");
+      expect(failedSpecDiv.innerHTML).not.toContain("this one passes!");
+    });
+  });
+
+  describe('#reportSpecStarting', function() {
+    var spec1;
+    beforeEach(function () {
+      env.describe("suite 1", function() {
+        spec1 = env.it("spec 1", function() {
+        });
+      });
+    });
+
+    it('DOES NOT log running specs by default', function() {
+      spyOn(trivialReporter, 'log');
+
+      trivialReporter.reportSpecStarting(spec1);
+
+      expect(trivialReporter.log).not.toHaveBeenCalled();
+    });
+
+    it('logs running specs when log_running_specs is true', function() {
+      trivialReporter.logRunningSpecs = true;
+      spyOn(trivialReporter, 'log');
+
+      trivialReporter.reportSpecStarting(spec1);
+
+      expect(trivialReporter.log).toHaveBeenCalledWith('>> Jasmine Running suite 1 spec 1...');
+    });
+  });
 });

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

@@ -17,7 +17,7 @@ describe('WaitsForBlock', function () {
     var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
     expect(onComplete).wasNotCalled();
     block.execute(onComplete);
-    expect(onComplete).wasCalled();
+    expect(onComplete).toHaveBeenCalled();
   });
 
   it('latchFunction should run in same scope as spec', function () {
@@ -36,8 +36,8 @@ describe('WaitsForBlock', function () {
     spyOn(spec, 'fail');
     var block = new jasmine.WaitsForBlock(env, timeout, latchFunction, message, spec);
     block.execute(onComplete);
-    expect(spec.fail).wasCalledWith('some error');
-    expect(onComplete).wasCalled();
+    expect(spec.fail).toHaveBeenCalledWith('some error');
+    expect(onComplete).toHaveBeenCalled();
   });
 
   describe("if latchFunction returns false", function() {
@@ -69,7 +69,7 @@ describe('WaitsForBlock', function () {
       expect(onComplete).wasNotCalled();
       latchFunction.andReturn(true);
       fakeTimer.tick(100);
-      expect(onComplete).wasCalled();
+      expect(onComplete).toHaveBeenCalled();
     });
 
     it('spec should fail with the passed message if the timeout is reached (and not call onComplete)', function () {
@@ -78,11 +78,10 @@ describe('WaitsForBlock', function () {
       block.execute(onComplete);
       expect(spec.fail).wasNotCalled();
       fakeTimer.tick(timeout);
-      expect(spec.fail).wasCalled();
+      expect(spec.fail).toHaveBeenCalled();
       var failMessage = spec.fail.mostRecentCall.args[0].message;
       expect(failMessage).toMatch(message);
       expect(onComplete).wasNotCalled();
-
     });
   });
 });

data/lib/jasmine/src/JsApiReporter.js

@@ -80,11 +80,11 @@ jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){
 
 jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){
   var summaryMessages = [];
-  var messagesLength = result.messages.length
+  var messagesLength = result.messages.length;
   for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) {
     var resultMessage = result.messages[messageIndex];
     summaryMessages.push({
-      text: resultMessage.text,
+      text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined,
       passed: resultMessage.passed ? resultMessage.passed() : true,
       type: resultMessage.type,
       message: resultMessage.message,
@@ -92,13 +92,11 @@ jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){
         stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined
       }
     });
-  };
+  }
 
-  var summaryResult = {
+  return {
     result : result.result,
     messages : summaryMessages
   };
-
-  return summaryResult;
 };
 

data/lib/jasmine/src/Matchers.js

@@ -15,25 +15,11 @@ jasmine.Matchers = function(env, actual, spec, opt_isNot) {
 // todo: @deprecated as of Jasmine 0.11, remove soon [xw]
 jasmine.Matchers.pp = function(str) {
   throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!");
-  this.report();
 };
 
-/** @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. */
+// todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw]
 jasmine.Matchers.prototype.report = function(result, failing_message, details) {
-  // todo: report a deprecation warning [xw]
-
-  if (this.isNot) {
-    throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs");
-  }
-  
-  this.reportWasCalled_ = true;
-  var expectationResult = new jasmine.ExpectationResult({
-    passed: result,
-    message: failing_message,
-    details: details
-  });
-  this.spec.addMatcherResult(expectationResult);
-  return result;
+  throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs");
 };
 
 jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) {
@@ -176,12 +162,18 @@ jasmine.Matchers.prototype.toBeFalsy = function() {
   return !this.actual;
 };
 
+
+/** @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.
  */
-jasmine.Matchers.prototype.wasCalled = function() {
+jasmine.Matchers.prototype.toHaveBeenCalled = function() {
   if (arguments.length > 0) {
-    throw new Error('wasCalled does not take arguments, use wasCalledWith');
+    throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith');
   }
 
   if (!jasmine.isSpy(this.actual)) {
@@ -197,6 +189,8 @@ jasmine.Matchers.prototype.wasCalled = function() {
 
 /**
  * Matcher that checks to see if the actual, a Jasmine spy, was not called.
+ *
+ * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead
  */
 jasmine.Matchers.prototype.wasNotCalled = function() {
   if (arguments.length > 0) {
@@ -214,13 +208,18 @@ jasmine.Matchers.prototype.wasNotCalled = function() {
   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.
  *
  * @example
  *
  */
-jasmine.Matchers.prototype.wasCalledWith = function() {
+jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
   var expectedArgs = jasmine.util.argsToArray(arguments);
   if (!jasmine.isSpy(this.actual)) {
     throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
@@ -236,6 +235,7 @@ jasmine.Matchers.prototype.wasCalledWith = function() {
   return this.env.contains_(this.actual.argsForCall, expectedArgs);
 };
 
+/** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */
 jasmine.Matchers.prototype.wasNotCalledWith = function() {
   var expectedArgs = jasmine.util.argsToArray(arguments);
   if (!jasmine.isSpy(this.actual)) {

data/lib/jasmine/src/MultiReporter.js

@@ -11,7 +11,14 @@ jasmine.MultiReporter.prototype.addReporter = function(reporter) {
 };
 
 (function() {
-  var functionNames = ["reportRunnerStarting", "reportRunnerResults", "reportSuiteResults", "reportSpecResults", "log"];
+  var functionNames = [
+    "reportRunnerStarting",
+    "reportRunnerResults",
+    "reportSuiteResults",
+    "reportSpecStarting",
+    "reportSpecResults",
+    "log"
+  ];
   for (var i = 0; i < functionNames.length; i++) {
     var functionName = functionNames[i];
     jasmine.MultiReporter.prototype[functionName] = (function(functionName) {

data/lib/jasmine/src/NestedResults.js

@@ -38,11 +38,11 @@ jasmine.NestedResults.prototype.rollupCounts = function(result) {
 };
 
 /**
- * Tracks a result's message.
- * @param message
+ * Adds a log message.
+ * @param values Array of message parts which will be concatenated later.
  */
-jasmine.NestedResults.prototype.log = function(message) {
-  this.items_.push(new jasmine.MessageResult(message));
+jasmine.NestedResults.prototype.log = function(values) {
+  this.items_.push(new jasmine.MessageResult(values));
 };
 
 /**
@@ -57,7 +57,7 @@ jasmine.NestedResults.prototype.getItems = function() {
  * @param {jasmine.ExpectationResult|jasmine.NestedResults} result
  */
 jasmine.NestedResults.prototype.addResult = function(result) {
-  if (result.type != 'MessageResult') {
+  if (result.type != 'log') {
     if (result.items_) {
       this.rollupCounts(result);
     } else {