warren/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions 9 Packages Projects Releases Wiki Activity

Move ExpectationResult into its own file

Browse Source
This commit is contained in:
Davis W. Frank & Rajan Agaskar
2012-11-29 12:17:20 -08:00
parent 3e5da57cf9
commit 8d94d0bfc5
4 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/jasmine-core/jasmine.js
View File

@@ -102,26 +102,6 @@ jasmine.MessageResult.prototype.toString = function() {
return text;
};
jasmine.ExpectationResult = function(params) {
this.type = 'expect';
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;
};
jasmine.ExpectationResult.prototype.toString = function () {
return this.message;
};
jasmine.ExpectationResult.prototype.passed = function () {
return this.passed_;
};
/**
* Getter for the Jasmine environment. Ensures one gets created
*/
@@ -528,6 +508,25 @@ jasmine.util.extend = function(destination, source) {
return destination;
};
jasmine.ExpectationResult = function(params) {
this.type = 'expect';
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;
};
jasmine.ExpectationResult.prototype.toString = function () {
return this.message;
};
jasmine.ExpectationResult.prototype.passed = function () {
return this.passed_;
};
/**
* Environment for Jasmine
*

19
src/core/ExpectationResult.js Normal file
View File

@@ -0,0 +1,19 @@
jasmine.ExpectationResult = function(params) {
this.type = 'expect';
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;
};
jasmine.ExpectationResult.prototype.toString = function () {
return this.message;
};
jasmine.ExpectationResult.prototype.passed = function () {
return this.passed_;
};

20
src/core/base.js
View File

@@ -102,26 +102,6 @@ jasmine.MessageResult.prototype.toString = function() {
return text;
};
jasmine.ExpectationResult = function(params) {
this.type = 'expect';
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;
};
jasmine.ExpectationResult.prototype.toString = function () {
return this.message;
};
jasmine.ExpectationResult.prototype.passed = function () {
return this.passed_;
};
/**
* Getter for the Jasmine environment. Ensures one gets created
*/

1
tasks/jasmine_dev/sources.rb
View File

@@ -3,6 +3,7 @@ class JasmineDev < Thor
:core => [
"base.js",
"util.js",
"ExpectationResult.js",
"Env.js",
"Reporter.js",
"Block.js",