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

Moved currentlyRunningTests to Runner instead of spec

Browse Source
This commit is contained in:
Erik Hanson & Rajan Agaskar 2009-10-21 09:33:31 -07:00
parent e77162f308
commit b35a2acfc8
18 changed files with 2247 additions and 2396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/files.html
View File

@ -258,7 +258,7 @@ ul.inheritsList
</div>
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:58 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/index.html
View File

@ -300,7 +300,7 @@ ul.inheritsList
</div>
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:58 GMT-0700 (PDT)
</div>
</body>
</html>

43
doc/symbols/_global_.html
View File

@ -384,9 +384,7 @@ ul.inheritsList
</div>
<div class="description">
A function that is called after each spec in a suite.
Used for restoring any state that is hijacked during spec execution.
A function that is called after each spec in a suite. Used for restoring any state that is hijacked during spec execution.
<br />
<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.10.0.js.html">jasmine-0.10.0.js</a>.
@ -425,9 +423,7 @@ Used for restoring any state that is hijacked during spec execution.
</div>
<div class="description">
A function that is called before each spec in a suite.
Used for spec setup, including validating assumptions.
A function that is called before each spec in a suite. Used for spec setup, including validating assumptions.
<br />
<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.10.0.js.html">jasmine-0.10.0.js</a>.
@ -466,11 +462,7 @@ Used for spec setup, including validating assumptions.
</div>
<div class="description">
Defines a suite of specifications.
Stores the description and all defined specs in the Jasmine environment as one suite of specs. Variables declared
are accessible by calls to beforeEach, it, and afterEach. Describe blocks can be nested, allowing for specialization
of setup in some tests.
Defines a suite of specifications. Stores the description and all defined specs in the Jasmine environment as one suite of specs. Variables declared are accessible by calls to beforeEach, it, and afterEach. Describe blocks can be nested, allowing for specialization of setup in some tests.
<br />
<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.10.0.js.html">jasmine-0.10.0.js</a>.
@ -480,9 +472,7 @@ of setup in some tests.
<pre class="code">// TODO: a simple suite
// TODO: a simple suite with a nested describe block</pre>
<pre class="code">// TODO: a simple suite // TODO: a simple suite with a nested describe block</pre>
@ -521,10 +511,7 @@ of setup in some tests.
</div>
<div class="description">
Starts a chain for a Jasmine expectation.
It is passed an Object that is the actual value and should chain to one of the many
jasmine.Matchers functions.
Starts a chain for a Jasmine expectation. It is passed an Object that is the actual value and should chain to one of the many jasmine.Matchers functions.
<br />
<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.10.0.js.html">jasmine-0.10.0.js</a>.
@ -563,9 +550,7 @@ jasmine.Matchers functions.
</div>
<div class="description">
Creates a Jasmine spec that will be added to the current suite.
// TODO: pending tests
Creates a Jasmine spec that will be added to the current suite. // TODO: pending tests
<br />
<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.10.0.js.html">jasmine-0.10.0.js</a>.
@ -575,9 +560,7 @@ jasmine.Matchers functions.
<pre class="code">it('should be true', function() {
expect(true).toEqual(true);
});</pre>
<pre class="code">it('should be true', function() { expect(true).toEqual(true); });</pre>
@ -665,11 +648,7 @@ jasmine.Matchers functions.
<pre class="code">// spy example
var foo = {
not: function(bool) { return !bool; }
}
spyOn(foo, 'not'); // actual foo.not will not be called, execution stops</pre>
<pre class="code">// spy example var foo = { not: function(bool) { return !bool; } } spyOn(foo, 'not'); // actual foo.not will not be called, execution stops</pre>
@ -857,9 +836,7 @@ spyOn(foo, 'not'); // actual foo.not will not be called, execution stops</pre>
</div>
<div class="description">
Creates a <em>disabled</em> Jasmine spec.
A convenience method that allows existing specs to be disabled temporarily during development.
Creates a <em>disabled</em> Jasmine spec. A convenience method that allows existing specs to be disabled temporarily during development.
<br />
<i>Defined in: </i> <a href="../symbols/src/lib_jasmine-0.10.0.js.html">jasmine-0.10.0.js</a>.
@ -908,7 +885,7 @@ A convenience method that allows existing specs to be disabled temporarily durin
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:57 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.Block.html
View File

@ -339,7 +339,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:57 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.Env.html
View File

