From e2e2d1b3434ff30bb4b08864dceb977a3c4892a3 Mon Sep 17 00:00:00 2001 From: Gregg Van Hove Date: Thu, 3 Dec 2015 16:00:05 -0800 Subject: [PATCH] Revert #908 - Run `afterEach` in reverse order declared as before --- lib/jasmine-core/jasmine.js | 2 +- spec/core/integration/SpecRunningSpec.js | 8 ++++---- src/core/Env.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 1cef72d1..f81be90a 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -612,7 +612,7 @@ getJasmineRequireObj().Env = function(j$) { while(suite) { befores = befores.concat(suite.beforeFns); - afters = afters.concat(suite.afterFns.reverse()); + afters = afters.concat(suite.afterFns); suite = suite.parentSuite; } diff --git a/spec/core/integration/SpecRunningSpec.js b/spec/core/integration/SpecRunningSpec.js index 59ddfdae..b79b207a 100644 --- a/spec/core/integration/SpecRunningSpec.js +++ b/spec/core/integration/SpecRunningSpec.js @@ -169,7 +169,7 @@ describe("jasmine spec running", function () { env.execute(); }); - it("should run multiple befores and afters in the order they are declared", function(done) { + it("should run multiple befores and afters ordered so functions declared later are treated as more specific", function(done) { var actions = []; env.beforeEach(function () { @@ -217,10 +217,10 @@ describe("jasmine spec running", function () { "beforeEach1", "beforeEach2", "outer it 1", - "afterEach1", "afterEach2", - "runner afterEach1", - "runner afterEach2" + "afterEach1", + "runner afterEach2", + "runner afterEach1" ]; expect(actions).toEqual(expected); done(); diff --git a/src/core/Env.js b/src/core/Env.js index 9b90335c..5289fd18 100644 --- a/src/core/Env.js +++ b/src/core/Env.js @@ -110,7 +110,7 @@ getJasmineRequireObj().Env = function(j$) { while(suite) { befores = befores.concat(suite.beforeFns); - afters = afters.concat(suite.afterFns.reverse()); + afters = afters.concat(suite.afterFns); suite = suite.parentSuite; }