diff --git a/lib/jasmine-core/boot.js b/lib/jasmine-core/boot.js index 85adb0d8..583ccd5f 100644 --- a/lib/jasmine-core/boot.js +++ b/lib/jasmine-core/boot.js @@ -80,7 +80,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. env.throwOnExpectationFailure(throwingExpectationFailures); var random = queryString.getParam("random"); - env.randomizeTests(random); + + if (random !== undefined) { + env.randomizeTests(random); + } var seed = queryString.getParam("seed"); if (seed) { diff --git a/lib/jasmine-core/boot/boot.js b/lib/jasmine-core/boot/boot.js index d9b5a80b..5923245a 100644 --- a/lib/jasmine-core/boot/boot.js +++ b/lib/jasmine-core/boot/boot.js @@ -58,7 +58,10 @@ env.throwOnExpectationFailure(throwingExpectationFailures); var random = queryString.getParam("random"); - env.randomizeTests(random); + + if (random !== undefined) { + env.randomizeTests(random); + } var seed = queryString.getParam("seed"); if (seed) { diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 9c65fcf7..cd744f21 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -707,7 +707,7 @@ getJasmineRequireObj().Env = function(j$) { var currentlyExecutingSuites = []; var currentDeclarationSuite = null; var throwOnExpectationFailure = false; - var random = false; + var random = true; var seed = null; var currentSuite = function() { diff --git a/spec/core/integration/CustomMatchersSpec.js b/spec/core/integration/CustomMatchersSpec.js index f9ec86ad..04f345ec 100644 --- a/spec/core/integration/CustomMatchersSpec.js +++ b/spec/core/integration/CustomMatchersSpec.js @@ -4,6 +4,7 @@ describe("Custom Matchers (Integration)", function() { beforeEach(function() { env = new jasmineUnderTest.Env(); + env.randomizeTests(false); }); it("allows adding more matchers local to a spec", function(done) { diff --git a/spec/core/integration/EnvSpec.js b/spec/core/integration/EnvSpec.js index f77b6265..b5bcef8a 100644 --- a/spec/core/integration/EnvSpec.js +++ b/spec/core/integration/EnvSpec.js @@ -54,6 +54,7 @@ describe("Env integration", function() { }; env.addReporter({ jasmineDone: assertions}); + env.randomizeTests(false); env.describe("A Suite", function() { env.it("with a spec", function() { @@ -82,6 +83,7 @@ describe("Env integration", function() { }; env.addReporter({ jasmineDone: assertions }); + env.randomizeTests(false); env.describe("Outer suite", function() { env.it("an outer spec", function() { @@ -116,6 +118,7 @@ describe("Env integration", function() { }; env.addReporter({ jasmineDone: assertions }); + env.randomizeTests(false); env.describe("Outer suite", function() { @@ -234,6 +237,7 @@ describe("Env integration", function() { var env = new jasmineUnderTest.Env(); env.addReporter({jasmineDone: done}); + env.randomizeTests(false); env.describe("tests", function() { var firstTimeThrough = true, firstSpecContext, secondSpecContext; @@ -909,6 +913,7 @@ describe("Env integration", function() { }; env.addReporter({ jasmineDone: assertions }); + env.randomizeTests(false); env.describe("tests", function() { env.it("test with mock clock", function() { @@ -1472,6 +1477,7 @@ describe("Env integration", function() { }); env.addReporter(reporter); + env.randomizeTests(true); env.execute(); }); @@ -1602,6 +1608,7 @@ describe("Env integration", function() { }); env.addReporter(reporter); + env.randomizeTests(false); env.describe("testing custom equality testers", function() { env.it("with a custom tester", function() { @@ -1637,6 +1644,7 @@ describe("Env integration", function() { }); env.addReporter(reporter); + env.randomizeTests(false); env.describe("testing custom equality testers", function() { env.beforeAll(function() { env.addCustomEqualityTester(function(a, b) { return true; }); }); @@ -1677,6 +1685,7 @@ describe("Env integration", function() { }); env.addReporter(reporter); + env.randomizeTests(false); env.describe("testing custom equality testers", function() { env.it("with a custom tester", function() { @@ -1729,6 +1738,7 @@ describe("Env integration", function() { }); env.addReporter(reporter); + env.randomizeTests(false); env.describe("testing custom equality testers", function() { env.beforeAll(function() { env.addCustomEqualityTester(function(a, b) { return true; })}); diff --git a/spec/core/integration/SpecRunningSpec.js b/spec/core/integration/SpecRunningSpec.js index 2028509a..85eef125 100644 --- a/spec/core/integration/SpecRunningSpec.js +++ b/spec/core/integration/SpecRunningSpec.js @@ -1,8 +1,9 @@ -describe("jasmine spec running", function () { +describe("spec running", function () { var env; beforeEach(function() { env = new jasmineUnderTest.Env(); + env.randomizeTests(false); }); it('should assign spec ids sequentially', function() { @@ -740,8 +741,8 @@ describe("jasmine spec running", function () { it("should run the tests in a consistent order when a seed is supplied", function(done) { var actions = []; - env.randomizeTests(true); env.seed('123456'); + env.randomizeTests(true); env.beforeEach(function () { actions.push('topSuite beforeEach'); diff --git a/spec/html/HtmlReporterSpec.js b/spec/html/HtmlReporterSpec.js index 7047ea56..e84bbd0a 100644 --- a/spec/html/HtmlReporterSpec.js +++ b/spec/html/HtmlReporterSpec.js @@ -1,4 +1,4 @@ -describe("New HtmlReporter", function() { +describe("HtmlReporter", function() { it("builds the initial DOM elements, including the title banner", function() { var env = new jasmineUnderTest.Env(), container = document.createElement("div"), @@ -575,6 +575,7 @@ describe("New HtmlReporter", function() { } }); + env.randomizeTests(false); reporter.initialize(); reporter.jasmineDone({}); diff --git a/src/core/Env.js b/src/core/Env.js index 9655f15d..4cbed3d8 100644 --- a/src/core/Env.js +++ b/src/core/Env.js @@ -26,7 +26,7 @@ getJasmineRequireObj().Env = function(j$) { var currentlyExecutingSuites = []; var currentDeclarationSuite = null; var throwOnExpectationFailure = false; - var random = false; + var random = true; var seed = null; var currentSuite = function() {