Merge pull request #447 from ef4/test-new-scenario-tester

upgrade scenario-tester
embroider-build · Sep 14, 2021 · a88004f · a88004f
2 parents 0fba64e + 7fca6e7
commit a88004f
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 115 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ember-auto-import/package.json b/packages/ember-auto-import/package.json
@@ -112,7 +112,7 @@
     "quick-temp": "^0.1.8",
     "qunit": "^2.6.1",
     "qunit-assertions-extra": "^0.8.5",
-    "scenario-tester": "^1.0.0",
+    "scenario-tester": "^2.0.1",
     "typescript": "4.3.5",
     "webpack": "^5.31.0"
   },

diff --git a/test-scenarios/conflict-test.ts b/test-scenarios/conflict-test.ts
@@ -1,7 +1,6 @@
-import { appScenarios } from './scenarios';
-import { PreparedApp, Project } from 'scenario-tester';
+import { appScenarios, baseAddon } from './scenarios';
+import { PreparedApp } from 'scenario-tester';
 import QUnit from 'qunit';
-import { dirname } from 'path';
 import merge from 'lodash/merge';
 const { module: Qmodule, test } = QUnit;
 
@@ -22,7 +21,7 @@ appScenarios
       },
     });
 
-    let addon = Project.fromDir(dirname(require.resolve('@ef4/addon-template/package.json')), { linkDeps: true });
+    let addon = baseAddon();
     addon.linkDependency('ember-auto-import', { baseDir: __dirname });
     addon.addDependency('inner-lib', '2.3.4', { requestedRange: '^2.0.0' });
     merge(addon.files, {

diff --git a/test-scenarios/doubly-indirect-test.ts b/test-scenarios/doubly-indirect-test.ts
@@ -1,12 +1,11 @@
-import { appScenarios } from './scenarios';
-import { PreparedApp, Project } from 'scenario-tester';
+import { appScenarios, baseAddon } from './scenarios';
+import { PreparedApp } from 'scenario-tester';
 import QUnit from 'qunit';
 import merge from 'lodash/merge';
-import { dirname } from 'path';
 const { module: Qmodule, test } = QUnit;
 
 function makeAddon() {
-  let addon = Project.fromDir(dirname(require.resolve('@ef4/addon-template/package.json')), { linkDeps: true });
+  let addon = baseAddon();
   addon.linkDependency('ember-auto-import', { baseDir: __dirname });
 
   addon.pkg.name = 'sample-addon';
@@ -72,7 +71,7 @@ function makeAddon() {
 }
 
 function makeIntermediateAddon() {
-  let addon = Project.fromDir(dirname(require.resolve('@ef4/addon-template/package.json')), { linkDeps: true });
+  let addon = baseAddon();
   addon.pkg.name = 'intermediate-addon';
   merge(addon.files, {
     app: {

diff --git a/test-scenarios/merged-test.ts b/test-scenarios/merged-test.ts
@@ -1,8 +1,7 @@
-import { appScenarios } from './scenarios';
-import { PreparedApp, Project } from 'scenario-tester';
+import { appScenarios, baseAddon } from './scenarios';
+import { PreparedApp } from 'scenario-tester';
 import QUnit from 'qunit';
 import merge from 'lodash/merge';
-import path from 'path';
 const { module: Qmodule, test } = QUnit;
 
 appScenarios
@@ -47,7 +46,7 @@ appScenarios
       },
     });
 
-    let addon = Project.fromDir(path.dirname(require.resolve('@ef4/addon-template/package.json')), { linkDeps: true });
+    let addon = baseAddon();
     addon.addDependency(innerLib.clone());
     addon.addDependency(innerLib2.clone());
     addon.linkDependency('ember-auto-import', { baseDir: __dirname });

diff --git a/test-scenarios/no-conflict-test.ts b/test-scenarios/no-conflict-test.ts
@@ -1,7 +1,6 @@
-import { appScenarios } from './scenarios';
-import { PreparedApp, Project } from 'scenario-tester';
+import { appScenarios, baseAddon } from './scenarios';
+import { PreparedApp } from 'scenario-tester';
 import QUnit from 'qunit';
-import { dirname } from 'path';
 import merge from 'lodash/merge';
 const { module: Qmodule, test } = QUnit;
 
@@ -21,7 +20,7 @@ appScenarios
       },
     });
 
-    let addon = Project.fromDir(dirname(require.resolve('@ef4/addon-template/package.json')), { linkDeps: true });
+    let addon = baseAddon();
     addon.linkDependency('ember-auto-import', { baseDir: __dirname });
     addon.addDependency('inner-lib', '1.3.4', { requestedRange: '^1.0.0' });
     merge(addon.files, {

diff --git a/test-scenarios/package.json b/test-scenarios/package.json
@@ -5,7 +5,7 @@
     "@types/qunit": "^2.11.1",
     "qunit": "^2.6.1",
     "ts-node": "^9.1.1",
-    "scenario-tester": "^1.0.0",
+    "scenario-tester": "^2.0.1",
     "jsdom": "^11.11.0"
   },
   "scripts": {

diff --git a/test-scenarios/scenarios.ts b/test-scenarios/scenarios.ts
@@ -101,11 +101,14 @@ export function supportMatrix(scenarios: Scenarios) {
 }
 
 export function baseApp() {
-  return Project.fromDir(dirname(require.resolve('@ef4/app-template/package.json')), { linkDeps: true });
+  return Project.fromDir(dirname(require.resolve('@ef4/app-template/package.json')), { linkDevDeps: true });
 }
 export const appScenarios = supportMatrix(Scenarios.fromProject(baseApp));
 
-export function baseAddon() {
-  return Project.fromDir(dirname(require.resolve('@ef4/addon-template/package.json')), { linkDeps: true });
+export function baseAddon(as: 'addon' | 'dummy-app' = 'addon') {
+  return Project.fromDir(dirname(require.resolve('@ef4/addon-template/package.json')), {
+    linkDeps: true,
+    linkDevDeps: as === 'dummy-app',
+  });
 }
-export const addonScenarios = supportMatrix(Scenarios.fromProject(baseAddon));
+export const addonScenarios = supportMatrix(Scenarios.fromProject(() => baseAddon('dummy-app')));