@ -507,7 +507,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:57 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.JsApiReporter.html
View File

@ -316,7 +316,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:57 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.MultiReporter.html
View File

@ -316,7 +316,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:57 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.NestedResults.html
View File

@ -700,7 +700,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:57 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.Reporter.html
View File

@ -316,7 +316,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:57 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.Runner.html
View File

@ -418,7 +418,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:57 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.Spec.html
View File

@ -396,7 +396,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:58 GMT-0700 (PDT)
</div>
</body>
</html>

90
doc/symbols/jasmine.Spy.html
View File

@ -412,46 +412,15 @@ ul.inheritsList
</div>
<div class="description">
Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks.
Spies should be created in test setup, before expectations. They can then be checked, using the standard Jasmine
expectation syntax. Spies can be checked if they were called or not and what the calling params were.
A Spy has the following mehtod: wasCalled, callCount, mostRecentCall, and argsForCall (see docs)
Spies are torn down at the end of every spec.
Note: Do <b>not</b> call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj.
Jasmine Spies are test doubles that can act as stubs, spies, fakes or when used in an expecation, mocks. Spies should be created in test setup, before expectations. They can then be checked, using the standard Jasmine expectation syntax. Spies can be checked if they were called or not and what the calling params were. A Spy has the following mehtod: wasCalled, callCount, mostRecentCall, and argsForCall (see docs) Spies are torn down at the end of every spec. Note: Do <b>not</b> call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj.
</div>
<pre class="code">// a stub
var myStub = jasmine.createSpy('myStub'); // can be used anywhere
// spy example
var foo = {
not: function(bool) { return !bool; }
}
// actual foo.not will not be called, execution stops
spyOn(foo, 'not');
// foo.not spied upon, execution will continue to implementation
spyOn(foo, 'not').andCallThrough();
// fake example
var foo = {
not: function(bool) { return !bool; }
}
// foo.not(val) will return val
spyOn(foo, 'not').andCallFake(function(value) {return value;});
// mock example
foo.not(7 == 7);
expect(foo.not).wasCalled();
expect(foo.not).wasCalledWith(true);</pre>
<pre class="code">// a stub var myStub = jasmine.createSpy('myStub'); // can be used anywhere // spy example var foo = { not: function(bool) { return !bool; } } // actual foo.not will not be called, execution stops spyOn(foo, 'not');
// foo.not spied upon, execution will continue to implementation spyOn(foo, 'not').andCallThrough(); // fake example var foo = { not: function(bool) { return !bool; } } // foo.not(val) will return val spyOn(foo, 'not').andCallFake(function(value) {return value;}); // mock example foo.not(7 == 7); expect(foo.not).wasCalled(); expect(foo.not).wasCalledWith(true);</pre>
@ -506,12 +475,7 @@ expect(foo.not).wasCalledWith(true);</pre>
<pre class="code">var mySpy = jasmine.createSpy('foo');
mySpy(1, 2);
mySpy(7, 8);
mySpy.mostRecentCall.args = [7, 8];
mySpy.argsForCall[0] = [1, 2];
mySpy.argsForCall[1] = [7, 8];</pre>
<pre class="code">var mySpy = jasmine.createSpy('foo'); mySpy(1, 2); mySpy(7, 8); mySpy.mostRecentCall.args = [7, 8]; mySpy.argsForCall[0] = [1, 2]; mySpy.argsForCall[1] = [7, 8];</pre>
@ -581,9 +545,7 @@ mySpy.argsForCall[1] = [7, 8];</pre>
<pre class="code">var mySpy = jasmine.createSpy('foo');
mySpy(1, 2);
mySpy.mostRecentCall.args = [1, 2];</pre>
<pre class="code">var mySpy = jasmine.createSpy('foo'); mySpy(1, 2); mySpy.mostRecentCall.args = [1, 2];</pre>
@ -617,14 +579,7 @@ mySpy.mostRecentCall.args = [1, 2];</pre>
<pre class="code">var baz = function() {
// do some stuff, return something
}
// defining a spy from scratch: foo() calls the function baz
var foo = jasmine.createSpy('spy on foo').andCall(baz);
// defining a spy on an existing property: foo.bar() calls an anonymnous function
spyOn(foo, 'bar').andCall(function() { return 'baz';} );</pre>
<pre class="code">var baz = function() { // do some stuff, return something } // defining a spy from scratch: foo() calls the function baz var foo = jasmine.createSpy('spy on foo').andCall(baz); // defining a spy on an existing property: foo.bar() calls an anonymnous function spyOn(foo, 'bar').andCall(function() { return 'baz';} );</pre>
@ -664,12 +619,7 @@ spyOn(foo, 'bar').andCall(function() { return 'baz';} );</pre>
<pre class="code">var foo = {
bar: function() { // do some stuff }
}
// defining a spy on an existing property: foo.bar
spyOn(foo, 'bar').andCallThrough();</pre>
<pre class="code">var foo = { bar: function() { // do some stuff } } // defining a spy on an existing property: foo.bar spyOn(foo, 'bar').andCallThrough();</pre>
@ -698,11 +648,7 @@ spyOn(foo, 'bar').andCallThrough();</pre>
<pre class="code">// defining a spy from scratch: foo() returns 'baz'
var foo = jasmine.createSpy('spy on foo').andReturn('baz');
// defining a spy on an existing property: foo.bar() returns 'baz'
spyOn(foo, 'bar').andReturn('baz');</pre>
<pre class="code">// defining a spy from scratch: foo() returns 'baz' var foo = jasmine.createSpy('spy on foo').andReturn('baz'); // defining a spy on an existing property: foo.bar() returns 'baz' spyOn(foo, 'bar').andReturn('baz');</pre>
@ -742,11 +688,7 @@ spyOn(foo, 'bar').andReturn('baz');</pre>
<pre class="code">// defining a spy from scratch: foo() throws an exception w/ message 'ouch'
var foo = jasmine.createSpy('spy on foo').andThrow('baz');
// defining a spy on an existing property: foo.bar() throws an exception w/ message 'ouch'
spyOn(foo, 'bar').andThrow('baz');</pre>
<pre class="code">// defining a spy from scratch: foo() throws an exception w/ message 'ouch' var foo = jasmine.createSpy('spy on foo').andThrow('baz'); // defining a spy on an existing property: foo.bar() throws an exception w/ message 'ouch' spyOn(foo, 'bar').andThrow('baz');</pre>
@ -811,15 +753,7 @@ spyOn(foo, 'bar').andThrow('baz');</pre>
<pre class="code">spyOn(foo, 'bar');
foo.bar();
expect(foo.bar.callCount).toEqual(1);
foo.bar.reset();
expect(foo.bar.callCount).toEqual(0);</pre>
<pre class="code">spyOn(foo, 'bar'); foo.bar(); expect(foo.bar.callCount).toEqual(1); foo.bar.reset(); expect(foo.bar.callCount).toEqual(0);</pre>
@ -845,7 +779,7 @@ expect(foo.bar.callCount).toEqual(0);</pre>
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:58 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.Suite.html
View File

@ -436,7 +436,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:58 GMT-0700 (PDT)
</div>
</body>
</html>

14
doc/symbols/jasmine.html
View File

@ -339,8 +339,7 @@ ul.inheritsList
<td class="nameDescription">
<div class="fixedFont">jasmine.<b><a href="../symbols/jasmine.html#.include">include</a></b>(url, opt_global)
</div>
<div class="description">Adds suite files to an HTML document so that they are executed, thus adding them to the current
Jasmine environment.</div>
<div class="description">Adds suite files to an HTML document so that they are executed, thus adding them to the current Jasmine environment.</div>
</td>
</tr>
@ -461,8 +460,7 @@ Jasmine environment.</div>
<pre class="code">// don't care about which function is passed in, as long as it's a function
expect(mySpy).wasCalledWith(jasmine.any(Function));</pre>
<pre class="code">// don't care about which function is passed in, as long as it's a function expect(mySpy).wasCalledWith(jasmine.any(Function));</pre>
@ -502,8 +500,7 @@ expect(mySpy).wasCalledWith(jasmine.any(Function));</pre>
</div>
<div class="description">
Creates a more complicated spy: an Object that has every property a function that is a spy. Used for stubbing something
large in one call.
Creates a more complicated spy: an Object that has every property a function that is a spy. Used for stubbing something large in one call.
</div>
@ -570,8 +567,7 @@ large in one call.
</div>
<div class="description">
Adds suite files to an HTML document so that they are executed, thus adding them to the current
Jasmine environment.
Adds suite files to an HTML document so that they are executed, thus adding them to the current Jasmine environment.
</div>
@ -728,7 +724,7 @@ Jasmine environment.
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:57 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.util.html
View File

@ -316,7 +316,7 @@ ul.inheritsList
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:25:31 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Wed Oct 21 2009 09:32:58 GMT-0700 (PDT)
</div>
</body>
</html>

4406
doc/symbols/src/lib_jasmine-0.10.0.js.html
View File

File diff suppressed because it is too large Load Diff

62
lib/jasmine-0.10.0.js
View File

@ -530,7 +530,7 @@ jasmine.version_= {
"major": 0,
"minor": 10,
"build": 0,
"revision": 1256142331
"revision": 1256142778
};
/**
* @namespace
@ -978,11 +978,6 @@ jasmine.Matchers.pp = function(str) {
return jasmine.util.htmlEscape(jasmine.pp(str));
};
/** @deprecated */
jasmine.Matchers.prototype.getResults = function() {
return this.results_;
};
jasmine.Matchers.prototype.results = function() {
return this.results_;
};
@ -1039,8 +1034,6 @@ jasmine.Matchers.prototype.toEqual = function(expected) {
matcherName: 'toEqual', expected: expected, actual: this.actual
});
};
/** @deprecated */
jasmine.Matchers.prototype.should_equal = jasmine.Matchers.prototype.toEqual;
/**
* Matcher that compares the actual to the expected using the ! of jasmine.Matchers.toEqual
@ -1050,8 +1043,6 @@ jasmine.Matchers.prototype.toNotEqual = function(expected) {
return this.report(!this.env.equals_(this.actual, expected),
'Expected ' + jasmine.Matchers.pp(expected) + ' to not equal ' + jasmine.Matchers.pp(this.actual) + ', but it does.');
};
/** @deprecated */
jasmine.Matchers.prototype.should_not_equal = jasmine.Matchers.prototype.toNotEqual;
/**
* Matcher that compares the actual to the expected using a regular expression. Constructs a RegExp, so takes
@ -1063,8 +1054,6 @@ jasmine.Matchers.prototype.toMatch = function(reg_exp) {
return this.report((new RegExp(reg_exp).test(this.actual)),
'Expected ' + jasmine.Matchers.pp(this.actual) + ' to match ' + reg_exp + '.');
};
/** @deprecated */
jasmine.Matchers.prototype.should_match = jasmine.Matchers.prototype.toMatch;
/**
* Matcher that compares the actual to the expected using the boolean inverse of jasmine.Matchers.toMatch
@ -1074,8 +1063,6 @@ jasmine.Matchers.prototype.toNotMatch = function(reg_exp) {
return this.report((!new RegExp(reg_exp).test(this.actual)),
'Expected ' + jasmine.Matchers.pp(this.actual) + ' to not match ' + reg_exp + '.');
};
/** @deprecated */
jasmine.Matchers.prototype.should_not_match = jasmine.Matchers.prototype.toNotMatch;
/**
* Matcher that compares the acutal to undefined.
@ -1084,8 +1071,6 @@ jasmine.Matchers.prototype.toBeDefined = function() {
return this.report((this.actual !== undefined),
'Expected a value to be defined but it was undefined.');
};
/** @deprecated */
jasmine.Matchers.prototype.should_be_defined = jasmine.Matchers.prototype.toBeDefined;
/**
* Matcher that compares the actual to null.
@ -1095,8 +1080,6 @@ jasmine.Matchers.prototype.toBeNull = function() {
return this.report((this.actual === null),
'Expected a value to be null but it was ' + jasmine.Matchers.pp(this.actual) + '.');
};
/** @deprecated */
jasmine.Matchers.prototype.should_be_null = jasmine.Matchers.prototype.toBeNull;
/**
* Matcher that boolean not-nots the actual.
@ -1105,8 +1088,6 @@ jasmine.Matchers.prototype.toBeTruthy = function() {
return this.report(!!this.actual,
'Expected a value to be truthy but it was ' + jasmine.Matchers.pp(this.actual) + '.');
};
/** @deprecated */
jasmine.Matchers.prototype.should_be_truthy = jasmine.Matchers.prototype.toBeTruthy;
/**
* Matcher that boolean nots the actual.
@ -1115,8 +1096,6 @@ jasmine.Matchers.prototype.toBeFalsy = function() {
return this.report(!this.actual,
'Expected a value to be falsy but it was ' + jasmine.Matchers.pp(this.actual) + '.');
};
/** @deprecated */
jasmine.Matchers.prototype.should_be_falsy = jasmine.Matchers.prototype.toBeFalsy;
/**
* Matcher that checks to see if the acutal, a Jasmine spy, was called.
@ -1131,8 +1110,6 @@ jasmine.Matchers.prototype.wasCalled = function() {
return this.report((this.actual.wasCalled),
'Expected spy "' + this.actual.identity + '" to have been called, but it was not.');
};
/** @deprecated */
jasmine.Matchers.prototype.was_called = jasmine.Matchers.prototype.wasCalled;
/**
* Matcher that checks to see if the acutal, a Jasmine spy, was not called.
@ -1144,8 +1121,6 @@ jasmine.Matchers.prototype.wasNotCalled = function() {
return this.report((!this.actual.wasCalled),
'Expected spy "' + this.actual.identity + '" to not have been called, but it was.');
};
/** @deprecated */
jasmine.Matchers.prototype.was_not_called = jasmine.Matchers.prototype.wasNotCalled;
/**
* Matcher that checks to see if the acutal, a Jasmine spy, was called with a set of parameters.
@ -1627,6 +1602,7 @@ jasmine.Runner = function(env) {
jasmine.Runner.prototype.execute = function() {
var self = this;
if (self.env.reporter.reportRunnerStarting) {
self.env.currentlyRunningTests = true;
self.env.reporter.reportRunnerStarting(this);
}
self.queue.start(function () {
@ -1646,6 +1622,7 @@ jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
jasmine.Runner.prototype.finishCallback = function() {
this.env.currentlyRunningTests = true;
this.env.reporter.reportRunnerResults(this);
};
@ -1660,11 +1637,6 @@ jasmine.Runner.prototype.add = function(block) {
this.queue.add(block);
};
/** @deprecated */
jasmine.Runner.prototype.getAllSuites = function() {
return this.suites_;
};
jasmine.Runner.prototype.specs = function () {
var suites = this.suites();
var specs = [];
@ -1682,11 +1654,6 @@ jasmine.Runner.prototype.suites = function() {
jasmine.Runner.prototype.results = function() {
return this.queue.results();
};
/** @deprecated */
jasmine.Runner.prototype.getResults = function() {
return this.queue.results();
};
/**
* Internal representation of a Jasmine specification, or test.
*
@ -1732,11 +1699,6 @@ jasmine.Spec.prototype.log = function(message) {
return this.results_.log(message);
};
/** @deprecated */
jasmine.Spec.prototype.getResults = function() {
return this.results_;
};
jasmine.Spec.prototype.runs = function (func) {
var block = new jasmine.Block(this.env, func, this);
this.addToQueue(block);
@ -1751,14 +1713,6 @@ jasmine.Spec.prototype.addToQueue = function (block) {
}
};
/**
* @private
* @deprecated
*/
jasmine.Spec.prototype.expects_that = function(actual) {
return this.expect(actual);
};
jasmine.Spec.prototype.expect = function(actual) {
return new (this.getMatchersClass_())(this.env, actual, this.results_);
};
@ -1943,11 +1897,6 @@ jasmine.Suite.prototype.afterEach = function(afterEachFunction) {
this.after_.push(afterEachFunction);
};
/** @deprecated */
jasmine.Suite.prototype.getResults = function() {
return this.queue.results();
};
jasmine.Suite.prototype.results = function() {
return this.queue.results();
};
@ -1961,11 +1910,6 @@ jasmine.Suite.prototype.add = function(block) {
this.queue.add(block);
};
/** @deprecated */
jasmine.Suite.prototype.specCount = function() {
return this.specs_.length;
};
jasmine.Suite.prototype.specs = function() {
return this.specs_;
};

4
src/Runner.js
View File

@ -16,6 +16,7 @@ jasmine.Runner = function(env) {
jasmine.Runner.prototype.execute = function() {
var self = this;
if (self.env.reporter.reportRunnerStarting) {
self.env.currentlyRunningTests = true;
self.env.reporter.reportRunnerStarting(this);
}
self.queue.start(function () {
@ -35,6 +36,7 @@ jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
jasmine.Runner.prototype.finishCallback = function() {
this.env.currentlyRunningTests = true;
this.env.reporter.reportRunnerResults(this);
};
@ -65,4 +67,4 @@ jasmine.Runner.prototype.suites = function() {
jasmine.Runner.prototype.results = function() {
return this.queue.results();
};
};