From 4d8cac30292681b29fea319000eeaafc979f5756 Mon Sep 17 00:00:00 2001 From: Michael Stewart Date: Tue, 29 Nov 2022 10:19:50 -0500 Subject: [PATCH] fix the legacy mocha tests --- packages/ember-cli-fastboot/test/fastboot-config-test.js | 3 ++- .../ember-cli-fastboot/test/fastboot-location-config-test.js | 3 ++- packages/ember-cli-fastboot/test/fastboot-location-test.js | 3 ++- packages/ember-cli-fastboot/test/package-json-test.js | 3 ++- packages/ember-cli-fastboot/test/request-details-test.js | 3 ++- packages/ember-cli-fastboot/test/root-url-test.js | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/ember-cli-fastboot/test/fastboot-config-test.js b/packages/ember-cli-fastboot/test/fastboot-config-test.js index b49d3bbe..4c8caa9b 100644 --- a/packages/ember-cli-fastboot/test/fastboot-config-test.js +++ b/packages/ember-cli-fastboot/test/fastboot-config-test.js @@ -16,7 +16,6 @@ describe('FastBoot config', function () { return app .create('fastboot-config', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -24,6 +23,8 @@ describe('FastBoot config', function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/fastboot-location-config-test.js b/packages/ember-cli-fastboot/test/fastboot-location-config-test.js index db9fa444..d2385a0e 100644 --- a/packages/ember-cli-fastboot/test/fastboot-location-config-test.js +++ b/packages/ember-cli-fastboot/test/fastboot-location-config-test.js @@ -16,7 +16,6 @@ describe('FastBootLocation Configuration', function () { return app .create('fastboot-location-config', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -24,6 +23,8 @@ describe('FastBootLocation Configuration', function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/fastboot-location-test.js b/packages/ember-cli-fastboot/test/fastboot-location-test.js index 407a9fa8..9acb3c9f 100644 --- a/packages/ember-cli-fastboot/test/fastboot-location-test.js +++ b/packages/ember-cli-fastboot/test/fastboot-location-test.js @@ -15,7 +15,6 @@ describe('FastBootLocation', function () { return app .create('fastboot-location', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -23,6 +22,8 @@ describe('FastBootLocation', function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/package-json-test.js b/packages/ember-cli-fastboot/test/package-json-test.js index 9bc668f2..97c06a0a 100644 --- a/packages/ember-cli-fastboot/test/package-json-test.js +++ b/packages/ember-cli-fastboot/test/package-json-test.js @@ -18,7 +18,6 @@ describe('generating package.json', function () { before(function () { return customApp .create('customized-outputpaths', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -26,6 +25,8 @@ describe('generating package.json', function () { customApp.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return customApp.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/request-details-test.js b/packages/ember-cli-fastboot/test/request-details-test.js index 672b397b..e7e7e7cd 100644 --- a/packages/ember-cli-fastboot/test/request-details-test.js +++ b/packages/ember-cli-fastboot/test/request-details-test.js @@ -18,6 +18,8 @@ function injectMiddlewareAddon(app) { }; delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); } @@ -32,7 +34,6 @@ describe('request details', function () { return app .create('request', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) diff --git a/packages/ember-cli-fastboot/test/root-url-test.js b/packages/ember-cli-fastboot/test/root-url-test.js index f3a0038c..a0f97605 100644 --- a/packages/ember-cli-fastboot/test/root-url-test.js +++ b/packages/ember-cli-fastboot/test/root-url-test.js @@ -16,7 +16,6 @@ describe('rootUrl acceptance', function () { return app .create('root-url', { - skipNpm: true, emberVersion: 'latest', emberDataVersion: 'latest', }) @@ -24,6 +23,8 @@ describe('rootUrl acceptance', function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; + // needed because @ember-data/store does `FastBoot.require('crypto')` + pkg.fastbootDependencies = ['crypto']; }); return app.run('npm', 'install'); })