diff --git a/lib/jasmine-core/jasmine-html.js b/lib/jasmine-core/jasmine-html.js index 3d241f59..2ce54d1b 100644 --- a/lib/jasmine-core/jasmine-html.js +++ b/lib/jasmine-core/jasmine-html.js @@ -54,10 +54,11 @@ jasmineRequire.HtmlReporter = function(j$) { }; ResultsStateBuilder.prototype.specStarted = function(result) { - this.currentParent.addChild(result, 'spec'); }; ResultsStateBuilder.prototype.specDone = function(result) { + this.currentParent.addChild(result, 'spec'); + if (result.status !== 'disabled') { this.specsExecuted++; } diff --git a/spec/html/HtmlReporterSpec.js b/spec/html/HtmlReporterSpec.js index 7047ea56..59138c8a 100644 --- a/spec/html/HtmlReporterSpec.js +++ b/spec/html/HtmlReporterSpec.js @@ -209,7 +209,7 @@ describe("New HtmlReporter", function() { }); describe("when Jasmine is done", function() { - it("adds EMPTY to the link title of specs that have no expectations", function() { + it("adds a warning to the link title of specs that have no expectations", function() { if (!window.console) { window.console = { error: function(){} }; } @@ -228,7 +228,7 @@ describe("New HtmlReporter", function() { reporter.initialize(); reporter.jasmineStarted({}); reporter.suiteStarted({id: 1}); - reporter.specStarted({id: 1, status: 'passed', passedExpectations: [], failedExpectations: []}); + reporter.specStarted({id: 1, passedExpectations: [], failedExpectations: []}); reporter.specDone({ id: 1, status: 'passed', diff --git a/src/html/HtmlReporter.js b/src/html/HtmlReporter.js index 27baf7da..6ce6a41b 100644 --- a/src/html/HtmlReporter.js +++ b/src/html/HtmlReporter.js @@ -25,10 +25,11 @@ jasmineRequire.HtmlReporter = function(j$) { }; ResultsStateBuilder.prototype.specStarted = function(result) { - this.currentParent.addChild(result, 'spec'); }; ResultsStateBuilder.prototype.specDone = function(result) { + this.currentParent.addChild(result, 'spec'); + if (result.status !== 'disabled') { this.specsExecuted++; }