Merge branch 'main' into 3.99

Author: sgravrock

.circleci/config.yml

@@ -10,10 +10,18 @@ executors:
     docker:
       - image: cimg/node:16.1.0
     working_directory: ~/workspace
-  node14:
+  node14_latest:
     docker:
       - image: circleci/node:14
     working_directory: ~/workspace
+  node14_8:
+    docker:
+      - image: circleci/node:14.8
+    working_directory: ~/workspace
+  node14_7:
+    docker:
+      - image: circleci/node:14.7
+    working_directory: ~/workspace
   node12_latest:
     docker:
     - image: circleci/node:12
@@ -36,7 +44,7 @@ executors:
     working_directory: ~/workspace
 
 jobs:
-  build_and_test:
+  test:
     parameters:
       executor:
         type: executor
@@ -57,29 +65,19 @@ workflows:
   version: 2
   push: &push_workflow
     jobs:
-      - build_and_test:
-          executor: node16
-          name: node_16
-      - build_and_test:
-          executor: node14
-          name: node_14
-      - build_and_test:
-          executor: node12_latest
-          name: node_12_latest
-      - build_and_test:
-          executor: node12_0
-          name: node_12_0
-      # 12.16 is the last version without good-enough ES module support
-      - build_and_test:
-          executor: node12_16
-          name: node_12_16
-      # 12.16 is the first version with good-enough ES module support
-      - build_and_test:
-          executor: node12_17
-          name: node_12_17
-      - build_and_test:
-          executor: node10
-          name: node_10
+      - test:
+          matrix:
+            parameters:
+              executor:
+                - node16
+                - node14_latest
+                - node14_8 # first with top level await in ES modules.
+                - node14_7
+                - node12_latest
+                - node12_17 # first with dynamic import() of commonjs modules
+                - node12_16
+                - node12_0
+                - node10
   cron:
     <<: *push_workflow
     triggers:

.eslintignore

@@ -1,2 +1,3 @@
 spec/fixtures/cjs-syntax-error/syntax_error.js
