diff --git a/doc/files.html b/doc/files.html index 3728f1aa..4ce1733c 100644 --- a/doc/files.html +++ b/doc/files.html @@ -258,7 +258,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:38 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
\ No newline at end of file diff --git a/doc/index.html b/doc/index.html index c6e5b21d..9aa814fc 100644 --- a/doc/index.html +++ b/doc/index.html @@ -300,7 +300,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:38 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
\ No newline at end of file diff --git a/doc/symbols/_global_.html b/doc/symbols/_global_.html index 453a388f..663deb5d 100644 --- a/doc/symbols/_global_.html +++ b/doc/symbols/_global_.html @@ -908,7 +908,7 @@ A convenience method that allows existing specs to be disabled temporarily durin
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Block.html b/doc/symbols/jasmine.Block.html index 037b9989..0577d1ff 100644 --- a/doc/symbols/jasmine.Block.html +++ b/doc/symbols/jasmine.Block.html @@ -339,7 +339,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Env.html b/doc/symbols/jasmine.Env.html index 800315fa..b62d29ce 100644 --- a/doc/symbols/jasmine.Env.html +++ b/doc/symbols/jasmine.Env.html @@ -384,7 +384,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.JsApiReporter.html b/doc/symbols/jasmine.JsApiReporter.html index c94cbbd6..ff550f85 100644 --- a/doc/symbols/jasmine.JsApiReporter.html +++ b/doc/symbols/jasmine.JsApiReporter.html @@ -316,7 +316,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.MultiReporter.html b/doc/symbols/jasmine.MultiReporter.html index efd47196..c8ed7002 100644 --- a/doc/symbols/jasmine.MultiReporter.html +++ b/doc/symbols/jasmine.MultiReporter.html @@ -316,7 +316,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.NestedResults.html b/doc/symbols/jasmine.NestedResults.html index 23eb3d23..96a0b906 100644 --- a/doc/symbols/jasmine.NestedResults.html +++ b/doc/symbols/jasmine.NestedResults.html @@ -700,7 +700,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Reporter.html b/doc/symbols/jasmine.Reporter.html index cb528739..b18f1690 100644 --- a/doc/symbols/jasmine.Reporter.html +++ b/doc/symbols/jasmine.Reporter.html @@ -316,7 +316,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Runner.html b/doc/symbols/jasmine.Runner.html index 1df5807e..44c71099 100644 --- a/doc/symbols/jasmine.Runner.html +++ b/doc/symbols/jasmine.Runner.html @@ -327,7 +327,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Spec.html b/doc/symbols/jasmine.Spec.html index 3bfc98e3..a5d5ade1 100644 --- a/doc/symbols/jasmine.Spec.html +++ b/doc/symbols/jasmine.Spec.html @@ -339,7 +339,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Spy.html b/doc/symbols/jasmine.Spy.html index 54ceff66..94f30399 100644 --- a/doc/symbols/jasmine.Spy.html +++ b/doc/symbols/jasmine.Spy.html @@ -845,7 +845,7 @@ expect(foo.bar.callCount).toEqual(0);
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:38 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Suite.html b/doc/symbols/jasmine.Suite.html index f68c85a5..ada2fd66 100644 --- a/doc/symbols/jasmine.Suite.html +++ b/doc/symbols/jasmine.Suite.html @@ -345,7 +345,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:38 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.html b/doc/symbols/jasmine.html index b7561b9b..2f38ceec 100644 --- a/doc/symbols/jasmine.html +++ b/doc/symbols/jasmine.html @@ -678,7 +678,7 @@ Jasmine environment.
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:37 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.util.html b/doc/symbols/jasmine.util.html index dd8eb69f..508d2efa 100644 --- a/doc/symbols/jasmine.util.html +++ b/doc/symbols/jasmine.util.html @@ -316,7 +316,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:24:38 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Wed Sep 02 2009 07:41:14 GMT-0700 (PDT)
diff --git a/doc/symbols/src/lib_TrivialReporter.js.html b/doc/symbols/src/lib_TrivialReporter.js.html index 3f234ed7..11b1124d 100644 --- a/doc/symbols/src/lib_TrivialReporter.js.html +++ b/doc/symbols/src/lib_TrivialReporter.js.html @@ -35,7 +35,7 @@ 28 }; 29 30 jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) { - 31 var suites = runner.getAllSuites(); + 31 var suites = runner.suites(); 32 33 this.runnerDiv = this.createDom('div', { className: 'runner running' }, "Running..."); 34 this.document.body.appendChild(this.runnerDiv); diff --git a/doc/symbols/src/lib_jasmine-0.9.0.js.html b/doc/symbols/src/lib_jasmine-0.9.0.js.html index 5efc6d83..e76c5a46 100644 --- a/doc/symbols/src/lib_jasmine-0.9.0.js.html +++ b/doc/symbols/src/lib_jasmine-0.9.0.js.html @@ -524,7 +524,7 @@ 517 "major": 0, 518 "minor": 9, 519 "build": 0, -520 "revision": 1251901364 +520 "revision": 1251901478 521 }; 522 /** 523 * @namespace @@ -1758,7 +1758,7 @@ 1751 self.env = env; 1752 self.beforeQueue = []; 1753 self.afterQueue = []; -1754 self.specs = []; +1754 self.specs_ = []; 1755 }; 1756 1757 jasmine.Suite.prototype.getFullName = function() { @@ -1795,17 +1795,17 @@ 1788 if (block instanceof jasmine.Suite) { 1789 this.env.currentRunner.addSuite(block); 1790 } else { -1791 this.specs.push(block); +1791 this.specs_.push(block); 1792 } 1793 this.queue.add(block); 1794 }; 1795 1796 jasmine.Suite.prototype.specCount = function() { -1797 return this.specs.length; +1797 return this.specs_.length; 1798 }; 1799 1800 jasmine.Suite.prototype.specs = function() { -1801 return this.specs; +1801 return this.specs_; 1802 }; 1803 1804 jasmine.Suite.prototype.execute = function(onComplete) { diff --git a/lib/TrivialReporter.js b/lib/TrivialReporter.js index ff8cdbf0..ed9ec808 100644 --- a/lib/TrivialReporter.js +++ b/lib/TrivialReporter.js @@ -28,7 +28,7 @@ jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarA }; jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) { - var suites = runner.getAllSuites(); + var suites = runner.suites(); this.runnerDiv = this.createDom('div', { className: 'runner running' }, "Running..."); this.document.body.appendChild(this.runnerDiv); diff --git a/lib/jasmine-0.9.0.js b/lib/jasmine-0.9.0.js index 07f1a791..9017c45e 100644 --- a/lib/jasmine-0.9.0.js +++ b/lib/jasmine-0.9.0.js @@ -517,7 +517,7 @@ jasmine.version_= { "major": 0, "minor": 9, "build": 0, - "revision": 1251901478 + "revision": 1251902474 }; /** * @namespace @@ -839,7 +839,7 @@ jasmine.JsApiReporter = function() { jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) { this.started = true; - var suites = runner.getAllSuites(); + var suites = runner.suites(); for (var i = 0; i < suites.length; i++) { var suite = suites[i]; this.suites.push(this.summarize_(suite)); @@ -1508,7 +1508,7 @@ jasmine.Runner = function(env) { var self = this; self.env = env; self.queue = new jasmine.Queue(env); - self.suites = []; + self.suites_ = []; }; jasmine.Runner.prototype.execute = function() { @@ -1526,7 +1526,7 @@ jasmine.Runner.prototype.finishCallback = function() { }; jasmine.Runner.prototype.addSuite = function(suite) { - this.suites.push(suite); + this.suites_.push(suite); }; jasmine.Runner.prototype.add = function(block) { @@ -1536,9 +1536,14 @@ jasmine.Runner.prototype.add = function(block) { this.queue.add(block); }; - +/** @deprecated */ jasmine.Runner.prototype.getAllSuites = function() { - return this.suites; + return this.suites_; +}; + + +jasmine.Runner.prototype.suites = function() { + return this.suites_; }; jasmine.Runner.prototype.getResults = function() { @@ -1793,6 +1798,7 @@ jasmine.Suite.prototype.add = function(block) { this.queue.add(block); }; +/** @deprecated */ jasmine.Suite.prototype.specCount = function() { return this.specs_.length; }; diff --git a/spec/suites/RunnerSpec.js b/spec/suites/RunnerSpec.js index 8a01492b..c2404eaa 100644 --- a/spec/suites/RunnerSpec.js +++ b/spec/suites/RunnerSpec.js @@ -153,7 +153,7 @@ describe('RunnerTest', function() { document.runner = env.currentRunner; - var suites = env.currentRunner.getAllSuites(); + var suites = env.currentRunner.suites(); var suiteDescriptions = []; for (var i = 0; i < suites.length; i++) { suiteDescriptions.push(suites[i].getFullName()); diff --git a/spec/suites/SuiteSpec.js b/spec/suites/SuiteSpec.js index 17698699..58e2d48c 100644 --- a/spec/suites/SuiteSpec.js +++ b/spec/suites/SuiteSpec.js @@ -49,7 +49,7 @@ describe('Suite', function() { describe('SpecCount', function () { it('should keep a count of the number of specs that are run', function() { - env.describe('one suite description', function () { + var suite = env.describe('one suite description', function () { env.it('should be a test', function() { this.runs(function () { this.expect(true).toEqual(true); @@ -67,12 +67,11 @@ describe('Suite', function() { }); }); - var suite = env.currentRunner.suites[0]; expect(suite.specCount()).toEqual(3); }); it('specCount should be correct even with runs/waits blocks', function() { - env.describe('one suite description', function () { + var suite = env.describe('one suite description', function () { env.it('should be a test', function() { this.runs(function () { this.expect(true).toEqual(true); @@ -94,7 +93,6 @@ describe('Suite', function() { }); }); - var suite = env.currentRunner.suites[0]; expect(suite.specCount()).toEqual(3); }); }); diff --git a/spec/suites/TrivialReporterSpec.js b/spec/suites/TrivialReporterSpec.js index 0ee96c1e..24b3a9bd 100644 --- a/spec/suites/TrivialReporterSpec.js +++ b/spec/suites/TrivialReporterSpec.js @@ -22,7 +22,7 @@ describe("TrivialReporter", function() { it("should display empty divs for every suite when the runner is starting", function() { trivialReporter = new jasmine.TrivialReporter({ body: body }); trivialReporter.reportRunnerStarting({ - getAllSuites: function() { + suites: function() { return [ new jasmine.Suite({}, "suite 1", null, null) ]; } }); diff --git a/src/JsApiReporter.js b/src/JsApiReporter.js index 081bec51..b5bcafcf 100644 --- a/src/JsApiReporter.js +++ b/src/JsApiReporter.js @@ -11,7 +11,7 @@ jasmine.JsApiReporter = function() { jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) { this.started = true; - var suites = runner.getAllSuites(); + var suites = runner.suites(); for (var i = 0; i < suites.length; i++) { var suite = suites[i]; this.suites.push(this.summarize_(suite)); diff --git a/src/Runner.js b/src/Runner.js index 01aecb7c..8dc28c15 100644 --- a/src/Runner.js +++ b/src/Runner.js @@ -8,7 +8,7 @@ jasmine.Runner = function(env) { var self = this; self.env = env; self.queue = new jasmine.Queue(env); - self.suites = []; + self.suites_ = []; }; jasmine.Runner.prototype.execute = function() { @@ -26,7 +26,7 @@ jasmine.Runner.prototype.finishCallback = function() { }; jasmine.Runner.prototype.addSuite = function(suite) { - this.suites.push(suite); + this.suites_.push(suite); }; jasmine.Runner.prototype.add = function(block) { @@ -36,9 +36,14 @@ jasmine.Runner.prototype.add = function(block) { this.queue.add(block); }; - +/** @deprecated */ jasmine.Runner.prototype.getAllSuites = function() { - return this.suites; + return this.suites_; +}; + + +jasmine.Runner.prototype.suites = function() { + return this.suites_; }; jasmine.Runner.prototype.getResults = function() { diff --git a/src/Suite.js b/src/Suite.js index 57f56586..d60ee814 100644 --- a/src/Suite.js +++ b/src/Suite.js @@ -58,6 +58,7 @@ jasmine.Suite.prototype.add = function(block) { this.queue.add(block); }; +/** @deprecated */ jasmine.Suite.prototype.specCount = function() { return this.specs_.length; };