Move the helpers in to a directory, so they aren't confused with top-…

…level config
embroider-build · Jul 17, 2023 · 387847b · 387847b
1 parent aa1bb47
commit 387847b
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 16 deletions.
diff --git a/tests/helpers.ts b/tests/helpers.ts
@@ -0,0 +1,4 @@
+export * from './helpers/assertions.js';
+export * from './helpers/fixtures.js';
+export * from './helpers/meta-helpers.js';
+export * from './helpers/utils.js';
diff --git a/tests/assertions.ts → tests/helpers/assertions.ts b/tests/assertions.ts → tests/helpers/assertions.ts
diff --git a/tests/fixtures.ts → tests/helpers/fixtures.ts b/tests/fixtures.ts → tests/helpers/fixtures.ts
@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const fixturesPath = path.join(__dirname, 'fixtures');
+const fixturesPath = path.join(__dirname, '../fixtures');
 
 /**
  * Returns the contents of a file from the "tests/fixtures" directory.

diff --git a/tests/test-helpers.ts → tests/helpers/meta-helpers.ts b/tests/test-helpers.ts → tests/helpers/meta-helpers.ts
diff --git a/tests/utils.ts → tests/helpers/utils.ts b/tests/utils.ts → tests/helpers/utils.ts
diff --git a/tests/smoke-tests/--addon-location.test.ts b/tests/smoke-tests/--addon-location.test.ts
@@ -2,8 +2,13 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-import { assertGeneratedCorrectly } from '../assertions.js';
-import { createAddon, createTmp, install, runScript } from '../utils.js';
+import {
+  assertGeneratedCorrectly,
+  createAddon,
+  createTmp,
+  install,
+  runScript,
+} from '../helpers.js';
 
 describe('--addon-location', () => {
   let cwd = '';

diff --git a/tests/smoke-tests/--addon-only.test.ts b/tests/smoke-tests/--addon-only.test.ts
@@ -2,7 +2,7 @@ import fse from 'fs-extra';
 import path from 'node:path';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-import { AddonHelper } from '../test-helpers.js';
+import { AddonHelper } from '../helpers.js';
 
 describe('--addon-only', () => {
   let helper = new AddonHelper({ packageManager: 'pnpm', args: ['--addon-only'] });

diff --git a/tests/smoke-tests/--test-app-location.test.ts b/tests/smoke-tests/--test-app-location.test.ts
@@ -2,8 +2,13 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-import { assertGeneratedCorrectly } from '../assertions.js';
-import { createAddon, createTmp, install, runScript } from '../utils.js';
+import {
+  assertGeneratedCorrectly,
+  createAddon,
+  createTmp,
+  install,
+  runScript,
+} from '../helpers.js';
 
 describe('--test-app-location', () => {
   let cwd = '';

diff --git a/tests/smoke-tests/--typescript.test.ts b/tests/smoke-tests/--typescript.test.ts
@@ -2,15 +2,15 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-import { assertGeneratedCorrectly } from '../assertions.js';
 import {
+  assertGeneratedCorrectly,
   createAddon,
   createTmp,
   dirContents,
   install,
   runScript,
   SUPPORTED_PACKAGE_MANAGERS,
-} from '../utils.js';
+} from '../helpers.js';
 
 for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
   describe(`--typescript with ${packageManager}`, () => {

diff --git a/tests/smoke-tests/defaults.test.ts b/tests/smoke-tests/defaults.test.ts
@@ -3,15 +3,15 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-import { assertGeneratedCorrectly } from '../assertions.js';
 import {
+  assertGeneratedCorrectly,
   createAddon,
   createTmp,
   dirContents,
   install,
   runScript,
   SUPPORTED_PACKAGE_MANAGERS,
-} from '../utils.js';
+} from '../helpers.js';
 
 for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
   describe(`defaults with ${packageManager}`, () => {

diff --git a/tests/smoke-tests/within-existing-monorepo/custom-locations.test.ts b/tests/smoke-tests/within-existing-monorepo/custom-locations.test.ts
@@ -3,9 +3,14 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-import { assertGeneratedCorrectly } from '../../assertions.js';
-import { readFixture } from '../../fixtures.js';
-import { createAddon, createTmp, install, runScript } from '../../utils.js';
+import {
+  assertGeneratedCorrectly,
+  createAddon,
+  createTmp,
+  install,
+  readFixture,
+  runScript,
+} from '../../helpers.js';
 
 let commonFixtures = {
   '.prettierrc.js': await readFixture('.prettierrc.js'),

diff --git a/tests/smoke-tests/within-existing-monorepo/defaults.test.ts b/tests/smoke-tests/within-existing-monorepo/defaults.test.ts
@@ -3,15 +3,15 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
-import { assertGeneratedCorrectly } from '../../assertions.js';
-import { readFixture } from '../../fixtures.js';
 import {
+  assertGeneratedCorrectly,
   createAddon,
   createTmp,
   install,
+  readFixture,
   runScript,
   SUPPORTED_PACKAGE_MANAGERS,
-} from '../../utils.js';
+} from '../../helpers.js';
 
 let commonFixtures = {
   '.prettierrc.js': await readFixture('.prettierrc.js'),