Compare commits

...

2 Commits

Author SHA1 Message Date
Gregg Van Hove
0b2097b616 Bump version to 2.3.3 2015-05-11 10:48:58 -07:00
Robert Neumann
225c7bdda3 Set the shared user context correctly when executing the top level suite
Fixes #846
2015-05-11 10:29:51 -07:00
7 changed files with 24 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "jasmine-core", "name": "jasmine-core",
"version": "2.3.2", "version": "2.3.3",
"homepage": "http://jasmine.github.io", "homepage": "http://jasmine.github.io",
"authors": [ "authors": [
"slackersoft <gregg@slackersoft.net>" "slackersoft <gregg@slackersoft.net>"

View File

@@ -2208,6 +2208,7 @@ getJasmineRequireObj().TreeProcessor = function() {
queueRunnerFactory({ queueRunnerFactory({
queueableFns: childFns, queueableFns: childFns,
userContext: tree.sharedUserContext(),
onException: function() { onException: function() {
tree.onException.apply(tree, arguments); tree.onException.apply(tree, arguments);
}, },
@@ -3294,5 +3295,5 @@ getJasmineRequireObj().interface = function(jasmine, env) {
}; };
getJasmineRequireObj().version = function() { getJasmineRequireObj().version = function() {
return '2.3.2'; return '2.3.3';
}; };

View File

@@ -4,6 +4,6 @@
# #
module Jasmine module Jasmine
module Core module Core
VERSION = "2.3.2" VERSION = "2.3.3"
end end
end end

View File

@@ -1,7 +1,7 @@
{ {
"name": "jasmine-core", "name": "jasmine-core",
"license": "MIT", "license": "MIT",
"version": "2.3.2", "version": "2.3.3",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/jasmine/jasmine.git" "url": "https://github.com/jasmine/jasmine.git"

14
release_notes/2.3.3.md Normal file
View File

@@ -0,0 +1,14 @@
# Jasmine 2.3.3 Release Notes
## Summary
This is a hotfix release to fix a regression with the execution context for `beforeAll`
## Pull Requests & Issues
* Set the shared user context correctly when executing the top level suite
- Fixes [#846](https://github.com/jasmine/jasmine/issues/846)
------
_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

View File

@@ -202,7 +202,7 @@ describe("TreeProcessor", function() {
it("runs a single leaf", function() { it("runs a single leaf", function() {
var leaf = new Leaf(), var leaf = new Leaf(),
node = new Node({ children: [leaf] }), node = new Node({ children: [leaf], userContext: { root: 'context' } }),
queueRunner = jasmine.createSpy('queueRunner'), queueRunner = jasmine.createSpy('queueRunner'),
processor = new j$.TreeProcessor({ tree: node, runnableIds: [leaf.id], queueRunnerFactory: queueRunner }), processor = new j$.TreeProcessor({ tree: node, runnableIds: [leaf.id], queueRunnerFactory: queueRunner }),
treeComplete = jasmine.createSpy('treeComplete'); treeComplete = jasmine.createSpy('treeComplete');
@@ -212,6 +212,7 @@ describe("TreeProcessor", function() {
expect(queueRunner).toHaveBeenCalledWith({ expect(queueRunner).toHaveBeenCalledWith({
onComplete: treeComplete, onComplete: treeComplete,
onException: jasmine.any(Function), onException: jasmine.any(Function),
userContext: { root: 'context' },
queueableFns: [{ fn: jasmine.any(Function) }] queueableFns: [{ fn: jasmine.any(Function) }]
}); });
@@ -222,7 +223,7 @@ describe("TreeProcessor", function() {
it("runs a node with no children", function() { it("runs a node with no children", function() {
var node = new Node({ userContext: { node: 'context' } }), var node = new Node({ userContext: { node: 'context' } }),
root = new Node({ children: [node] }), root = new Node({ children: [node], userContext: { root: 'context' } }),
nodeStart = jasmine.createSpy('nodeStart'), nodeStart = jasmine.createSpy('nodeStart'),
nodeComplete = jasmine.createSpy('nodeComplete'), nodeComplete = jasmine.createSpy('nodeComplete'),
queueRunner = jasmine.createSpy('queueRunner'), queueRunner = jasmine.createSpy('queueRunner'),
@@ -241,6 +242,7 @@ describe("TreeProcessor", function() {
expect(queueRunner).toHaveBeenCalledWith({ expect(queueRunner).toHaveBeenCalledWith({
onComplete: treeComplete, onComplete: treeComplete,
onException: jasmine.any(Function), onException: jasmine.any(Function),
userContext: { root: 'context' },
queueableFns: [{ fn: jasmine.any(Function) }] queueableFns: [{ fn: jasmine.any(Function) }]
}); });

View File

@@ -29,6 +29,7 @@ getJasmineRequireObj().TreeProcessor = function() {
queueRunnerFactory({ queueRunnerFactory({
queueableFns: childFns, queueableFns: childFns,
userContext: tree.sharedUserContext(),
onException: function() { onException: function() {
tree.onException.apply(tree, arguments); tree.onException.apply(tree, arguments);
}, },