JsApiReporter reports nested suites correctly.

Runner#topLevelSuites() returns only top level suites.
Suite#specs(), Suite#suites(), and Suite#children() return immediate children.

lib/TrivialReporter.js

@@ -28,8 +28,6 @@ jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarA
 };
 
 jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
-  var suites = runner.suites();
-
   var showPassed, showSkipped;
 
   this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' },
@@ -54,6 +52,7 @@ jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
 
   this.document.body.appendChild(this.outerDiv);
 
+  var suites = runner.suites();
   for (var i = 0; i < suites.length; i++) {
     var suite = suites[i];
     var suiteDiv = this.createDom('div', { className: 'suite' },

lib/jasmine-0.10.4.js

@@ -976,7 +976,7 @@ jasmine.JsApiReporter = function() {
 
 jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) {
   this.started = true;
-  var suites = runner.suites();
+  var suites = runner.topLevelSuites();
   for (var i = 0; i < suites.length; i++) {
     var suite = suites[i];
     this.suites_.push(this.summarize_(suite));
@@ -995,10 +995,11 @@ jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) {
     type: isSuite ? 'suite' : 'spec',
     children: []
   };
+  
   if (isSuite) {
-    var specs = suiteOrSpec.specs();
+    var children = suiteOrSpec.children();
-    for (var i = 0; i < specs.length; i++) {
+    for (var i = 0; i < children.length; i++) {
-      summary.children.push(this.summarize_(specs[i]));
+      summary.children.push(this.summarize_(children[i]));
     }
   }
   return summary;
@@ -1829,11 +1830,20 @@ jasmine.Runner.prototype.specs = function () {
   return specs;
 };
 
-
 jasmine.Runner.prototype.suites = function() {
   return this.suites_;
 };
 
+jasmine.Runner.prototype.topLevelSuites = function() {
+  var topLevelSuites = [];
+  for (var i = 0; i < this.suites_.length; i++) {
+    if (!this.suites_[i].parentSuite) {
+      topLevelSuites.push(this.suites_[i]);
+    }
+  }
+  return topLevelSuites;
+};
+
 jasmine.Runner.prototype.results = function() {
   return this.queue.results();
 };
@@ -2061,6 +2071,8 @@ jasmine.Suite = function(env, description, specDefinitions, parentSuite) {
   self.env = env;
   self.before_ = [];
   self.after_ = [];
+  self.children_ = [];
+  self.suites_ = [];
   self.specs_ = [];
 };
 
@@ -2095,7 +2107,9 @@ jasmine.Suite.prototype.results = function() {
 };
 
 jasmine.Suite.prototype.add = function(block) {
+  this.children_.push(block);
   if (block instanceof jasmine.Suite) {
+    this.suites_.push(block);
     this.env.currentRunner().addSuite(block);
   } else {
     this.specs_.push(block);
@@ -2107,6 +2121,14 @@ jasmine.Suite.prototype.specs = function() {
   return this.specs_;
 };
 
+jasmine.Suite.prototype.suites = function() {
+  return this.suites_;
+};
+
+jasmine.Suite.prototype.children = function() {
+  return this.children_;
+};
+
 jasmine.Suite.prototype.execute = function(onComplete) {
   var self = this;
   this.queue.start(function () {
@@ -2345,5 +2367,5 @@ jasmine.version_= {
   "major": 0,
   "minor": 10,
   "build": 4,
-  "revision": 1275748595
+  "revision": 1277227072
   };

spec/suites/JsApiReporterSpec.js

@@ -3,55 +3,69 @@ describe('jasmine.jsApiReporter', function() {
 
   describe('results', function () {
     var reporter, spec1, spec2, spec3, expectedSpec1Results, expectedSpec2Results;
+    var env;
+    var suite, nestedSuite, nestedSpec;
 
     beforeEach(function() {
-      var env = new jasmine.Env();
+      env = new jasmine.Env();
       env.updateInterval = 0;
-      var suite = new jasmine.Suite(env);
-      spec1 = new jasmine.Spec(env, suite, 'spec 1');
-      spec1.runs(function () {
-        this.expect(true).toEqual(true);
-      });
-      expectedSpec1Results = {
-        messages: spec1.results().getItems(),
-        result: "passed"
-      };
-      spec2 = new jasmine.Spec(env, suite, 'spec 2');
-      spec2.runs(function () {
-        this.expect(true).toEqual(false);
-      });
-      expectedSpec2Results = {
-        messages: spec2.results().getItems(),
-        result: "failed"
-      };
 
-      spec3 = new jasmine.Spec(env, suite, 'spec 3');
+      suite = env.describe("top-level suite", function() {
-      spec3.runs(function () {
+        spec1 = env.it("spec 1", function() {
-        this.log('some debug message')
+          this.expect(true).toEqual(true);
-      });
 
-      spec1.execute();
+        });
-      spec2.execute();
+
-      spec3.execute();
+        spec2 = env.it("spec 2", function() {
+          this.expect(true).toEqual(false);
+        });
+
+        nestedSuite = env.describe("nested suite", function() {
+          nestedSpec = env.it("nested spec", function() {
+            expect(true).toEqual(true);
+          })
+        });
+
+        spec3 = env.it("spec 3", function() {
+          this.log('some debug message');
+        });
+      });
 
       reporter = new jasmine.JsApiReporter();
-      reporter.reportSpecResults(spec1);
+      env.addReporter(reporter);
-      reporter.reportSpecResults(spec2);
+
-      reporter.reportSpecResults(spec3);
+      env.execute();
     });
 
-    it('resultForSpec() should return the result for the given spec', function () {
+    xit('resultForSpec() should return the result for the given spec', function () {
       expect(reporter.resultsForSpec(spec1.id)).toEqual(expectedSpec1Results);
       expect(reporter.resultsForSpec(spec2.id)).toEqual(expectedSpec2Results);
 
     });
 
-    it('results() should return a hash of all results, indexed by spec id', function () {
+    xit('results() should return a hash of all results, indexed by spec id', function () {
       expect(reporter.results()[spec1.id]).toEqual(expectedSpec1Results);
       expect(reporter.results()[spec2.id]).toEqual(expectedSpec2Results);
     });
 
-    describe("#summarizeResult_", function() {
+    it("should return nested suites as children of their parents", function() {
+      expect(reporter.suites()).toEqual([
+        { id: 0, name: 'top-level suite', type: 'suite',
+          children: [
+            { id: 0, name: 'spec 1', type: 'spec', children: [ ] },
+            { id: 1, name: 'spec 2', type: 'spec', children: [ ] },
+            { id: 1, name: 'nested suite', type: 'suite',
+              children: [
+                { id: 2, name: 'nested spec', type: 'spec', children: [ ] }
+              ]
+            },
+            { id: 3, name: 'spec 3', type: 'spec', children: [ ] }
+          ]
+        }
+      ]);
+    });
+
+    xdescribe("#summarizeResult_", function() {
       it("should summarize a passing result", function() {
         var result = reporter.results()[spec1.id];
         var summarizedResult = reporter.summarizeResult_(result);

spec/suites/RunnerSpec.js

@@ -235,18 +235,33 @@ describe('RunnerTest', function() {
     expect(runner.queue.start).wasCalled();
   });
 
-  it("should return a flat array of all suites, including nested suites", function() {
+  describe("when suites are nested", function() {
-    var suite1, suite2;
+    var suite1, suite2, suite3;
-    suite1 = env.describe("spec 1", function() {
+
-      suite2 = env.describe("nested spec", function() {
+    function suiteNames(suites) {
+      var suiteDescriptions = [];
+      for (var i = 0; i < suites.length; i++) {
+        suiteDescriptions.push(suites[i].getFullName());
+      }
+      return suiteDescriptions;
+    }
+
+    beforeEach(function() {
+      suite1 = env.describe("suite 1", function() {
+        suite2 = env.describe("suite 2", function() {
+        });
       });
+      suite3 = env.describe("suite 3", function() {});
     });
 
-    var suites = env.currentRunner().suites();
+    it("#suites should return a flat array of all suites, including nested suites", function() {
-    var suiteDescriptions = [];
+      var suites = env.currentRunner().suites();
-    for (var i = 0; i < suites.length; i++) {
+      expect(suiteNames(suites)).toEqual([suite1.getFullName(), suite2.getFullName(), suite3.getFullName()]);
-      suiteDescriptions.push(suites[i].getFullName());
+    });
-    }
+
-    expect(suiteDescriptions).toEqual([suite1.getFullName(), suite2.getFullName()]);
+    it("#topLevelSuites should return a flat array of all top-level suites only", function() {
+      var suites = env.currentRunner().topLevelSuites();
+      expect(suiteNames(suites)).toEqual([suite1.getFullName(), suite3.getFullName()]);
+    });
   });
 });

spec/suites/SuiteSpec.js

@@ -14,8 +14,10 @@ describe('Suite', function() {
   });
 
   describe('Specs', function () {
-    it('#specs should return all immediate children that are specs.', function () {
+    var suite;
-      var suite =env.describe('Suite 1', function () {
+
+    beforeEach(function() {
+      suite = env.describe('Suite 1', function () {
         env.it('Spec 1', function() {
           this.runs(function () {
             this.expect(true).toEqual(true);
@@ -39,7 +41,9 @@ describe('Suite', function() {
           });
         });
       });
-
+    });
+    
+    it('#specs should return all immediate children that are specs.', function () {
       var suiteSpecs = suite.specs();
       expect(suiteSpecs.length).toEqual(3);
       expect(suiteSpecs[0].description).toEqual('Spec 1');
@@ -47,55 +51,70 @@ describe('Suite', function() {
       expect(suiteSpecs[2].description).toEqual('Spec 4');
     });
 
-    describe('SpecCount', function () {
+    it("#suites should return all immediate children that are suites.", function() {
+      var nestedSuites = suite.suites();
+      expect(nestedSuites.length).toEqual(1);
+      expect(nestedSuites[0].description).toEqual('Suite 2');
+    });
 
-      it('should keep a count of the number of specs that are run', function() {
+    it("#children should return all immediate children including suites and specs.", function() {
-       var suite = env.describe('one suite description', function () {
+      var children = suite.children();
-          env.it('should be a test', function() {
+      expect(children.length).toEqual(4);
-            this.runs(function () {
+      expect(children[0].description).toEqual('Spec 1');
-              this.expect(true).toEqual(true);
+      expect(children[1].description).toEqual('Spec 2');
-            });
+      expect(children[2].description).toEqual('Suite 2');
-          });
+      expect(children[3].description).toEqual('Spec 4');
-          env.it('should be another test', function() {
+    });
-            this.runs(function () {
+  });
-              this.expect(true).toEqual(true);
+
-            });
+  describe('SpecCount', function () {
-          });
+
-          env.it('should be a third test', function() {
+    it('should keep a count of the number of specs that are run', function() {
-            this.runs(function () {
+      var suite = env.describe('one suite description', function () {
-              this.expect(true).toEqual(true);
+        env.it('should be a test', function() {
-            });
+          this.runs(function () {
+            this.expect(true).toEqual(true);
           });
         });
-
+        env.it('should be another test', function() {
-        expect(suite.specs().length).toEqual(3);
+          this.runs(function () {
-      });
+            this.expect(true).toEqual(true);
-
+          });
-      it('specCount should be correct even with runs/waits blocks', function() {
+        });
-       var suite = env.describe('one suite description', function () {
+        env.it('should be a third test', function() {
-          env.it('should be a test', function() {
+          this.runs(function () {
-            this.runs(function () {
+            this.expect(true).toEqual(true);
-              this.expect(true).toEqual(true);
-            });
-          });
-          env.it('should be another test', function() {
-            this.runs(function () {
-              this.expect(true).toEqual(true);
-            });
-            this.waits(10);
-            this.runs(function () {
-              this.expect(true).toEqual(true);
-            });
-          });
-          env.it('should be a third test', function() {
-            this.runs(function () {
-              this.expect(true).toEqual(true);
-            });
           });
         });
-
-        expect(suite.specs().length).toEqual(3);
       });
+
+      expect(suite.specs().length).toEqual(3);
+    });
+
+    it('specCount should be correct even with runs/waits blocks', function() {
+      var suite = env.describe('one suite description', function () {
+        env.it('should be a test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+        env.it('should be another test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+          this.waits(10);
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+        env.it('should be a third test', function() {
+          this.runs(function () {
+            this.expect(true).toEqual(true);
+          });
+        });
+      });
+
+      expect(suite.specs().length).toEqual(3);
     });
   });
 });

src/JsApiReporter.js

@@ -11,7 +11,7 @@ jasmine.JsApiReporter = function() {
 
 jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) {
   this.started = true;
-  var suites = runner.suites();
+  var suites = runner.topLevelSuites();
   for (var i = 0; i < suites.length; i++) {
     var suite = suites[i];
     this.suites_.push(this.summarize_(suite));
@@ -30,10 +30,11 @@ jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) {
     type: isSuite ? 'suite' : 'spec',
     children: []
   };
+  
   if (isSuite) {
-    var specs = suiteOrSpec.specs();
+    var children = suiteOrSpec.children();
-    for (var i = 0; i < specs.length; i++) {
+    for (var i = 0; i < children.length; i++) {
-      summary.children.push(this.summarize_(specs[i]));
+      summary.children.push(this.summarize_(children[i]));
     }
   }
   return summary;

src/Runner.js

@@ -58,11 +58,20 @@ jasmine.Runner.prototype.specs = function () {
   return specs;
 };
 
-
 jasmine.Runner.prototype.suites = function() {
   return this.suites_;
 };
 
+jasmine.Runner.prototype.topLevelSuites = function() {
+  var topLevelSuites = [];
+  for (var i = 0; i < this.suites_.length; i++) {
+    if (!this.suites_[i].parentSuite) {
+      topLevelSuites.push(this.suites_[i]);
+    }
+  }
+  return topLevelSuites;
+};
+
 jasmine.Runner.prototype.results = function() {
   return this.queue.results();
 };

src/Suite.js

@@ -16,6 +16,8 @@ jasmine.Suite = function(env, description, specDefinitions, parentSuite) {
   self.env = env;
   self.before_ = [];
   self.after_ = [];
+  self.children_ = [];
+  self.suites_ = [];
   self.specs_ = [];
 };
 
@@ -50,7 +52,9 @@ jasmine.Suite.prototype.results = function() {
 };
 
 jasmine.Suite.prototype.add = function(block) {
+  this.children_.push(block);
   if (block instanceof jasmine.Suite) {
+    this.suites_.push(block);
     this.env.currentRunner().addSuite(block);
   } else {
     this.specs_.push(block);
@@ -62,6 +66,14 @@ jasmine.Suite.prototype.specs = function() {
   return this.specs_;
 };
 
+jasmine.Suite.prototype.suites = function() {
+  return this.suites_;
+};
+
+jasmine.Suite.prototype.children = function() {
+  return this.children_;
+};
+
 jasmine.Suite.prototype.execute = function(onComplete) {
   var self = this;
   this.queue.start(function () {