wip: Try to fix tests

embroider-build · Feb 26, 2022 · fd94c6e · fd94c6e
1 parent d12cadb
commit fd94c6e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "**/qunit": "^2.14.1"
   },
   "devDependencies": {
+    "@babel/helper-regex": "^7.10.5",
     "@types/jest": "^24.0.0",
     "@typescript-eslint/eslint-plugin": "^4.1.1",
     "@typescript-eslint/parser": "^4.1.1",

diff --git a/tests/scenarios/scenarios.ts b/tests/scenarios/scenarios.ts
@@ -39,7 +39,7 @@ async function lts_3_28(project: Project) {
   project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data' });
 }
 
-async function release(project: Project) {
+export async function release(project: Project) {
   project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source-latest' });
   project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli-latest' });
   project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-latest' });

diff --git a/tests/scenarios/v2-addon-test.ts b/tests/scenarios/v2-addon-test.ts
@@ -1,5 +1,5 @@
-import { appScenarios, appReleaseScenario, baseAddon } from './scenarios';
-import { PreparedApp, Project } from 'scenario-tester';
+import { appScenarios, baseApp, baseAddon, release } from './scenarios';
+import { Scenarios, PreparedApp, Project } from 'scenario-tester';
 import QUnit from 'qunit';
 import merge from 'lodash/merge';
 import { AddonMeta } from '@embroider/shared-internals';
@@ -214,7 +214,7 @@ function buildV2AddonWithMacros() {
   return addon;
 }
 
-appReleaseScenario
+Scenarios.fromProject(baseApp)
   .map('v2-addon-from-auto-import', project => {
     project.addDevDependency(buildV2Addon());
     project.addDevDependency(buildIntermediateV1Addon());
@@ -512,7 +512,7 @@ appScenarios
 /**
  * These test(s) only support [email protected]+
  */
-appReleaseScenario
+Scenarios.fromProject(baseApp)
   .map('v2-addon-glimmer', project => {
     let meta: AddonMeta = {
       type: 'addon',
@@ -566,7 +566,7 @@ appReleaseScenario
       },
     });
     addon.linkDependency('@embroider/addon-shim', { baseDir: __dirname });
-    //addon.addDependency('@glimmer/tracking');
+    addon.addDependency('@glimmer/tracking');
 
     project.addDependency(addon);
 

diff --git a/yarn.lock b/yarn.lock
@@ -195,6 +195,13 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
   integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
 
+"@babel/helper-regex@^7.10.5":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
+  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
+  dependencies:
+    lodash "^4.17.19"
+
 "@babel/helper-remap-async-to-generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"