github-migration/jasmine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide a way to add more matchers in a spec or suite without affecting later specs or suites.

Browse Source
This commit is contained in:
Christian Williams 2009-07-07 23:57:03 -07:00
parent 378d6bb4ff
commit ed00c13b15
3 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/jasmine.js
View File

@ -1623,6 +1623,7 @@ jasmine.Spec = function(env, suite, description) {
this.results = new jasmine.NestedResults();
this.results.description = description;
this.runs = this.addToQueue;
this.matchersClass = null;
};
jasmine.Spec.prototype.getFullName = function() {
@ -1660,7 +1661,7 @@ jasmine.Spec.prototype.expects_that = function(actual) {
* @private
*/
jasmine.Spec.prototype.expect = function(actual) {
return new jasmine.Matchers(this.env, actual, this.results);
return new (this.getMatchersClass_())(this.env, actual, this.results);
};
/**
@ -1682,6 +1683,22 @@ jasmine.Spec.prototype.waitsFor = function(timeout, latchFunction, message) {
return this;
};
jasmine.Spec.prototype.getMatchersClass_ = function(matcherPrototype) {
return this.matchersClass || jasmine.Matchers;
};
jasmine.Spec.prototype.addMatchers = function(matchersPrototype) {
var parent = this.getMatchersClass_();
var newMatchersClass = function() {
parent.apply(this, arguments);
};
jasmine.util.inherit(newMatchersClass, parent);
for (var method in matchersPrototype) {
newMatchersClass.prototype[method] = matchersPrototype[method];
}
this.matchersClass = newMatchersClass;
};
jasmine.Spec.prototype.resetTimeout = function() {
this.currentTimeout = 0;
this.currentLatchFunction = undefined;

32
spec/suites/SpecRunningTest.js
View File

@ -728,4 +728,36 @@ describe("jasmine spec running", function () {
expect(exceptionMessage).toEqual('explodes function should not have been called');
});
it("should be easy to add more matchers local to a spec, suite, etc.", 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;
} });
});
spec1 = env.it('spec with an expectation').runs(function () {
this.addMatchers( { matcherForSpec: function(expected) {
return "matcherForSpec: actual: " + this.actual + "; expected: " + expected;
} });
spec1Matcher = this.expect("xxx");
});
spec2 = env.it('spec with failing expectation').runs(function () {
spec2Matcher = this.expect("yyy");
});
});
suite.execute();
expect(spec1Matcher.matcherForSuite("expected")).toEqual("matcherForSuite: actual: xxx; expected: expected");
expect(spec1Matcher.matcherForSpec("expected")).toEqual("matcherForSpec: actual: xxx; expected: expected");
expect(spec2Matcher.matcherForSuite("expected")).toEqual("matcherForSuite: actual: yyy; expected: expected");
expect(spec2Matcher.matcherForSpec).toBe(undefined);
});
});

19
src/Spec.js
View File

@ -21,6 +21,7 @@ jasmine.Spec = function(env, suite, description) {
this.results = new jasmine.NestedResults();
this.results.description = description;
this.runs = this.addToQueue;
this.matchersClass = null;
};
jasmine.Spec.prototype.getFullName = function() {
@ -58,7 +59,7 @@ jasmine.Spec.prototype.expects_that = function(actual) {
* @private
*/
jasmine.Spec.prototype.expect = function(actual) {
return new jasmine.Matchers(this.env, actual, this.results);
return new (this.getMatchersClass_())(this.env, actual, this.results);
};
/**
@ -80,6 +81,22 @@ jasmine.Spec.prototype.waitsFor = function(timeout, latchFunction, message) {
return this;
};
jasmine.Spec.prototype.getMatchersClass_ = function(matcherPrototype) {
return this.matchersClass || jasmine.Matchers;
};
jasmine.Spec.prototype.addMatchers = function(matchersPrototype) {
var parent = this.getMatchersClass_();
var newMatchersClass = function() {
parent.apply(this, arguments);
};
jasmine.util.inherit(newMatchersClass, parent);
for (var method in matchersPrototype) {
newMatchersClass.prototype[method] = matchersPrototype[method];
}
this.matchersClass = newMatchersClass;
};
jasmine.Spec.prototype.resetTimeout = function() {
this.currentTimeout = 0;
this.currentLatchFunction = undefined;