+spec/fixtures/esm-importing-commonjs-syntax-error/syntax_error.js
 spec/fixtures/js-loader-import/*.js

bin/jasmine.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
-var path = require('path'),
-    Command = require('../lib/command'),
-    Jasmine = require('../lib/jasmine');
+const path = require('path');
+const Command = require('../lib/command');
+const Jasmine = require('../lib/jasmine');
 
-var jasmine = new Jasmine({ projectBaseDir: path.resolve() });
-var examplesDir = path.join(path.dirname(require.resolve('jasmine-core')), 'jasmine-core', 'example', 'node_example');
-var command = new Command(path.resolve(), examplesDir, console.log);
+const jasmine = new Jasmine({ projectBaseDir: path.resolve() });
+const examplesDir = path.join(path.dirname(require.resolve('jasmine-core')), 'jasmine-core', 'example', 'node_example');
+const command = new Command(path.resolve(), examplesDir, console.log);
 
 command.run(jasmine, process.argv.slice(2));

lib/command.js

@@ -1,9 +1,9 @@
-var path = require('path'),
-    fs = require('fs');
+const path = require('path');
+const fs = require('fs');
 
 exports = module.exports = Command;
 
-var subCommands = {
+const subCommands = {
   init: {
     description: 'initialize jasmine',
     action: initJasmine
@@ -28,14 +28,14 @@ function Command(projectBaseDir, examplesDir, print) {
   this.projectBaseDir = projectBaseDir;
   this.specDir = path.join(projectBaseDir, 'spec');
 
-  var command = this;
+  const command = this;
 
   this.run = function(jasmine, commands) {
     setEnvironmentVariables(commands);
 
-    var commandToRun;
+    let commandToRun;
     Object.keys(subCommands).forEach(function(cmd) {
-      var commandObject = subCommands[cmd];
+      const commandObject = subCommands[cmd];
         if (commands.indexOf(cmd) >= 0) {
         commandToRun = commandObject;
       } else if(commandObject.alias && commands.indexOf(commandObject.alias) >= 0) {
@@ -46,7 +46,7 @@ function Command(projectBaseDir, examplesDir, print) {
     if (commandToRun) {
       commandToRun.action({jasmine: jasmine, projectBaseDir: command.projectBaseDir, specDir: command.specDir, examplesDir: examplesDir, print: print});
     } else {
-      var env = parseOptions(commands);
+      const env = parseOptions(commands);
       if (env.unknownOptions.length > 0) {
         process.exitCode = 1;
         print('Unknown options: ' + env.unknownOptions.join(', '));
@@ -64,7 +64,7 @@ function isFileArg(arg) {
 }
 
 function parseOptions(argv) {
-  var files = [],
+  let files = [],
       helpers = [],
       requires = [],
       unknownOptions = [],
@@ -77,8 +77,8 @@ function parseOptions(argv) {
       random,
       seed;
 
-  for (var i in argv) {
-    var arg = argv[i];
+  for (let i in argv) {
+    const arg = argv[i];
     if (arg === '--no-color') {
       color = false;
     } else if (arg === '--color') {
@@ -126,7 +126,7 @@ function parseOptions(argv) {
 }
 
 function runJasmine(jasmine, env, print) {
-  var loadConfig = require('./loadConfig');
+  const loadConfig = require('./loadConfig');
   loadConfig(jasmine, env, print);
   jasmine.execute(env.files, env.filter)
     .catch(function(error) {
@@ -136,8 +136,8 @@ function runJasmine(jasmine, env, print) {
 }
 
 function initJasmine(options) {
-  var print = options.print;
-  var specDir = options.specDir;
+  const print = options.print;
+  const specDir = options.specDir;
   makeDirStructure(path.join(specDir, 'support/'));
   if(!fs.existsSync(path.join(specDir, 'support/jasmine.json'))) {
     fs.writeFileSync(path.join(specDir, 'support/jasmine.json'), fs.readFileSync(path.join(__dirname, '../lib/examples/jasmine.json'), 'utf-8'));
@@ -148,9 +148,9 @@ function initJasmine(options) {
 }
 
 function installExamples(options) {
-  var specDir = options.specDir;
-  var projectBaseDir = options.projectBaseDir;
-  var examplesDir = options.examplesDir;
+  const specDir = options.specDir;
+  const projectBaseDir = options.projectBaseDir;
+  const examplesDir = options.examplesDir;
 
   makeDirStructure(path.join(specDir, 'support'));
   makeDirStructure(path.join(specDir, 'jasmine_examples'));
@@ -177,12 +177,12 @@ function installExamples(options) {
 }
 
 function help(options) {
-  var print = options.print;
+  const print = options.print;
   print('Usage: jasmine [command] [options] [files] [--]');
   print('');
   print('Commands:');
   Object.keys(subCommands).forEach(function(cmd) {
-    var commandNameText = cmd;
+    let commandNameText = cmd;
     if(subCommands[cmd].alias) {
       commandNameText = commandNameText + ',' + subCommands[cmd].alias;
     }
@@ -210,7 +210,7 @@ function help(options) {
 }
 
 function version(options) {
-  var print = options.print;
+  const print = options.print;
   print('jasmine v' + require('../package.json').version);
   print('jasmine-core v' + options.jasmine.coreVersion());
 }
@@ -224,7 +224,7 @@ function lPad(str, length) {
 }
 
 function copyFiles(srcDir, destDir, pattern) {
-  var srcDirFiles = fs.readdirSync(srcDir);
+  const srcDirFiles = fs.readdirSync(srcDir);
   srcDirFiles.forEach(function(file) {
     if (file.search(pattern) !== -1) {
       fs.writeFileSync(path.join(destDir, file), fs.readFileSync(path.join(srcDir, file)));
@@ -233,10 +233,10 @@ function copyFiles(srcDir, destDir, pattern) {
 }
 
 function makeDirStructure(absolutePath) {
-  var splitPath = absolutePath.split(path.sep);
+  const splitPath = absolutePath.split(path.sep);
   splitPath.forEach(function(dir, index) {
     if(index > 1) {
-      var fullPath = path.join(splitPath.slice(0, index).join('/'), dir);
+      const fullPath = path.join(splitPath.slice(0, index).join('/'), dir);
       if (!fs.existsSync(fullPath)) {
         fs.mkdirSync(fullPath);
       }
@@ -245,16 +245,16 @@ function makeDirStructure(absolutePath) {
 }
 
 function isEnvironmentVariable(command) {
-  var envRegExp = /(.*)=(.*)/;
+  const envRegExp = /(.*)=(.*)/;
   return command.match(envRegExp);
 }
 
 function setEnvironmentVariables(commands) {
   commands.forEach(function (command) {
-    var regExpMatch = isEnvironmentVariable(command);
+    const regExpMatch = isEnvironmentVariable(command);
     if(regExpMatch) {
-      var key = regExpMatch[1];
-      var value = regExpMatch[2];
+      const key = regExpMatch[1];
+      const value = regExpMatch[2];
       process.env[key] = value;
     }
   });

lib/filters/console_spec_filter.js

@@ -1,8 +1,8 @@
 module.exports = exports = ConsoleSpecFilter;
 
 function ConsoleSpecFilter(options) {
-  var filterString = options && options.filterString;
-  var filterPattern = new RegExp(filterString);
+  const filterString = options && options.filterString;
+  const filterPattern = new RegExp(filterString);
 
   this.matches = function(specName) {
     return filterPattern.test(specName);

lib/jasmine.js

@@ -1,9 +1,9 @@
-var path = require('path'),
-    util = require('util'),
-    glob = require('glob'),
-    Loader = require('./loader'),
-    CompletionReporter = require('./reporters/completion_reporter'),
-    ConsoleSpecFilter = require('./filters/console_spec_filter');
+const path = require('path');
+const util = require('util');
+const glob = require('glob');
+const Loader = require('./loader');
+const CompletionReporter = require('./reporters/completion_reporter');
+const ConsoleSpecFilter = require('./filters/console_spec_filter');
 
 module.exports = Jasmine;
 module.exports.ConsoleReporter = require('./reporters/console_reporter');
@@ -33,7 +33,7 @@ module.exports.ConsoleReporter = require('./reporters/console_reporter');
 function Jasmine(options) {
   options = options || {};
   this.loader = options.loader || new Loader();
-  var jasmineCore = options.jasmineCore || require('jasmine-core');
+  const jasmineCore = options.jasmineCore || require('jasmine-core');
   this.jasmineCorePath = path.join(jasmineCore.files.path, 'jasmine.js');
   this.jasmine = jasmineCore.boot(jasmineCore);
   this.projectBaseDir = options.projectBaseDir || path.resolve();
@@ -58,7 +58,7 @@ function Jasmine(options) {
   this.addReporter(this.reporter);
   this.defaultReporterConfigured = false;
 
-  var jasmineRunner = this;
+  const jasmineRunner = this;
   this.completionReporter.onComplete(function(passed) {
     jasmineRunner.exitCodeCompletion(passed);
   });
@@ -234,8 +234,8 @@ Jasmine.prototype.loadRequires = function() {
  */
 Jasmine.prototype.loadConfigFile = function(configFilePath) {
   try {
-    var absoluteConfigFilePath = path.resolve(this.projectBaseDir, configFilePath || 'spec/support/jasmine.json');
-    var config = require(absoluteConfigFilePath);
+    const absoluteConfigFilePath = path.resolve(this.projectBaseDir, configFilePath || 'spec/support/jasmine.json');
+    const config = require(absoluteConfigFilePath);
     this.loadConfig(config);
   } catch (e) {
     if(configFilePath || e.code != 'MODULE_NOT_FOUND') { throw e; }
@@ -250,7 +250,7 @@ Jasmine.prototype.loadConfig = function(config) {
   /**
    * @interface Configuration
    */
-  var envConfig = {...config.env};
+  const envConfig = {...config.env};
 
   /**
    * The directory that spec files are contained in, relative to the project
@@ -277,7 +277,7 @@ Jasmine.prototype.loadConfig = function(config) {
    * @default false
    */
   if (config.stopSpecOnExpectationFailure !== undefined) {
-    envConfig.oneFailurePerSpec = config.stopSpecOnExpectationFailure;
+    envConfig.stopSpecOnExpectationFailure = config.stopSpecOnExpectationFailure;
   }
 
   /**
@@ -287,7 +287,7 @@ Jasmine.prototype.loadConfig = function(config) {
    * @default false
    */
   if (config.stopOnSpecFailure !== undefined) {
-    envConfig.failFast = config.stopOnSpecFailure;
+    envConfig.stopOnSpecFailure = config.stopOnSpecFailure;
   }
 
   /**
@@ -404,19 +404,19 @@ Jasmine.prototype.addSpecFiles = Jasmine.prototype.addMatchingSpecFiles;
 Jasmine.prototype.addHelperFiles = Jasmine.prototype.addMatchingHelperFiles;
 
 Jasmine.prototype.addRequires = function(requires) {
-  var jasmineRunner = this;
+  const jasmineRunner = this;
   requires.forEach(function(r) {
     jasmineRunner.requires.push(r);
   });
 };
 
 function addFiles(kind) {
   return function (files) {
-    var jasmineRunner = this;
-    var fileArr = this[kind];
+    const jasmineRunner = this;
+    const fileArr = this[kind];
 
-    var {includeFiles, excludeFiles} = files.reduce(function(ongoing, file) {
-      var hasNegation = file.startsWith('!');
+    const {includeFiles, excludeFiles} = files.reduce(function(ongoing, file) {
+      const hasNegation = file.startsWith('!');
 
       if (hasNegation) {
         file = file.substring(1);
@@ -433,7 +433,7 @@ function addFiles(kind) {
     }, { includeFiles: [], excludeFiles: [] });
 
     includeFiles.forEach(function(file) {
-      var filePaths = glob
+      const filePaths = glob
         .sync(file, { ignore: excludeFiles })
         .filter(function(filePath) {
           // glob will always output '/' as a segment separator but the fileArr may use \ on windows
@@ -478,7 +478,7 @@ Jasmine.prototype.onComplete = function(onCompleteCallback) {
  * failure
  */
 Jasmine.prototype.stopSpecOnExpectationFailure = function(value) {
-  this.env.configure({oneFailurePerSpec: value});
+  this.env.configure({stopSpecOnExpectationFailure: value});
 };
 
 /**
@@ -489,7 +489,7 @@ Jasmine.prototype.stopSpecOnExpectationFailure = function(value) {
  * first spec failure
  */
 Jasmine.prototype.stopOnSpecFailure = function(value) {
-  this.env.configure({failFast: value});
+  this.env.configure({stopOnSpecFailure: value});
 };
 
 Jasmine.prototype.exitCodeCompletion = function(passed) {
@@ -498,9 +498,9 @@ Jasmine.prototype.exitCodeCompletion = function(passed) {
   // might exit before all previous writes have actually been
   // written when Jasmine is piped to another process that isn't
   // reading quickly enough.
-  var jasmineRunner = this;
-  var streams = [process.stdout, process.stderr];
-  var writesToWait = streams.length;
+  const jasmineRunner = this;
+  const streams = [process.stdout, process.stderr];
+  let writesToWait = streams.length;
   streams.forEach(function(stream) {
     stream.write('', null, exitIfAllStreamsCompleted);
   });
@@ -517,7 +517,7 @@ Jasmine.prototype.exitCodeCompletion = function(passed) {
   }
 };
 
-var checkExit = function(jasmineRunner) {
+const checkExit = function(jasmineRunner) {
   return function() {
     if (!jasmineRunner.completionReporter.isComplete()) {
       process.exitCode = 4;
@@ -558,7 +558,7 @@ Jasmine.prototype.execute = async function(files, filterString) {
   }
 
   if (filterString) {
-    var specFilter = new ConsoleSpecFilter({
+    const specFilter = new ConsoleSpecFilter({
       filterString: filterString
     });
     this.env.configure({specFilter: function(spec) {

lib/loadConfig.js

@@ -20,8 +20,8 @@ module.exports = exports = function(jasmine, env, print) {
   }
   if (env.reporter !== undefined) {
     try {
-      var Report = require(env.reporter);
-      var reporter = new Report();
+      const Report = require(env.reporter);
+      const reporter = new Report();
       jasmine.clearReporters();
       jasmine.addReporter(reporter);
     } catch(e) {
@@ -31,4 +31,4 @@ module.exports = exports = function(jasmine, env, print) {
     }
   }
   jasmine.showColors(env.color);
-};
+};

lib/loader.js

@@ -12,16 +12,7 @@ Loader.prototype.load = function(path, alwaysImport) {
     // Node enforces this on Windows but not on other OSes.
     const url = `file://${path}`;
     return this.import_(url).catch(function(e) {
-      if (e.message.indexOf(path) !== -1 || e.stack.indexOf(path) !== -1) {
-        return Promise.reject(e);
-      } else {
-        // When an ES module has a syntax error, the resulting exception does not
-        // include the filename. Add it. We lose the stack trace in the process,
-        // but the stack trace is usually not useful since it contains only frames
-        // from the Node module loader.
-        const updatedError = new Error(`While loading ${path}: ${e.constructor.name}: ${e.message}`);
-        return Promise.reject(updatedError);
-      }
+      return Promise.reject(fixupImportException(e, path));
     });
   } else {
     return new Promise(resolve => {
@@ -38,3 +29,97 @@ function requireShim(path) {
 function importShim(path) {
   return import(path);
 }
+
+
+function fixupImportException(e, importedPath) {
+  // When an ES module has a syntax error, the resulting exception does not
+  // include the filename, which the user will need to debug the problem. We
+  // need to fix those up to include the filename. However, other kinds of load-
+  // time errors *do* include the filename and usually the line number. We need
+  // to leave those alone.
+  //
+  // Some examples of load-time errors that we need to deal with:
+  // 1. Syntax error in an ESM spec:
+  // SyntaxError: missing ) after argument list
+  //     at Loader.moduleStrategy (node:internal/modules/esm/translators:147:18)
+  //     at async link (node:internal/modules/esm/module_job:64:21)
+  //
+  // 2. Syntax error in an ES module imported from an ESM spec. This is exactly
+  // the same as #1: there is no way to tell which file actually has the syntax
+  // error.
+  //
+  // 3. Syntax error in a CommonJS module imported by an ES module:
+  // /path/to/commonjs_with_syntax_error.js:2
+  //
+  //
+  //
+  // SyntaxError: Unexpected end of input
+  //     at Object.compileFunction (node:vm:355:18)
+  //     at wrapSafe (node:internal/modules/cjs/loader:1038:15)
+  //     at Module._compile (node:internal/modules/cjs/loader:1072:27)
+  //     at Object.Module._extensions..js (node:internal/modules/cjs/loader:1137:10)
+  //     at Module.load (node:internal/modules/cjs/loader:988:32)
+  //     at Function.Module._load (node:internal/modules/cjs/loader:828:14)
+  //     at ModuleWrap.<anonymous> (node:internal/modules/esm/translators:201:29)
+  //     at ModuleJob.run (node:internal/modules/esm/module_job:175:25)
+  //     at async Loader.import (node:internal/modules/esm/loader:178:24)
+  //     at async file:///path/to/esm_that_imported_cjs.mjs:2:11
+  //
+  // Note: For Jasmine's purposes, case 3 only occurs in  Node >= 14.8. Older
+  // versions don't support top-level await, without which it's not possible to
+  // load a CommonJS module from an ES module at load-time. The entire content
+  // above, including the file path and the three blank lines, is part of the
+  // error's `stack` property. There may or may not be any stack trace after the
+  // SyntaxError line, and if there's a stack trace it may or may not contain
+  // any useful information.
+  //
+  // 4. Any other kind of exception thrown at load time
+  //
+  //  Error: nope
+  //     at Object.<anonymous> (/path/to/file_throwing_error.js:1:7)
+  //     at Module._compile (node:internal/modules/cjs/loader:1108:14)
+  //     at Object.Module._extensions..js (node:internal/modules/cjs/loader:1137:10)
+  //     at Module.load (node:internal/modules/cjs/loader:988:32)
+  //     at Function.Module._load (node:internal/modules/cjs/loader:828:14)
+  //     at ModuleWrap.<anonymous> (node:internal/modules/esm/translators:201:29)
+  //     at ModuleJob.run (node:internal/modules/esm/module_job:175:25)
+  //     at async Loader.import (node:internal/modules/esm/loader:178:24)
+  //     at async file:///path_to_file_importing_broken_file.mjs:1:1
+  //
+  // We need to replace the error with a useful one in cases 1 and 2, but not in
+  // cases 3 and 4. Distinguishing among them can be tricky. Simple heuristics
+  // like checking the stack trace for the name of the file we imported fail
+  // because it often shows up even when the error was elsewhere, e.g. at the
+  // bottom of the stack traces in the examples for cases 3 and 4 above. To add
+  // to the fun, file paths in errors on Windows can be either Windows style
+  // paths (c:\path\to\file.js) or URLs (file:///c:/path/to/file.js).
+  
+  if (!(e instanceof SyntaxError)) {
+    return e;
+  }
+
+  const escapedWin = escapeStringForRegexp(importedPath.replace(/\//g, '\\'));
+  const windowsPathRegex = new RegExp('[a-zA-z]:\\\\([^\\s]+\\\\|)' + escapedWin);
+  const windowsUrlRegex = new RegExp('file:///[a-zA-z]:\\\\([^\\s]+\\\\|)' + escapedWin);
+  const anyUnixPathFirstLineRegex = /^\/[^\s:]+:\d/;
+  const anyWindowsPathFirstLineRegex = /^[a-zA-Z]:(\\[^\s\\:]+)+:/;
+
+  if (e.message.indexOf(importedPath) !== -1
+      || e.stack.indexOf(importedPath) !== -1
+      || e.stack.match(windowsPathRegex) || e.stack.match(windowsUrlRegex)
+      || e.stack.match(anyUnixPathFirstLineRegex)
+      || e.stack.match(anyWindowsPathFirstLineRegex)) {
+    return e;
+  } else {
+    return new Error(`While loading ${importedPath}: ${e.constructor.name}: ${e.message}`);
+  }
+}
+
+// Adapted from Sindre Sorhus's escape-string-regexp (MIT license)
+function escapeStringForRegexp(string) {
+  // Escape characters with special meaning either inside or outside character sets.
+  // Use a simple backslash escape when it’s always valid, and a `\xnn` escape when the simpler form would be disallowed by Unicode patterns’ stricter grammar.
+  return string
+    .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
+    .replace(/-/g, '\\x2d');
+}

lib/reporters/completion_reporter.js

@@ -1,6 +1,6 @@
 module.exports = function() {
-  var onCompleteCallback = function() {};
-  var completed = false;
+  let onCompleteCallback = function() {};
+  let completed = false;
 
   this.onComplete = function(callback) {
     onCompleteCallback = callback;

lib/reporters/console_reporter.js

@@ -10,7 +10,7 @@ module.exports = exports = ConsoleReporter;
  * const reporter = new ConsoleReporter();
  */
 function ConsoleReporter() {
-  var print = function() {},
+  let print = function() {},
     showColors = false,
     jasmineCorePath = null,
     specCount,
@@ -81,14 +81,14 @@ function ConsoleReporter() {
   this.jasmineDone = function(result) {
     printNewline();
     printNewline();
-    if(failedSpecs.length > 0) {
+    if (failedSpecs.length > 0) {
       print('Failures:');
     }
-    for (var i = 0; i < failedSpecs.length; i++) {
+    for (let i = 0; i < failedSpecs.length; i++) {
       specFailureDetails(failedSpecs[i], i + 1);
     }
 
-    for(i = 0; i < failedSuites.length; i++) {
+    for(let i = 0; i < failedSuites.length; i++) {
       suiteFailureDetails(failedSuites[i]);
     }
 
@@ -110,7 +110,7 @@ function ConsoleReporter() {
         print('Ran ' + executableSpecCount + ' of ' + specCount + plural(' spec', specCount));
         printNewline();
       }
-      var specCounts = executableSpecCount + ' ' + plural('spec', executableSpecCount) + ', ' +
+      let specCounts = executableSpecCount + ' ' + plural('spec', executableSpecCount) + ', ' +
         failureCount + ' ' + plural('failure', failureCount);
 
       if (pendingSpecs.length) {
@@ -123,7 +123,7 @@ function ConsoleReporter() {
     }
 
     printNewline();
-    var seconds = result ? result.totalTime / 1000 : 0;
+    const seconds = result ? result.totalTime / 1000 : 0;
     print('Finished in ' + seconds + ' ' + plural('second', seconds));
     printNewline();
 
@@ -189,17 +189,17 @@ function ConsoleReporter() {
   }
 
   function repeat(thing, times) {
-    var arr = [];
-    for (var i = 0; i < times; i++) {
+    const arr = [];
+    for (let i = 0; i < times; i++) {
       arr.push(thing);
     }
     return arr;
   }
 
   function indent(str, spaces) {
-    var lines = (str || '').split('\n');
-    var newArr = [];
-    for (var i = 0; i < lines.length; i++) {
+    const lines = (str || '').split('\n');
+    const newArr = [];
+    for (let i = 0; i < lines.length; i++) {
       newArr.push(repeat(' ', spaces).join('') + lines[i]);
     }
     return newArr.join('\n');
@@ -210,7 +210,7 @@ function ConsoleReporter() {
       return '';
     }
 
-    var filteredStack = stack.split('\n').filter(function(stackLine) {
+    const filteredStack = stack.split('\n').filter(function(stackLine) {
       return stackLine.indexOf(jasmineCorePath) === -1;
     }).join('\n');
     return filteredStack;
@@ -230,8 +230,8 @@ function ConsoleReporter() {
   }
 
   function printFailedExpectations(result) {
-    for (var i = 0; i < result.failedExpectations.length; i++) {
-      var failedExpectation = result.failedExpectations[i];
+    for (let i = 0; i < result.failedExpectations.length; i++) {
+      const failedExpectation = result.failedExpectations[i];
       printNewline();
       print(indent('Message:', 2));
       printNewline();
@@ -266,7 +266,7 @@ function ConsoleReporter() {
     print(pendingSpecNumber + ') ');
     print(result.fullName);
     printNewline();
-    var pendingReason = "No reason given";
+    let pendingReason = "No reason given";
     if (result.pendingReason && result.pendingReason !== '') {
       pendingReason = result.pendingReason;
     }

spec/command_spec.js

@@ -1,16 +1,15 @@
-var fs = require('fs'),
-  path = require('path');
+const fs = require('fs');
+const path = require('path');
+const Command = require('../lib/command');
 
-var Command = require('../lib/command');
-
-var projectBaseDir = 'spec/fixtures/sample_empty_project/';
-var spec = path.join(projectBaseDir, 'spec');
+const projectBaseDir = 'spec/fixtures/sample_empty_project/';
+const spec = path.join(projectBaseDir, 'spec');
 
 function deleteDirectory(dir) {
   if (fs.existsSync(dir)) {
-    var dirFiles = fs.readdirSync(dir);
+    const dirFiles = fs.readdirSync(dir);
     dirFiles.forEach(function(file) {
-      var fullPath = path.join(dir, file);
+      const fullPath = path.join(dir, file);
       if (fs.statSync(fullPath).isDirectory()) {
         deleteDirectory(fullPath);
       }
@@ -23,7 +22,7 @@ function deleteDirectory(dir) {
 }
 
 function withValueForIsTTY(value, func) {
-  var wasTTY = process.stdout.isTTY;
+  const wasTTY = process.stdout.isTTY;
   try {
     process.stdout.isTTY = value;
     func();
@@ -35,12 +34,12 @@ function withValueForIsTTY(value, func) {
 
 describe('command', function() {
   beforeEach(function() {
-    var examplesDir = path.resolve(path.join(__dirname, 'fixtures', 'example'));
+    const examplesDir = path.resolve(path.join(__dirname, 'fixtures', 'example'));
 
     fs.mkdirSync(projectBaseDir);
 
     this.out = (function() {
-      var output = "";
+      let output = "";
       return {
         print: function(str) {
           output += str;
@@ -86,8 +85,8 @@ describe('command', function() {
     });
 
     it('writes default settings to jasmine.json', function() {
-      var realJson = fs.readFileSync(path.join(spec, 'support/', 'jasmine.json'), 'utf-8');
-      var fixtureJson = fs.readFileSync(path.join(__dirname, '../', 'lib/', 'examples/', 'jasmine.json'), 'utf-8');
+      const realJson = fs.readFileSync(path.join(spec, 'support/', 'jasmine.json'), 'utf-8');
+      const fixtureJson = fs.readFileSync(path.join(__dirname, '../', 'lib/', 'examples/', 'jasmine.json'), 'utf-8');
       expect(realJson).toEqual(fixtureJson);
     });
   });
@@ -99,7 +98,7 @@ describe('command', function() {
     });
 
     it('displays the version of jasmine', function() {
-      var packageVersion = require('../package.json').version;
+      const packageVersion = require('../package.json').version;
       expect(this.out.getOutput()).toContain('jasmine v' + packageVersion);
     });
 
@@ -115,7 +114,7 @@ describe('command', function() {
     });
 
     it('displays the version of jasmine', function() {
-      var packageVersion = require('../package.json').version;
+      const packageVersion = require('../package.json').version;
       expect(this.out.getOutput()).toContain('jasmine v' + packageVersion);
     });
 
@@ -265,23 +264,23 @@ describe('command', function() {
     });
 
     it('can specify a reporter', function() {
-      var reporterPath = path.resolve(path.join(__dirname, 'fixtures', 'customReporter.js'));
-      var Reporter = require(reporterPath);
+      const reporterPath = path.resolve(path.join(__dirname, 'fixtures', 'customReporter.js'));
+      const Reporter = require(reporterPath);
       this.command.run(this.fakeJasmine, ['--reporter=' + reporterPath]);
       expect(this.fakeJasmine.clearReporters).toHaveBeenCalled();
       expect(this.fakeJasmine.addReporter).toHaveBeenCalledWith(jasmine.any(Reporter));
     });
 
     it('prints an error if the file does not export a reporter', function() {
-      var reporterPath = path.resolve(path.join(__dirname, 'fixtures', 'badReporter.js'));
+      const reporterPath = path.resolve(path.join(__dirname, 'fixtures', 'badReporter.js'));
       this.command.run(this.fakeJasmine, ['--reporter=' + reporterPath]);
       expect(this.fakeJasmine.clearReporters).not.toHaveBeenCalled();
       expect(this.fakeJasmine.addReporter).not.toHaveBeenCalled();
       expect(this.out.getOutput()).toContain('failed to register reporter');
     });
 
     it('prints an error if the reporter file does not exist', function() {
-      var reporterPath = path.resolve(path.join(__dirname, 'fixtures', 'missingReporter.js'));
+      const reporterPath = path.resolve(path.join(__dirname, 'fixtures', 'missingReporter.js'));
       this.command.run(this.fakeJasmine, ['--reporter=' + reporterPath]);
       expect(this.fakeJasmine.clearReporters).not.toHaveBeenCalled();
       expect(this.fakeJasmine.addReporter).not.toHaveBeenCalled();

spec/filters/console_spec_filter_spec.js

@@ -1,16 +1,16 @@
-var ConsoleSpecFilter = require('../../lib/filters/console_spec_filter');
+const ConsoleSpecFilter = require('../../lib/filters/console_spec_filter');
 
 describe("ConsoleSpecFilter", function() {
 
   it("should match when no string is provided", function() {
-    var specFilter = new ConsoleSpecFilter();
+    const specFilter = new ConsoleSpecFilter();
 
     expect(specFilter.matches("foo")).toBe(true);
     expect(specFilter.matches("*bar")).toBe(true);
   });
 
   it("should match the provided string", function() {
-    var specFilter = new ConsoleSpecFilter({
+    const specFilter = new ConsoleSpecFilter({
       filterString: "foo"
     });
 
@@ -19,12 +19,12 @@ describe("ConsoleSpecFilter", function() {
   });
 
   it("should match by part of spec name", function() {
-    var specFilter = new ConsoleSpecFilter({
+    const specFilter = new ConsoleSpecFilter({
       filterString: "ba"
     });
 
     expect(specFilter.matches("foo")).toBe(false);
     expect(specFilter.matches("bar")).toBe(true);
     expect(specFilter.matches("baz")).toBe(true);
   });
-});
+});

spec/fixtures/esm-importing-commonjs-syntax-error/intermediate.js

@@ -0,0 +1 @@
+require('./syntax_error');

spec/fixtures/esm-importing-commonjs-syntax-error/jasmine.json

@@ -0,0 +1,7 @@
+{
+  "spec_dir": ".",
+  "spec_files": [
+    "spec.mjs"
+  ],
+  "helpers": []
+}

spec/fixtures/esm-importing-commonjs-syntax-error/spec.mjs

@@ -0,0 +1 @@
+await import('./intermediate.js');

spec/fixtures/esm-importing-commonjs-syntax-error/syntax_error.js

@@ -0,0 +1 @@
+{

spec/fixtures/esm-indirect-error/jasmine.json

@@ -0,0 +1,7 @@
+{
+  "spec_dir": ".",
+  "spec_files": [
+    "spec.mjs"
+  ],
+  "helpers": []
+}

spec/fixtures/esm-indirect-error/spec.mjs

@@ -0,0 +1,3 @@
+import './throws.mjs';
+
+it('a spec', () => {});

spec/fixtures/esm-indirect-error/throws.mjs

@@ -0,0 +1 @@
+throw new Error('nope');

spec/fixtures/topLevelAwaitSentinel.mjs

@@ -0,0 +1 @@
+await Promise.resolve();

spec/integration_spec.js

@@ -89,6 +89,32 @@ describe('Integration', function () {
     expect(output).toContain('syntax_error.mjs');
   });
 
+  it('handles syntax errors from a CommonJS module loaded from an ESM spec properly', async function() {
+    try {
+      await import('./fixtures/topLevelAwaitSentinel.mjs');
+    } catch (e) {
+      if (e instanceof SyntaxError && e.message === 'Unexpected reserved word') {
+        pending('This Node version does not support top-level await');
+      } else if (e.message === 'Not supported') {
+        pending('This Node version does not support dynamic import');
+      } else {
+        throw e;
+      }
+    }
+
+    const {exitCode, output} = await runJasmine('spec/fixtures/esm-importing-commonjs-syntax-error', true);
+    expect(exitCode).toEqual(1);
+    expect(output).toContain('SyntaxError');
+    expect(output).toContain('syntax_error.js');
+  });
+
+  it('handles exceptions thrown from a module loaded from an ESM spec properly', async function() {
+    const {exitCode, output} = await runJasmine('spec/fixtures/esm-indirect-error', true);
+    expect(exitCode).toEqual(1);
+    expect(output).toContain('nope');
+    expect(output).toContain('throws.mjs');
+  });
+
   it('can configure the env via the `env` config property', async function() {
     const {exitCode, output} = await runJasmine('spec/fixtures/env-config');
     expect(exitCode).toEqual(0);

spec/jasmine_spec.js

@@ -1,8 +1,8 @@
-describe('Jasmine', function() {
-  var path = require('path'),
-      slash = require('slash'),
-      Jasmine = require('../lib/jasmine');
+const path = require('path');
+const slash = require('slash');
+const Jasmine = require('../lib/jasmine');
 
+describe('Jasmine', function() {
   beforeEach(function() {
     this.bootedJasmine = {
       getEnv: jasmine.createSpy('getEnv').and.returnValue({
@@ -74,7 +74,7 @@ describe('Jasmine', function() {
 
     function hasCommonFileGlobBehavior(method, destProp) {
       it('adds a file with an absolute path', function() {
-        var aFile = path.join(this.testJasmine.projectBaseDir, this.testJasmine.specDir, 'spec/command_spec.js');
+        const aFile = path.join(this.testJasmine.projectBaseDir, this.testJasmine.specDir, 'spec/command_spec.js');
         expect(this.testJasmine[destProp]).toEqual([]);
         this.testJasmine[method]([aFile]);
         expect(this.testJasmine[destProp]).toEqual([slash(aFile)]);
@@ -105,7 +105,7 @@ describe('Jasmine', function() {
       });
 
       it('adds new files to existing files', function() {
-        var aFile = path.join(this.testJasmine.projectBaseDir, this.testJasmine.specDir, 'spec/command_spec.js');
+        const aFile = path.join(this.testJasmine.projectBaseDir, this.testJasmine.specDir, 'spec/command_spec.js');
         this.testJasmine[destProp] = [aFile, 'b'];
         this.testJasmine[method](['spec/fixtures/jasmine_spec/*.js']);
         expect(this.testJasmine[destProp].map(basename)).toEqual([
@@ -130,13 +130,13 @@ describe('Jasmine', function() {
   it('registers a console reporter upon construction', function() {
     spyOn(Jasmine, 'ConsoleReporter').and.returnValue({someProperty: 'some value'});
 
-    var testJasmine = new Jasmine({ jasmineCore: this.fakeJasmineCore });
+    const testJasmine = new Jasmine({ jasmineCore: this.fakeJasmineCore });
 
     expect(testJasmine.env.addReporter).toHaveBeenCalledWith({someProperty: 'some value'});
   });
 
   it('exposes #addReporter and #clearReporters', function() {
-    var testJasmine = new Jasmine({ jasmineCore: this.fakeJasmineCore });
+    const testJasmine = new Jasmine({ jasmineCore: this.fakeJasmineCore });
     expect(testJasmine.reportersCount).toEqual(1);
     testJasmine.clearReporters();
     expect(testJasmine.reportersCount).toEqual(0);
@@ -152,13 +152,13 @@ describe('Jasmine', function() {
     });
 
     it('sets the options on the console reporter', function() {
-      var reporterOptions = {
+      const reporterOptions = {
         print: 'printer',
         showColors: true,
         jasmineCorePath: 'path',
       };
 
-      var expectedReporterOptions = Object.keys(reporterOptions).reduce(function(options, key) {
+      const expectedReporterOptions = Object.keys(reporterOptions).reduce(function(options, key) {
         options[key] = reporterOptions[key];
         return options;
       }, {});
@@ -169,11 +169,11 @@ describe('Jasmine', function() {
     });
 
     it('creates a reporter with a default option if an option is not specified', function() {
-      var reporterOptions = {};
+      const reporterOptions = {};
 
       this.testJasmine.configureDefaultReporter(reporterOptions);
 
-      var expectedReporterOptions = {
+      const expectedReporterOptions = {
         print: jasmine.any(Function),
         showColors: true,
         jasmineCorePath: path.normalize('fake/jasmine/path/jasmine.js')
@@ -236,7 +236,7 @@ describe('Jasmine', function() {
         this.configObject.stopSpecOnExpectationFailure = true;
         this.fixtureJasmine.loadConfig(this.configObject);
 
-        expect(this.fixtureJasmine.env.configure).toHaveBeenCalledWith({oneFailurePerSpec: true});
+        expect(this.fixtureJasmine.env.configure).toHaveBeenCalledWith({stopSpecOnExpectationFailure: true});
       });
 
       it('does not configure jasmine-core for stopping spec on expectation failure by default', function() {
@@ -249,7 +249,7 @@ describe('Jasmine', function() {
         this.configObject.stopOnSpecFailure = true;
         this.fixtureJasmine.loadConfig(this.configObject);
 
-        expect(this.fixtureJasmine.env.configure).toHaveBeenCalledWith({failFast: true});
+        expect(this.fixtureJasmine.env.configure).toHaveBeenCalledWith({stopOnSpecFailure: true});
       });
 
       it('does not configure jasmine-core for stopping execution by default', function() {
@@ -288,7 +288,7 @@ describe('Jasmine', function() {
 
       describe('without options', function() {
         it('falls back to an empty string with an undefined spec_dir', function() {
-          var config = this.configObject;
+          const config = this.configObject;
           delete config.spec_dir;
 
           this.fixtureJasmine.loadConfig(config);
@@ -397,7 +397,7 @@ describe('Jasmine', function() {
       });
 
       it('loads the specified configuration file from an absolute path', function() {
-        var absoluteConfigPath = path.join(__dirname, 'fixtures/sample_project/spec/support/jasmine_alternate.json');
+        const absoluteConfigPath = path.join(__dirname, 'fixtures/sample_project/spec/support/jasmine_alternate.json');
         this.fixtureJasmine.loadConfigFile(absoluteConfigPath);
         expect(this.fixtureJasmine.helperFiles).toEqual(['spec/fixtures/sample_project/spec/helper.js']);
         expect(this.fixtureJasmine.requires).toEqual(['ts-node/register']);
@@ -408,13 +408,13 @@ describe('Jasmine', function() {
       });
 
       it('throw error if specified configuration file doesn\'t exist', function() {
-        var jasmine = this.fixtureJasmine;
+        const jasmine = this.fixtureJasmine;
         function load() { jasmine.loadConfigFile('missing.json'); }
         expect(load).toThrow();
       });
 
       it('no error if default configuration file doesn\'t exist', function() {
-        var jasmine = this.fixtureJasmine;
+        const jasmine = this.fixtureJasmine;
         function load() {
           jasmine.projectBaseDir += '/missing';
           jasmine.loadConfigFile();
@@ -432,16 +432,16 @@ describe('Jasmine', function() {
   });
 
   describe('#stopSpecOnExpectationFailure', function() {
-    it('sets the throwOnExpectationFailure value on the jasmine-core env', function() {
+    it('sets the stopSpecOnExpectationFailure value on the jasmine-core env', function() {
       this.testJasmine.stopSpecOnExpectationFailure('foobar');
-      expect(this.testJasmine.env.configure).toHaveBeenCalledWith({oneFailurePerSpec: 'foobar'});
+      expect(this.testJasmine.env.configure).toHaveBeenCalledWith({stopSpecOnExpectationFailure: 'foobar'});
     });
   });
 
   describe('#stopOnSpecFailure', function() {
     it('sets the stopOnSpecFailure value on the jasmine-core env', function() {
       this.testJasmine.stopOnSpecFailure('blah');
-      expect(this.testJasmine.env.configure).toHaveBeenCalledWith({failFast: 'blah'});
+      expect(this.testJasmine.env.configure).toHaveBeenCalledWith({stopOnSpecFailure: 'blah'});
     });
   });
 
@@ -454,7 +454,7 @@ describe('Jasmine', function() {
 
   describe('#onComplete', function() {
     it('stores an onComplete function', function() {
-      var fakeOnCompleteCallback = function() {};
+      const fakeOnCompleteCallback = function() {};
       spyOn(this.testJasmine.completionReporter, 'onComplete');
       this.testJasmine.env.deprecated = jasmine.createSpy('env.deprecated');
 
@@ -513,7 +513,7 @@ describe('Jasmine', function() {
     });
 
     it('loads helper files before checking if any reporters were added', async function() {
-      var loadHelpers = spyOn(this.testJasmine, 'loadHelpers');
+      const loadHelpers = spyOn(this.testJasmine, 'loadHelpers');
       spyOn(this.testJasmine, 'configureDefaultReporter').and.callFake(function() {
         expect(loadHelpers).toHaveBeenCalled();
       });
@@ -532,7 +532,7 @@ describe('Jasmine', function() {
 
       await this.testJasmine.execute(['spec/fixtures/sample_project/**/*spec.js']);
 
-      var relativePaths = this.testJasmine.specFiles.map(function(filePath) {
+      const relativePaths = this.testJasmine.specFiles.map(function(filePath) {
         return slash(path.relative(__dirname, filePath));
       });
 
@@ -547,7 +547,7 @@ describe('Jasmine', function() {
     });
 
     it('adds an exit code reporter', async function() {
-      var completionReporterSpy = jasmine.createSpyObj('reporter', ['onComplete']);
+      const completionReporterSpy = jasmine.createSpyObj('reporter', ['onComplete']);
       this.testJasmine.completionReporter = completionReporterSpy;
       spyOn(this.testJasmine, 'addReporter');
 
@@ -572,7 +572,7 @@ describe('Jasmine', function() {
       });
 
       it('leaves it if the suite has completed', function() {
-        var completionReporterSpy = jasmine.createSpyObj('reporter', ['isComplete']);
+        const completionReporterSpy = jasmine.createSpyObj('reporter', ['isComplete']);
         completionReporterSpy.isComplete.and.returnValue(true);
         this.testJasmine.completionReporter = completionReporterSpy;
 

spec/load_config_spec.js

@@ -1,9 +1,9 @@
-describe('loadConfig', function() {
-  var path = require('path'),
-      loadConfig = require('../lib/loadConfig');
+const path = require('path');
+const loadConfig = require('../lib/loadConfig');
 
+describe('loadConfig', function() {
   it('should configure the jasmine object based on env and call execute', function() {
-    var fakeJasmine = jasmine.createSpyObj('jasmine', ['loadConfigFile', 'addHelperFiles', 'addRequires', 'showColors', 'execute', 'stopSpecOnExpectationFailure',
+    const fakeJasmine = jasmine.createSpyObj('jasmine', ['loadConfigFile', 'addHelperFiles', 'addRequires', 'showColors', 'execute', 'stopSpecOnExpectationFailure',
       'stopOnSpecFailure', 'randomizeTests', 'seed', 'coreVersion', 'clearReporters', 'addReporter']),
         env = {
           configPath: 'somewhere.json',
@@ -33,7 +33,7 @@ describe('loadConfig', function() {
   });
 
   it('should not configure the jasmine object when env is an empty object and call execute', function() {
-    var fakeJasmine = jasmine.createSpyObj('jasmine', ['loadConfigFile', 'addHelperFiles', 'addRequires', 'showColors', 'execute', 'stopSpecOnExpectationFailure',
+    const fakeJasmine = jasmine.createSpyObj('jasmine', ['loadConfigFile', 'addHelperFiles', 'addRequires', 'showColors', 'execute', 'stopSpecOnExpectationFailure',
       'stopOnSpecFailure', 'randomizeTests', 'seed', 'coreVersion', 'clearReporters', 'addReporter']),
         env = {};
     loadConfig(fakeJasmine, env, console.log);

spec/loader_spec.js

@@ -70,24 +70,81 @@ function esModuleSharedExamples(extension, alwaysImport) {
     await expectAsync(loaderPromise).toBeResolved();
   });
 
-  it("adds the filename to errors that don't include it", async function() {
+  it("adds the filename to ES module syntax errors", async function() {
     const underlyingError = new SyntaxError('some details but no filename, not even in the stack trace');
-    const importShim = () => Promise.reject(underlyingError);
-    const loader = new Loader({importShim});
+    const loader = new Loader({importShim: () => Promise.reject(underlyingError)});
 
     await expectAsync(loader.load(`foo.${extension}`, alwaysImport)).toBeRejectedWithError(
       `While loading foo.${extension}: SyntaxError: some details but no filename, not even in the stack trace`
     );
   });
 
-  it('propagates errors that already contain the filename without modifying them', async function () {
-    const requireShim = jasmine.createSpy('requireShim');
+  it('does not modify errors that are not SyntaxError instances', async function() {
     const underlyingError = new Error('nope');
-    underlyingError.stack = underlyingError.stack.replace('loader_spec.js', `foo.${extension}`);
-    const importShim = jasmine.createSpy('importShim')
-      .and.callFake(() => Promise.reject(underlyingError));
-    const loader = new Loader({requireShim, importShim});
+    const loader = new Loader({importShim: () => Promise.reject(underlyingError)});
 
     await expectAsync(loader.load(`foo.${extension}`, alwaysImport)).toBeRejectedWith(underlyingError);
   });
+
+  it('does not modify SyntaxErrors that mention the imported filename as a Unix-style path', async function() {
+    const underlyingError = new SyntaxError('nope');
+    underlyingError.stack = `/the/absolute/path/to/foo.${extension}:1\n` +
+      '\n' +
+      '\n' +
+      '\n' +
+      'maybe some more stack\n';
+    const loader = new Loader({importShim: () => Promise.reject(underlyingError)});
+
+    await expectAsync(loader.load(`path/to/foo.${extension}`, alwaysImport))
+      .toBeRejectedWith(underlyingError);
+  });
+
+  it('does not modify SyntaxErrors that mention the imported filename as a Unix-style file URL', async function() {
+    const underlyingError = new SyntaxError('nope');
+    underlyingError.stack += `\n     at async file:///the/absolute/path/to/foo.${extension}:1:1`;
+    const loader = new Loader({importShim: () => Promise.reject(underlyingError)});
+
+    await expectAsync(loader.load(`path/to/foo.${extension}`, alwaysImport))
+      .toBeRejectedWith(underlyingError);
+  });
+
+  it('does not modify SyntaxErrors that mention the imported filename as a Windows-style path', async function() {
+    const underlyingError = new SyntaxError('nope');
+    underlyingError.stack = `c:\\the\\absolute\\path\\to\\foo.${extension}:1\n` +
+      '\n' +
+      '\n' +
+      '\n' +
+      'maybe some more stack\n';
+    const loader = new Loader({importShim: () => Promise.reject(underlyingError)});
+
+    await expectAsync(loader.load(`path/to/foo.${extension}`, alwaysImport))
+      .toBeRejectedWith(underlyingError);
+  });
+
+  it('does not modify SyntaxErrors that mention the imported filename as a Windows-style file URL', async function() {
+    const underlyingError = new SyntaxError('nope');
+    underlyingError.stack += `\n     at async file:///c:/the/absolute/path/to/foo.${extension}:1:1`;
+    const loader = new Loader({importShim: () => Promise.reject(underlyingError)});
+
+    await expectAsync(loader.load(`path/to/foo.${extension}`, alwaysImport))
+      .toBeRejectedWith(underlyingError);
+  });
+
+  it('does not modify SyntaxErrors when the stack trace starts with any Unix-style path', async function() {
+    const underlyingError = new SyntaxError('nope');
+    underlyingError.stack = '/some/path/to/a/file.js:1\n\n\n\n' + underlyingError.stack;
+    const loader = new Loader({importShim: () => Promise.reject(underlyingError)});
+
+    await expectAsync(loader.load(`path/to/some/other/file.${extension}`, alwaysImport))
+      .toBeRejectedWith(underlyingError);
+  });
+
+  it('does not modify SyntaxErrors when the stack trace starts with any Windows-style path', async function() {
+    const underlyingError = new SyntaxError('nope');
+    underlyingError.stack = 'c:\\some\\path\\to\\a\\file.js:1\n\n\n\n' + underlyingError.stack;
+    const loader = new Loader({importShim: () => Promise.reject(underlyingError)});
+
+    await expectAsync(loader.load(`path/to/some/other/file.${extension}`, alwaysImport))
+      .toBeRejectedWith(underlyingError);
+  });
 }

spec/npm_package_spec.js

@@ -1,16 +1,16 @@
-describe('npm package', function() {
-  var path = require('path'),
-    temp = require('temp').track(),
-    fs = require('fs');
+const path = require('path');
+const temp = require('temp').track();
+const fs = require('fs');
 
+describe('npm package', function() {
   beforeAll(function() {
-    var shell = require('shelljs'),
+    const shell = require('shelljs'),
       pack = shell.exec('npm pack', { silent: true });
 
     this.tarball = pack.stdout.split('\n')[0];
     this.tmpDir = temp.mkdirSync(); // automatically deleted on exit
 
-    var untar = shell.exec('tar -xzf ' + this.tarball + ' -C ' + this.tmpDir, {
+    const untar = shell.exec('tar -xzf ' + this.tarball + ' -C ' + this.tmpDir, {
       silent: true
     });
     expect(untar.code).toBe(0);
@@ -21,7 +21,7 @@ describe('npm package', function() {
       toExistInPath: function() {
         return {
           compare: function(actual, expected) {
-            var fullPath = path.resolve(expected, actual);
+            const fullPath = path.resolve(expected, actual);
             return {
               pass: fs.existsSync(fullPath)
             };

spec/reporters/completion_reporter_spec.js

@@ -1,6 +1,6 @@
-describe('CompletionReporter', function() {
-  var CompletionReporter = require('../../lib/reporters/completion_reporter');
+const CompletionReporter = require('../../lib/reporters/completion_reporter');
 
+describe('CompletionReporter', function() {
   beforeEach(function() {
     this.reporter = new CompletionReporter();
     this.onComplete = jasmine.createSpy('onComplete');

spec/reporters/console_reporter_spec.js

@@ -1,15 +1,15 @@
-describe("ConsoleReporter", function() {
-  var ConsoleReporter = require('../../lib/reporters/console_reporter'),
-      jasmineCorePath = 'path/to/jasmine/core/jasmine.js';
+const ConsoleReporter = require('../../lib/reporters/console_reporter');
+const jasmineCorePath = 'path/to/jasmine/core/jasmine.js';
 
-  var fakeStack = ['foo' + jasmineCorePath,
+describe("ConsoleReporter", function() {
+  const fakeStack = ['foo' + jasmineCorePath,
     'bar ' + jasmineCorePath,
     'line of useful stack trace',
     'baz ' + jasmineCorePath].join('\n');
 
   beforeEach(function() {
     this.out = (function() {
-      var output = "";
+      let output = "";
       return {
         print: function(str) {
           output += str;
@@ -25,7 +25,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports that the suite has started to the console", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
 
     reporter.setOptions({
       print: this.out.print
@@ -38,7 +38,7 @@ describe("ConsoleReporter", function() {
 
   describe("When order information is passed to jasmineStarted", function() {
     it("reports the seed number when randomized", function() {
-      var reporter = new ConsoleReporter();
+      const reporter = new ConsoleReporter();
       reporter.setOptions({
         print: this.out.print
       });
@@ -54,7 +54,7 @@ describe("ConsoleReporter", function() {
     });
 
     it("does not report order info when not randomized", function() {
-      var reporter = new ConsoleReporter();
+      const reporter = new ConsoleReporter();
       reporter.setOptions({
         print: this.out.print
       });
@@ -70,7 +70,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("setOptions should not override existing options if set multiple times", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
 
     reporter.setOptions({
       print: this.out.print,
@@ -94,7 +94,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a passing spec as a dot", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print
     });
@@ -105,7 +105,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("does not report a disabled spec", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print
     });
@@ -116,7 +116,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a failing spec as an 'F'", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print
     });
@@ -127,7 +127,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a pending spec as a '*'", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print
     });
@@ -138,7 +138,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("alerts user if there are no specs", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print
     });
@@ -151,7 +151,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports the seed number when running in random order", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print
     });
@@ -167,7 +167,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("allows the seed reproduction command to be overridden", function() {
-    var reporter = new ConsoleReporter("jasmine-some-other-tool");
+    const reporter = new ConsoleReporter("jasmine-some-other-tool");
     reporter.setOptions({
       print: this.out.print,
       randomSeedReproductionCmd: function(seed) {
@@ -186,7 +186,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done (singular spec and time)", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
     });
@@ -204,7 +204,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done (pluralized specs and seconds)", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
     });
@@ -237,7 +237,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done that indicates the number of specs run (when it's less that the full number of specs)", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
     });
@@ -254,7 +254,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done that includes the failed spec number before the full name of a failing spec", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       jasmineCorePath: jasmineCorePath
@@ -286,7 +286,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done that includes stack traces without jasmine internals for a failing suite", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       jasmineCorePath: jasmineCorePath
@@ -320,7 +320,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done in case that stack is somehow undefined", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       jasmineCorePath: jasmineCorePath
@@ -352,11 +352,11 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done that includes custom filtered stack traces for a failing suite", function() {
-    var stackLine = 'custom line of stack';
-    var customStackFilter = function(stack) {
+    const stackLine = 'custom line of stack';
+    const customStackFilter = function(stack) {
       return stackLine;
     };
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       stackFilter: customStackFilter
@@ -389,7 +389,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done that includes which specs are pending and their reasons", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       jasmineCorePath: jasmineCorePath
@@ -413,7 +413,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done that includes the reason for an incomplete suite", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       jasmineCorePath: jasmineCorePath
@@ -432,7 +432,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("reports a summary when done that shows info for a failed spec with no expectations", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       jasmineCorePath: jasmineCorePath
@@ -456,7 +456,7 @@ describe("ConsoleReporter", function() {
   });
 
   it('reports a summary without "no expectations" message for a spec having failed expectations', function () {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       jasmineCorePath: jasmineCorePath
@@ -485,7 +485,7 @@ describe("ConsoleReporter", function() {
   });
 
   it('reports a summary without a "no expectations" message for a spec having passed expectations', function () {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       jasmineCorePath: jasmineCorePath
@@ -524,7 +524,7 @@ describe("ConsoleReporter", function() {
   });
 
   it("displays all afterAll exceptions", function() {
-    var reporter = new ConsoleReporter();
+    const reporter = new ConsoleReporter();
     reporter.setOptions({
       print: this.out.print,
       showColors: true
@@ -541,7 +541,7 @@ describe("ConsoleReporter", function() {
 
   describe("with color", function() {
     it("reports that the suite has started to the console", function() {
-      var reporter = new ConsoleReporter();
+      const reporter = new ConsoleReporter();
       reporter.setOptions({
         print: this.out.print,
         showColors: true
@@ -553,7 +553,7 @@ describe("ConsoleReporter", function() {
     });
 
     it("reports a passing spec as a dot", function() {
-      var reporter = new ConsoleReporter();
+      const reporter = new ConsoleReporter();
       reporter.setOptions({
         print: this.out.print,
         showColors: true
@@ -565,7 +565,7 @@ describe("ConsoleReporter", function() {
     });
 
     it("does not report a disabled spec", function() {
-      var reporter = new ConsoleReporter();
+      const reporter = new ConsoleReporter();
       reporter.setOptions({
         print: this.out.print,
         showColors: true
@@ -577,7 +577,7 @@ describe("ConsoleReporter", function() {
     });
 
     it("reports a failing spec as an 'F'", function() {
-      var reporter = new ConsoleReporter();
+      const reporter = new ConsoleReporter();
       reporter.setOptions({
         print: this.out.print,
         showColors: true