From b58cf6e7c6b3c3dfae7b93108e8752a927064593 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Sun, 10 Mar 2019 16:20:29 -0700 Subject: [PATCH] Re-do logic from jrunner.execute() in jasmine_runner.js since we're now calling jasmine.getEnv().execute(specs) instead --- packages/jasmine/src/jasmine_runner.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/jasmine/src/jasmine_runner.js b/packages/jasmine/src/jasmine_runner.js index efc549e910..6cafddb32e 100644 --- a/packages/jasmine/src/jasmine_runner.js +++ b/packages/jasmine/src/jasmine_runner.js @@ -93,7 +93,16 @@ function main(args) { process.exit(exitCode); }); + // Re-do logic from jrunner.execute() here so that + // we can control which specs are executed below + jrunner.loadRequires(); + jrunner.loadHelpers(); + if (!jrunner.defaultReporterConfigured) { + jrunner.configureDefaultReporter({showColors: jrunner.showingColors}); + } jrunner.loadSpecs(); + jrunner.addReporter(jrunner.completionReporter); + const allSpecs = getAllSpecs(jasmine.getEnv()); if (TOTAL_SHARDS) { // Partition the specs among the shards. @@ -107,6 +116,7 @@ function main(args) { } else { jasmine.getEnv().execute(allSpecs); } + return 0; }