Merge branch 'master' into 3.0-features

This commit is contained in:
Steve Gravrock
2018-01-10 15:23:35 -08:00
16 changed files with 373 additions and 155 deletions

View File

@@ -241,7 +241,7 @@ describe("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(){} };
}
@@ -260,7 +260,7 @@ describe("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',