Top level suite no longer reports suiteStart and suiteDone
- jasmineStart and jasmineDone are reported separately Fixes #716
This commit is contained in:
@@ -573,13 +573,7 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
env: this,
|
env: this,
|
||||||
id: getNextSuiteId(),
|
id: getNextSuiteId(),
|
||||||
description: 'Jasmine__TopLevel__Suite',
|
description: 'Jasmine__TopLevel__Suite',
|
||||||
queueRunner: queueRunnerFactory,
|
queueRunner: queueRunnerFactory
|
||||||
onStart: function(suite) {
|
|
||||||
reporter.suiteStarted(suite.result);
|
|
||||||
},
|
|
||||||
resultCallback: function(attrs) {
|
|
||||||
reporter.suiteDone(attrs);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
runnableLookupTable[topSuite.id] = topSuite;
|
runnableLookupTable[topSuite.id] = topSuite;
|
||||||
defaultResourcesForRunnable(topSuite.id);
|
defaultResourcesForRunnable(topSuite.id);
|
||||||
|
|||||||
@@ -100,21 +100,6 @@ describe("Env integration", function() {
|
|||||||
env.execute();
|
env.execute();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Tells the reporter when the top-level suite has started and finished', function(done) {
|
|
||||||
var env = new j$.Env(),
|
|
||||||
reporter = jasmine.createSpyObj('reporter', ['suiteStarted', 'suiteDone', 'jasmineDone']);
|
|
||||||
|
|
||||||
reporter.jasmineDone.and.callFake(function() {
|
|
||||||
expect(reporter.suiteStarted).toHaveBeenCalled();
|
|
||||||
expect(reporter.suiteDone).toHaveBeenCalled();
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
|
|
||||||
env.addReporter(reporter);
|
|
||||||
|
|
||||||
env.execute();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("Multiple top-level Suites execute as expected", function(done) {
|
it("Multiple top-level Suites execute as expected", function(done) {
|
||||||
var env = new j$.Env(),
|
var env = new j$.Env(),
|
||||||
calls = [];
|
calls = [];
|
||||||
@@ -1105,7 +1090,7 @@ describe("Env integration", function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
expect(reporter.specDone.calls.count()).toBe(5);
|
expect(reporter.specDone.calls.count()).toBe(5);
|
||||||
var suiteResult = reporter.suiteStarted.calls.argsFor(1)[0];
|
var suiteResult = reporter.suiteStarted.calls.argsFor(0)[0];
|
||||||
expect(suiteResult.description).toEqual("A Suite");
|
expect(suiteResult.description).toEqual("A Suite");
|
||||||
|
|
||||||
done();
|
done();
|
||||||
|
|||||||
@@ -179,13 +179,7 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
env: this,
|
env: this,
|
||||||
id: getNextSuiteId(),
|
id: getNextSuiteId(),
|
||||||
description: 'Jasmine__TopLevel__Suite',
|
description: 'Jasmine__TopLevel__Suite',
|
||||||
queueRunner: queueRunnerFactory,
|
queueRunner: queueRunnerFactory
|
||||||
onStart: function(suite) {
|
|
||||||
reporter.suiteStarted(suite.result);
|
|
||||||
},
|
|
||||||
resultCallback: function(attrs) {
|
|
||||||
reporter.suiteDone(attrs);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
runnableLookupTable[topSuite.id] = topSuite;
|
runnableLookupTable[topSuite.id] = topSuite;
|
||||||
defaultResourcesForRunnable(topSuite.id);
|
defaultResourcesForRunnable(topSuite.id);
|
||||||
|
|||||||
Reference in New Issue
Block a user