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

Removed jasmine.env.currentlyRunningTests, use reporter to determine if jasmine is running

Browse Source
This commit is contained in:
ragaskar 2009-10-24 17:01:40 -07:00
parent b35a2acfc8
commit 2059422955
20 changed files with 1523 additions and 1831 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:32:58 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 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:32:58 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/_global_.html
View File

@ -885,7 +885,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:32:57 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 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:32:57 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 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:32:57 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 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:32:57 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 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:32:57 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 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:32:57 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 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:32:57 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 GMT-0700 (PDT)
</div>
</body>
</html>

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

@ -267,42 +267,6 @@ ul.inheritsList
<!-- ============================== methods summary ======================== -->
<table class="summaryTable" cellspacing="0" summary="A summary of the methods documented in the class jasmine.Runner.">
<caption>Method Summary</caption>
<thead>
<tr>
<th scope="col">Method Attributes</th>
<th scope="col">Method Name and Description</th>
</tr>
</thead>
<tbody>
<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
<div class="fixedFont"><b><a href="../symbols/jasmine.Runner.html#getAllSuites">getAllSuites</a></b>()
</div>
<div class="description"></div>
</td>
</tr>
<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
<div class="fixedFont"><b><a href="../symbols/jasmine.Runner.html#getResults">getResults</a></b>()
</div>
<div class="description"></div>
</td>
</tr>
</tbody>
</table>
<!-- ============================== events summary ======================== -->
@ -352,61 +316,6 @@ ul.inheritsList
<!-- ============================== method details ========================= -->
<div class="sectionTitle">
Method Detail
</div>
<a name="getAllSuites"> </a>
<div class="fixedFont">
<b>getAllSuites</b>()
</div>
<div class="description">
</div>
<hr />
<a name="getResults"> </a>
<div class="fixedFont">
<b>getResults</b>()
</div>
<div class="description">
</div>
<!-- ============================== event details ========================= -->
@ -418,7 +327,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:32:57 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 GMT-0700 (PDT)
</div>
</body>
</html>

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

@ -267,33 +267,6 @@ ul.inheritsList
<!-- ============================== methods summary ======================== -->
<table class="summaryTable" cellspacing="0" summary="A summary of the methods documented in the class jasmine.Spec.">
<caption>Method Summary</caption>
<thead>
<tr>
<th scope="col">Method Attributes</th>
<th scope="col">Method Name and Description</th>
</tr>
</thead>
<tbody>
<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
<div class="fixedFont"><b><a href="../symbols/jasmine.Spec.html#getResults">getResults</a></b>()
</div>
<div class="description"></div>
</td>
</tr>
</tbody>
</table>
<!-- ============================== events summary ======================== -->
@ -355,36 +328,6 @@ ul.inheritsList
<!-- ============================== method details ========================= -->
<div class="sectionTitle">
Method Detail
</div>
<a name="getResults"> </a>
<div class="fixedFont">
<b>getResults</b>()
</div>
<div class="description">
</div>
<!-- ============================== event details ========================= -->
@ -396,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:32:58 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 GMT-0700 (PDT)
</div>
</body>
</html>

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

@ -779,7 +779,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:32:58 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 GMT-0700 (PDT)
</div>
</body>
</html>

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

@ -267,42 +267,6 @@ ul.inheritsList
<!-- ============================== methods summary ======================== -->
<table class="summaryTable" cellspacing="0" summary="A summary of the methods documented in the class jasmine.Suite.">
<caption>Method Summary</caption>
<thead>
<tr>
<th scope="col">Method Attributes</th>
<th scope="col">Method Name and Description</th>
</tr>
</thead>
<tbody>
<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
<div class="fixedFont"><b><a href="../symbols/jasmine.Suite.html#getResults">getResults</a></b>()
</div>
<div class="description"></div>
</td>
</tr>
<tr>
<td class="attributes">&nbsp;</td>
<td class="nameDescription">
<div class="fixedFont"><b><a href="../symbols/jasmine.Suite.html#specCount">specCount</a></b>()
</div>
<div class="description"></div>
</td>
</tr>
</tbody>
</table>
<!-- ============================== events summary ======================== -->
@ -370,61 +334,6 @@ ul.inheritsList
<!-- ============================== method details ========================= -->
<div class="sectionTitle">
Method Detail
</div>
<a name="getResults"> </a>
<div class="fixedFont">
<b>getResults</b>()
</div>
<div class="description">
</div>
<hr />
<a name="specCount"> </a>
<div class="fixedFont">
<b>specCount</b>()
</div>
<div class="description">
</div>
<!-- ============================== event details ========================= -->
@ -436,7 +345,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:32:58 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 GMT-0700 (PDT)
</div>
</body>
</html>

2
doc/symbols/jasmine.html
View File

@ -724,7 +724,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:32:57 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 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:32:58 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Sat Oct 24 2009 17:00:43 GMT-0700 (PDT)
</div>
</body>
</html>

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

File diff suppressed because it is too large Load Diff

7
lib/jasmine-0.10.0.js
View File

@ -530,7 +530,7 @@ jasmine.version_= {
"major": 0,
"minor": 10,
"build": 0,
"revision": 1256142778
"revision": 1256428843
};
/**
* @namespace
@ -600,7 +600,6 @@ jasmine.Env = function() {
this.currentSpec = null;
this.currentSuite = null;
this.currentRunner_ = new jasmine.Runner(this);
this.currentlyRunningTests = false;
this.reporter = new jasmine.MultiReporter();
@ -1602,7 +1601,6 @@ 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 () {
@ -1622,7 +1620,6 @@ jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
jasmine.Runner.prototype.finishCallback = function() {
this.env.currentlyRunningTests = true;
this.env.reporter.reportRunnerResults(this);
};
@ -1780,14 +1777,12 @@ jasmine.Spec.prototype.execute = function(onComplete) {
this.env.reporter.log('>> Jasmine Running ' + this.suite.description + ' ' + this.description + '...');
spec.env.currentSpec = spec;
spec.env.currentlyRunningTests = true;
spec.addBeforesAndAftersToQueue();
spec.queue.start(function () {
spec.finish(onComplete);
});
spec.env.currentlyRunningTests = false;
};
jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() {

1
src/Env.js
View File

@ -7,7 +7,6 @@ jasmine.Env = function() {
this.currentSpec = null;
this.currentSuite = null;
this.currentRunner_ = new jasmine.Runner(this);
this.currentlyRunningTests = false;
this.reporter = new jasmine.MultiReporter();

2
src/Runner.js
View File

@ -16,7 +16,6 @@ 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 () {
@ -36,7 +35,6 @@ jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
jasmine.Runner.prototype.finishCallback = function() {
this.env.currentlyRunningTests = true;
this.env.reporter.reportRunnerResults(this);
};

2
src/Spec.js
View File

@ -124,14 +124,12 @@ jasmine.Spec.prototype.execute = function(onComplete) {
this.env.reporter.log('>> Jasmine Running ' + this.suite.description + ' ' + this.description + '...');
spec.env.currentSpec = spec;
spec.env.currentlyRunningTests = true;
spec.addBeforesAndAftersToQueue();
spec.queue.start(function () {
spec.finish(onComplete);
});
spec.env.currentlyRunningTests = false;
};
jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() {