From 14824b5f9e0c3b654a8c43629e0c63d450b22449 Mon Sep 17 00:00:00 2001 From: Greg Cobb and Tim Jarratt Date: Thu, 28 Aug 2014 16:37:37 -0700 Subject: [PATCH] Expose fit and fdescribe in boot.js * adds done() callbacks to existing specs (because we forgot, whoops!) [Finishes #73742944] --- lib/jasmine-core/boot.js | 8 ++++++++ lib/jasmine-core/boot/boot.js | 8 ++++++++ spec/core/integration/SpecRunningSpec.js | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/jasmine-core/boot.js b/lib/jasmine-core/boot.js index 1d6820dc..e0167319 100644 --- a/lib/jasmine-core/boot.js +++ b/lib/jasmine-core/boot.js @@ -63,6 +63,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. return env.xdescribe(description, specDefinitions); }, + fdescribe: function(description, specDefinitions) { + return env.fdescribe(description, specDefinitions); + }, + it: function(desc, func) { return env.it(desc, func); }, @@ -71,6 +75,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. return env.xit(desc, func); }, + fit: function(desc, func) { + return env.fit(desc, func); + }, + beforeEach: function(beforeEachFunction) { return env.beforeEach(beforeEachFunction); }, diff --git a/lib/jasmine-core/boot/boot.js b/lib/jasmine-core/boot/boot.js index 32bfb076..6bd8dbaf 100644 --- a/lib/jasmine-core/boot/boot.js +++ b/lib/jasmine-core/boot/boot.js @@ -41,6 +41,10 @@ return env.xdescribe(description, specDefinitions); }, + fdescribe: function(description, specDefinitions) { + return env.fdescribe(description, specDefinitions); + }, + it: function(desc, func) { return env.it(desc, func); }, @@ -49,6 +53,10 @@ return env.xit(desc, func); }, + fit: function(desc, func) { + return env.fit(desc, func); + }, + beforeEach: function(beforeEachFunction) { return env.beforeEach(beforeEachFunction); }, diff --git a/spec/core/integration/SpecRunningSpec.js b/spec/core/integration/SpecRunningSpec.js index cd9c1fdc..2de2dc2e 100644 --- a/spec/core/integration/SpecRunningSpec.js +++ b/spec/core/integration/SpecRunningSpec.js @@ -367,7 +367,7 @@ describe("jasmine spec running", function () { }); describe('focused runnables', function() { - it('runs the relevant alls and eachs for each runnable', function() { + it('runs the relevant alls and eachs for each runnable', function(done) { var actions = []; env.beforeAll(function() {actions.push('beforeAll')}); env.afterAll(function() {actions.push('afterAll')}); @@ -408,7 +408,7 @@ describe("jasmine spec running", function () { env.execute(); }); - it('runs fits in fdescribes twice', function(){ + it('runs fits in fdescribes twice', function(done){ var actions = []; env.fdescribe('focused suite', function() {