ember-cli 3.28.1 → 4.0.0-beta.2

package/tests/helpers/dist-checker.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const path = require('path');
 // eslint-disable-next-line node/no-unpublished-require
 const jsdom = require('jsdom');
+const { AssertionError } = require('assert');
 
 class CustomResourceLoader extends jsdom.ResourceLoader {
   constructor(distPath) {
@@ -41,7 +42,26 @@ class DistChecker {
     this.dom.window.crypto = () => {};
     return new Promise((resolve, reject) => {
       // reject if the scripts take longer than 15 seconds to load.
-      let timeoutId = setTimeout(reject, timeout);
+      let timeoutId = setTimeout(() => {
+        reject(
+          new AssertionError({
+            operator: 'evalScripts[Timeout]',
+            message: `[dist-checker:${this.distPath}] timeout exceeded: ${timeout}`,
+            stackStartFn: this.evalScripts,
+          })
+        );
+      }, timeout);
+
+      this.dom.window.addEventListener('error', (e) => {
+        reject(
+          new AssertionError({
+            operator: 'evalScripts',
+            // this `e` has no stack, so we must make due
+            message: `error thrown during evalScript of '${this.distPath}' \n error details: \n   message: '${e.message}'\n   file: '${e.filename}:${e.colno}'`,
+            stackStartFn: this.evalScripts,
+          })
+        );
+      });
 
       this.dom.window.addEventListener('load', () => {
         clearTimeout(timeoutId);

package/tests/helpers/ember.js

@@ -43,7 +43,7 @@ const willInterruptProcess = require('../../lib/utilities/will-interrupt-process
 module.exports = function ember(args, options) {
   let cliInstance;
   let ui = (options && options.UI) || MockUI;
-  let pkg = (options && options.package) || path.resolve(__dirname, '..', '..');
+  let packagePath = (options && options.package) || path.resolve(__dirname, '..', '..');
   let disableDependencyChecker = (options && options.disableDependencyChecker) || true;
   let inputStream = [];
   let outputStream = [];
@@ -87,7 +87,7 @@ module.exports = function ember(args, options) {
       // This prevents ember-cli from detecting any other package.json files
       // forcing ember-cli to act as the globally installed package
       npmPackage: 'ember-cli',
-      root: pkg,
+      root: packagePath,
     },
   });