diff --git a/test/font/jasmine-boot.js b/test/font/jasmine-boot.js index b208507fa..feea5d247 100644 --- a/test/font/jasmine-boot.js +++ b/test/font/jasmine-boot.js @@ -76,34 +76,27 @@ function initializePDFJS(callback) { }, }); - var stoppingOnSpecFailure = queryString.getParam('failFast'); - env.stopOnSpecFailure(typeof stoppingOnSpecFailure === 'undefined' ? - false : stoppingOnSpecFailure); - - var throwingExpectationFailures = queryString.getParam('throwFailures'); - env.throwOnExpectationFailure(throwingExpectationFailures); + var config = { + failFast: queryString.getParam('failFast'), + oneFailurePerSpec: queryString.getParam('oneFailurePerSpec'), + hideDisabled: queryString.getParam('hideDisabled'), + }; var random = queryString.getParam('random'); - env.randomizeTests(random); + if (random !== undefined && random !== '') { + config.random = random; + } var seed = queryString.getParam('seed'); if (seed) { - env.seed(seed); + config.seed = seed; } // Reporters var htmlReporter = new jasmine.HtmlReporter({ env, - onStopExecutionClick() { - queryString.navigateWithNewParam('failFast', - env.stoppingOnSpecFailure()); - }, - onThrowExpectationsClick() { - queryString.navigateWithNewParam('throwFailures', - !env.throwingExpectationFailures()); - }, - onRandomClick() { - queryString.navigateWithNewParam('random', !env.randomTests()); + navigateWithNewParam(key, value) { + return queryString.navigateWithNewParam(key, value); }, addToExistingQueryString(key, value) { return queryString.fullStringWithNewParam(key, value); @@ -136,10 +129,12 @@ function initializePDFJS(callback) { }, }); - env.specFilter = function(spec) { + config.specFilter = function(spec) { return specFilter.matches(spec.getFullName()); }; + env.configure(config); + // Sets longer timeout. jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000; diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js index 98b736e49..baff368da 100644 --- a/test/unit/jasmine-boot.js +++ b/test/unit/jasmine-boot.js @@ -125,34 +125,27 @@ function initializePDFJS(callback) { }, }); - var stoppingOnSpecFailure = queryString.getParam('failFast'); - env.stopOnSpecFailure(typeof stoppingOnSpecFailure === 'undefined' ? - false : stoppingOnSpecFailure); - - var throwingExpectationFailures = queryString.getParam('throwFailures'); - env.throwOnExpectationFailure(throwingExpectationFailures); + var config = { + failFast: queryString.getParam('failFast'), + oneFailurePerSpec: queryString.getParam('oneFailurePerSpec'), + hideDisabled: queryString.getParam('hideDisabled'), + }; var random = queryString.getParam('random'); - env.randomizeTests(random); + if (random !== undefined && random !== '') { + config.random = random; + } var seed = queryString.getParam('seed'); if (seed) { - env.seed(seed); + config.seed = seed; } // Reporters var htmlReporter = new jasmine.HtmlReporter({ env, - onStopExecutionClick() { - queryString.navigateWithNewParam('failFast', - env.stoppingOnSpecFailure()); - }, - onThrowExpectationsClick() { - queryString.navigateWithNewParam('throwFailures', - !env.throwingExpectationFailures()); - }, - onRandomClick() { - queryString.navigateWithNewParam('random', !env.randomTests()); + navigateWithNewParam(key, value) { + return queryString.navigateWithNewParam(key, value); }, addToExistingQueryString(key, value) { return queryString.fullStringWithNewParam(key, value); @@ -185,10 +178,12 @@ function initializePDFJS(callback) { }, }); - env.specFilter = function(spec) { + config.specFilter = function(spec) { return specFilter.matches(spec.getFullName()); }; + env.configure(config); + // Sets longer timeout. jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;