Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
25c546a904 | ||
|
|
97ab0cb403 | ||
|
|
42b1bda919 |
BIN
dist/jasmine-standalone-2.1.1.zip
vendored
Normal file
BIN
dist/jasmine-standalone-2.1.1.zip
vendored
Normal file
Binary file not shown.
@@ -574,6 +574,9 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
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) {
|
resultCallback: function(attrs) {
|
||||||
reporter.suiteDone(attrs);
|
reporter.suiteDone(attrs);
|
||||||
}
|
}
|
||||||
@@ -2903,5 +2906,5 @@ getJasmineRequireObj().interface = function(jasmine, env) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
getJasmineRequireObj().version = function() {
|
getJasmineRequireObj().version = function() {
|
||||||
return '2.1.0';
|
return '2.1.1';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,6 +4,6 @@
|
|||||||
#
|
#
|
||||||
module Jasmine
|
module Jasmine
|
||||||
module Core
|
module Core
|
||||||
VERSION = "2.1.0"
|
VERSION = "2.1.1"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "jasmine-core",
|
"name": "jasmine-core",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "2.1.0",
|
"version": "2.1.1",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/pivotal/jasmine.git"
|
"url": "https://github.com/pivotal/jasmine.git"
|
||||||
|
|||||||
14
release_notes/2.1.1.md
Normal file
14
release_notes/2.1.1.md
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# Jasmine Core 2.1.1 Release Notes
|
||||||
|
|
||||||
|
## Summary
|
||||||
|
|
||||||
|
This is a hotfix release of jasmine core to fix a breaking change with events emitted by the top-level suite
|
||||||
|
|
||||||
|
## Issues
|
||||||
|
|
||||||
|
- Top-level suite triggers suiteStarted and suiteEnd to be consistent
|
||||||
|
- Fixes [#706](http://github.com/pivotal/jasmine/issues/706)
|
||||||
|
|
||||||
|
------
|
||||||
|
|
||||||
|
_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_
|
||||||
@@ -100,6 +100,21 @@ 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 = [];
|
||||||
@@ -1088,7 +1103,7 @@ describe("Env integration", function() {
|
|||||||
expect(reporter.jasmineStarted).toHaveBeenCalledWith({
|
expect(reporter.jasmineStarted).toHaveBeenCalledWith({
|
||||||
totalSpecsDefined: 3
|
totalSpecsDefined: 3
|
||||||
});
|
});
|
||||||
var suiteResult = reporter.suiteStarted.calls.first().args[0];
|
var suiteResult = reporter.suiteStarted.calls.argsFor(1)[0];
|
||||||
expect(suiteResult.description).toEqual("A Suite");
|
expect(suiteResult.description).toEqual("A Suite");
|
||||||
|
|
||||||
done();
|
done();
|
||||||
|
|||||||
@@ -180,6 +180,9 @@ getJasmineRequireObj().Env = function(j$) {
|
|||||||
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) {
|
resultCallback: function(attrs) {
|
||||||
reporter.suiteDone(attrs);
|
reporter.suiteDone(attrs);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user