Encapsulate ExpectationResult

lib/jasmine-core/jasmine.js

@@ -510,23 +510,23 @@ jasmine.util.extend = function(destination, source) {
 
 //TODO: expectation result may make more sense as a presentation of an expectation.
 jasmine.ExpectationResult = function(params) {
-  this.type = 'expect';
+  var self = this;
-  this.matcherName = params.matcherName;
-  this.passed_ = params.passed;
-  this.expected = params.expected;
-  this.actual = params.actual;
-  this.message = this.passed_ ? 'Passed.' : params.message;
-
   var trace = (params.trace || new Error(this.message));
-  this.trace = this.passed_ ? '' : trace;
+  var message = params.passed ? 'Passed.' : params.message;
-};
+  return jasmine.util.extend(self, {
-
+    type: 'expect',
-jasmine.ExpectationResult.prototype.toString = function () {
+    matcherName: params.matcherName,
-  return this.message;
+    expected: params.expected,
-};
+    actual:  params.actual,
-
+    message: message,
-jasmine.ExpectationResult.prototype.passed = function () {
+    trace: params.passed ? '' : trace,
-  return this.passed_;
+    toString: function() {
+      return message;
+    },
+    passed: function() {
+      return params.passed;
+    }
+  });
 };
 /**
  * Environment for Jasmine

spec/core/CustomMatchersSpec.js

@@ -61,12 +61,10 @@ describe("Custom Matchers", function() {
     });
 
     suite.execute();
-    var passResult = new jasmine.ExpectationResult({passed: true, matcherName: 'toBeTrue',
+
-      actual: true, expected: jasmine.undefined, message: "Passed." });
+    var results = spec.results().getItems();
-    var failResult = new jasmine.ExpectationResult({passed: false, matcherName: 'toBeTrue',
+    expect(results[0].message).toEqual("Passed.");
-      actual: false, expected: jasmine.undefined, message: "Expected false to be true." });
+    expect(results[1].message).toEqual("Expected false to be true.");
-    failResult.trace = originalJasmine.any(Object);
-    expect(spec.results().getItems()).toEqual([passResult, failResult]);
   });
 
   it("should pass args", function() {

spec/core/ExpectationResultSpec.js

@@ -5,11 +5,16 @@ describe("ExpectationResult", function() {
     expect(result.passed()).toBe('some-value');
   });
 
-  it("#toString returns message", function() {
+  it("#toString returns message when failing", function() {
-    var result = new jasmine.ExpectationResult({message: 'some-value'});
+    var result = new jasmine.ExpectationResult({passed: false, message: 'some-value'});
     expect(result.toString()).toBe('some-value');
   });
 
+  it("#toString returns Passed when passing", function() {
+    var result = new jasmine.ExpectationResult({passed: true, message: 'some-value'});
+    expect(result.toString()).toBe('Passed.');
+  });
+
   it("has a type of expect", function() {
     var result = new jasmine.ExpectationResult({});
     expect(result.type).toBe('expect');

spec/node_suite.js

@@ -110,7 +110,7 @@ process.argv.forEach(function(arg) {
   }
 });
 
-var specs = jasmine.getAllSpecFiles(__dirname, new RegExp(".js$"));
+var specs = jasmine.getAllSpecFiles(__dirname, new RegExp("Spec.js$"));
 var domIndependentSpecs = [];
 for (var i = 0; i < specs.length; i++) {
   if (fs.readFileSync(specs[i], "utf8").indexOf("document.createElement") < 0) {

src/core/ExpectationResult.js

@@ -1,20 +1,20 @@
 //TODO: expectation result may make more sense as a presentation of an expectation.
 jasmine.ExpectationResult = function(params) {
-  this.type = 'expect';
+  var self = this;
-  this.matcherName = params.matcherName;
-  this.passed_ = params.passed;
-  this.expected = params.expected;
-  this.actual = params.actual;
-  this.message = this.passed_ ? 'Passed.' : params.message;
-
   var trace = (params.trace || new Error(this.message));
-  this.trace = this.passed_ ? '' : trace;
+  var message = params.passed ? 'Passed.' : params.message;
-};
+  return jasmine.util.extend(self, {
-
+    type: 'expect',
-jasmine.ExpectationResult.prototype.toString = function () {
+    matcherName: params.matcherName,
-  return this.message;
+    expected: params.expected,
-};
+    actual:  params.actual,
-
+    message: message,
-jasmine.ExpectationResult.prototype.passed = function () {
+    trace: params.passed ? '' : trace,
-  return this.passed_;
+    toString: function() {
+      return message;
+    },
+    passed: function() {
+      return params.passed;
+    }
+  });
 };