Move to root fixtures

jpmorganchase · Aug 18, 2022 · 876b607 · 876b607
1 parent 53d1338
commit 876b607
Show file tree

Hide file tree

Showing 72 changed files with 25 additions and 48 deletions.
diff --git a/...s__/__fixtures__/ghost-testing/.gitignore → __fixtures__/ghost-testing/.gitignore b/...s__/__fixtures__/ghost-testing/.gitignore → __fixtures__/ghost-testing/.gitignore
diff --git a/...ests__/__fixtures__/ghost-testing/.yarnrc → __fixtures__/ghost-testing/.yarnrc b/...ests__/__fixtures__/ghost-testing/.yarnrc → __fixtures__/ghost-testing/.yarnrc
diff --git a/...ts__/__fixtures__/ghost-testing/README.md → __fixtures__/ghost-testing/README.md b/...ts__/__fixtures__/ghost-testing/README.md → __fixtures__/ghost-testing/README.md
diff --git a/...res__/ghost-testing/modular/setupTests.ts → ...res__/ghost-testing/modular/setupTests.ts b/...res__/ghost-testing/modular/setupTests.ts → ...res__/ghost-testing/modular/setupTests.ts
diff --git a/...es__/ghost-testing/package.json.incognito → __fixtures__/ghost-testing/package.json b/...es__/ghost-testing/package.json.incognito → __fixtures__/ghost-testing/package.json
diff --git a/...xtures__/ghost-testing/packages/README.md → ...xtures__/ghost-testing/packages/README.md b/...xtures__/ghost-testing/packages/README.md → ...xtures__/ghost-testing/packages/README.md
diff --git a/...res__/ghost-testing/packages/a/a-dummy.ts → ...res__/ghost-testing/packages/a/a-dummy.ts b/...res__/ghost-testing/packages/a/a-dummy.ts → ...res__/ghost-testing/packages/a/a-dummy.ts
diff --git a/...testing/packages/a/package.json.incognito → ...s__/ghost-testing/packages/a/package.json b/...testing/packages/a/package.json.incognito → ...s__/ghost-testing/packages/a/package.json
diff --git a/...esting/packages/a/src/__tests__/a.test.ts → ...esting/packages/a/src/__tests__/a.test.ts b/...esting/packages/a/src/__tests__/a.test.ts → ...esting/packages/a/src/__tests__/a.test.ts
diff --git a/...es/a/src/__tests__/utils/a-nested.test.ts → ...es/a/src/__tests__/utils/a-nested.test.ts b/...es/a/src/__tests__/utils/a-nested.test.ts → ...es/a/src/__tests__/utils/a-nested.test.ts
diff --git a/...s__/ghost-testing/packages/a/src/index.ts → ...s__/ghost-testing/packages/a/src/index.ts b/...s__/ghost-testing/packages/a/src/index.ts → ...s__/ghost-testing/packages/a/src/index.ts
diff --git a/...testing/packages/b/package.json.incognito → ...s__/ghost-testing/packages/b/package.json b/...testing/packages/b/package.json.incognito → ...s__/ghost-testing/packages/b/package.json
diff --git a/...sting/packages/b/src/__tests__/b-dummy.ts → ...sting/packages/b/src/__tests__/b-dummy.ts b/...sting/packages/b/src/__tests__/b-dummy.ts → ...sting/packages/b/src/__tests__/b-dummy.ts
diff --git a/...esting/packages/b/src/__tests__/b.test.ts → ...esting/packages/b/src/__tests__/b.test.ts b/...esting/packages/b/src/__tests__/b.test.ts → ...esting/packages/b/src/__tests__/b.test.ts
diff --git a/...es/b/src/__tests__/utils/b-nested.test.ts → ...es/b/src/__tests__/utils/b-nested.test.ts b/...es/b/src/__tests__/utils/b-nested.test.ts → ...es/b/src/__tests__/utils/b-nested.test.ts
diff --git a/...s__/ghost-testing/packages/b/src/index.ts → ...s__/ghost-testing/packages/b/src/index.ts b/...s__/ghost-testing/packages/b/src/index.ts → ...s__/ghost-testing/packages/b/src/index.ts
diff --git a/...res__/ghost-testing/packages/c/c-dummy.ts → ...res__/ghost-testing/packages/c/c-dummy.ts b/...res__/ghost-testing/packages/c/c-dummy.ts → ...res__/ghost-testing/packages/c/c-dummy.ts
diff --git a/...testing/packages/c/package.json.incognito → ...s__/ghost-testing/packages/c/package.json b/...testing/packages/c/package.json.incognito → ...s__/ghost-testing/packages/c/package.json
diff --git a/...esting/packages/c/src/__tests__/c.test.ts → ...esting/packages/c/src/__tests__/c.test.ts b/...esting/packages/c/src/__tests__/c.test.ts → ...esting/packages/c/src/__tests__/c.test.ts
diff --git a/...es/c/src/__tests__/utils/c-nested.test.ts → ...es/c/src/__tests__/utils/c-nested.test.ts b/...es/c/src/__tests__/utils/c-nested.test.ts → ...es/c/src/__tests__/utils/c-nested.test.ts
diff --git a/...s__/ghost-testing/packages/c/src/index.ts → ...s__/ghost-testing/packages/c/src/index.ts b/...s__/ghost-testing/packages/c/src/index.ts → ...s__/ghost-testing/packages/c/src/index.ts
diff --git a/...testing/packages/d/package.json.incognito → ...s__/ghost-testing/packages/d/package.json b/...testing/packages/d/package.json.incognito → ...s__/ghost-testing/packages/d/package.json
diff --git a/...sting/packages/d/src/__tests__/d-dummy.ts → ...sting/packages/d/src/__tests__/d-dummy.ts b/...sting/packages/d/src/__tests__/d-dummy.ts → ...sting/packages/d/src/__tests__/d-dummy.ts
diff --git a/...esting/packages/d/src/__tests__/d.test.ts → ...esting/packages/d/src/__tests__/d.test.ts b/...esting/packages/d/src/__tests__/d.test.ts → ...esting/packages/d/src/__tests__/d.test.ts
diff --git a/...es/d/src/__tests__/utils/d-nested.test.ts → ...es/d/src/__tests__/utils/d-nested.test.ts b/...es/d/src/__tests__/utils/d-nested.test.ts → ...es/d/src/__tests__/utils/d-nested.test.ts
diff --git a/...s__/ghost-testing/packages/d/src/index.ts → ...s__/ghost-testing/packages/d/src/index.ts b/...s__/ghost-testing/packages/d/src/index.ts → ...s__/ghost-testing/packages/d/src/index.ts
diff --git a/...testing/packages/e/package.json.incognito → ...s__/ghost-testing/packages/e/package.json b/...testing/packages/e/package.json.incognito → ...s__/ghost-testing/packages/e/package.json
diff --git a/...sting/packages/e/src/__tests__/e-dummy.ts → ...sting/packages/e/src/__tests__/e-dummy.ts b/...sting/packages/e/src/__tests__/e-dummy.ts → ...sting/packages/e/src/__tests__/e-dummy.ts
diff --git a/...esting/packages/e/src/__tests__/e.test.ts → ...esting/packages/e/src/__tests__/e.test.ts b/...esting/packages/e/src/__tests__/e.test.ts → ...esting/packages/e/src/__tests__/e.test.ts
diff --git a/...es/e/src/__tests__/utils/e-nested.test.ts → ...es/e/src/__tests__/utils/e-nested.test.ts b/...es/e/src/__tests__/utils/e-nested.test.ts → ...es/e/src/__tests__/utils/e-nested.test.ts
diff --git a/...s__/ghost-testing/packages/e/src/index.ts → ...s__/ghost-testing/packages/e/src/index.ts b/...s__/ghost-testing/packages/e/src/index.ts → ...s__/ghost-testing/packages/e/src/index.ts
diff --git a/.../__fixtures__/ghost-testing/tsconfig.json → __fixtures__/ghost-testing/tsconfig.json b/.../__fixtures__/ghost-testing/tsconfig.json → __fixtures__/ghost-testing/tsconfig.json
diff --git a/__fixtures__/clean-workspace-1/package.json → ...-workspace/clean-workspace-1/package.json b/__fixtures__/clean-workspace-1/package.json → ...-workspace/clean-workspace-1/package.json
diff --git a/...workspace-1/packages/app-one/package.json → ...workspace-1/packages/app-one/package.json b/...workspace-1/packages/app-one/package.json → ...workspace-1/packages/app-one/package.json
diff --git a/...space-1/packages/package-one/package.json → ...space-1/packages/package-one/package.json b/...space-1/packages/package-one/package.json → ...space-1/packages/package-one/package.json
diff --git a/...space-1/packages/package-two/package.json → ...space-1/packages/package-two/package.json b/...space-1/packages/package-two/package.json → ...space-1/packages/package-two/package.json
diff --git a/__fixtures__/clean-workspace-2/package.json → ...-workspace/clean-workspace-2/package.json b/__fixtures__/clean-workspace-2/package.json → ...-workspace/clean-workspace-2/package.json
diff --git a/...workspace-2/packages/app-one/package.json → ...workspace-2/packages/app-one/package.json b/...workspace-2/packages/app-one/package.json → ...workspace-2/packages/app-one/package.json
diff --git a/...space-2/packages/package-one/package.json → ...space-2/packages/package-one/package.json b/...space-2/packages/package-one/package.json → ...space-2/packages/package-one/package.json
diff --git a/...space-2/packages/package-two/package.json → ...space-2/packages/package-two/package.json b/...space-2/packages/package-two/package.json → ...space-2/packages/package-two/package.json
diff --git a/__fixtures__/clean-workspace-3/package.json → ...-workspace/clean-workspace-3/package.json b/__fixtures__/clean-workspace-3/package.json → ...-workspace/clean-workspace-3/package.json
diff --git a/...workspace-3/packages/app-one/package.json → ...workspace-3/packages/app-one/package.json b/...workspace-3/packages/app-one/package.json → ...workspace-3/packages/app-one/package.json
diff --git a/...pace-3/packages/package-four/package.json → ...pace-3/packages/package-four/package.json b/...pace-3/packages/package-four/package.json → ...pace-3/packages/package-four/package.json
diff --git a/...space-3/packages/package-one/package.json → ...space-3/packages/package-one/package.json b/...space-3/packages/package-one/package.json → ...space-3/packages/package-one/package.json
diff --git a/...ace-3/packages/package-three/package.json → ...ace-3/packages/package-three/package.json b/...ace-3/packages/package-three/package.json → ...ace-3/packages/package-three/package.json
diff --git a/...space-3/packages/package-two/package.json → ...space-3/packages/package-two/package.json b/...space-3/packages/package-two/package.json → ...space-3/packages/package-two/package.json
diff --git a/...xtures__/invalid-workspace-1/package.json → ...orkspace/invalid-workspace-1/package.json b/...xtures__/invalid-workspace-1/package.json → ...orkspace/invalid-workspace-1/package.json
diff --git a/...workspace-1/packages/app-one/package.json → ...workspace-1/packages/app-one/package.json b/...workspace-1/packages/app-one/package.json → ...workspace-1/packages/app-one/package.json
diff --git a/...space-1/packages/package-one/package.json → ...space-1/packages/package-one/package.json b/...space-1/packages/package-one/package.json → ...space-1/packages/package-one/package.json
diff --git a/...space-1/packages/package-two/package.json → ...space-1/packages/package-two/package.json b/...space-1/packages/package-two/package.json → ...space-1/packages/package-two/package.json
diff --git a/...xtures__/invalid-workspace-2/package.json → ...orkspace/invalid-workspace-2/package.json b/...xtures__/invalid-workspace-2/package.json → ...orkspace/invalid-workspace-2/package.json
diff --git a/...workspace-2/packages/app-one/package.json → ...workspace-2/packages/app-one/package.json b/...workspace-2/packages/app-one/package.json → ...workspace-2/packages/app-one/package.json
diff --git a/...space-2/packages/package-one/package.json → ...space-2/packages/package-one/package.json b/...space-2/packages/package-one/package.json → ...space-2/packages/package-one/package.json
diff --git a/...space-2/packages/package-two/package.json → ...space-2/packages/package-two/package.json b/...space-2/packages/package-two/package.json → ...space-2/packages/package-two/package.json
diff --git a/...xtures__/invalid-workspace-3/package.json → ...orkspace/invalid-workspace-3/package.json b/...xtures__/invalid-workspace-3/package.json → ...orkspace/invalid-workspace-3/package.json
diff --git a/...workspace-3/packages/app-one/package.json → ...workspace-3/packages/app-one/package.json b/...workspace-3/packages/app-one/package.json → ...workspace-3/packages/app-one/package.json
diff --git a/...space-3/packages/package-one/package.json → ...space-3/packages/package-one/package.json b/...space-3/packages/package-one/package.json → ...space-3/packages/package-one/package.json
diff --git a/...space-3/packages/package-two/package.json → ...space-3/packages/package-two/package.json b/...space-3/packages/package-two/package.json → ...space-3/packages/package-two/package.json
diff --git a/...xtures__/invalid-workspace-4/package.json → ...orkspace/invalid-workspace-4/package.json b/...xtures__/invalid-workspace-4/package.json → ...orkspace/invalid-workspace-4/package.json
diff --git a/...workspace-4/packages/app-one/package.json → ...workspace-4/packages/app-one/package.json b/...workspace-4/packages/app-one/package.json → ...workspace-4/packages/app-one/package.json
diff --git a/...space-4/packages/package-one/package.json → ...space-4/packages/package-one/package.json b/...space-4/packages/package-one/package.json → ...space-4/packages/package-one/package.json
diff --git a/...space-4/packages/package-two/package.json → ...space-4/packages/package-two/package.json b/...space-4/packages/package-two/package.json → ...space-4/packages/package-two/package.json
diff --git a/...xtures__/invalid-workspace-5/package.json → ...orkspace/invalid-workspace-5/package.json b/...xtures__/invalid-workspace-5/package.json → ...orkspace/invalid-workspace-5/package.json
diff --git a/...workspace-5/packages/app-one/package.json → ...workspace-5/packages/app-one/package.json b/...workspace-5/packages/app-one/package.json → ...workspace-5/packages/app-one/package.json
diff --git a/...space-5/packages/package-one/package.json → ...space-5/packages/package-one/package.json b/...space-5/packages/package-one/package.json → ...space-5/packages/package-one/package.json
diff --git a/...space-5/packages/package-two/package.json → ...space-5/packages/package-two/package.json b/...space-5/packages/package-two/package.json → ...space-5/packages/package-two/package.json
diff --git a/...ures__/mismatched-dependency/package.json → ...kspace/mismatched-dependency/package.json b/...ures__/mismatched-dependency/package.json → ...kspace/mismatched-dependency/package.json
diff --git a/...-dependency/packages/app-one/package.json → ...-dependency/packages/app-one/package.json b/...-dependency/packages/app-one/package.json → ...-dependency/packages/app-one/package.json
diff --git a/...endency/packages/package-one/package.json → ...endency/packages/package-one/package.json b/...endency/packages/package-one/package.json → ...endency/packages/package-one/package.json
diff --git a/...endency/packages/package-two/package.json → ...endency/packages/package-two/package.json b/...endency/packages/package-two/package.json → ...endency/packages/package-two/package.json
diff --git a/packages/modular-scripts/src/__tests__/test.test.ts b/packages/modular-scripts/src/__tests__/test.test.ts
@@ -82,34 +82,22 @@ describe('Modular test command', () => {
   describe('test command can successfully do selective tests based on the state of the repository', () => {
     const fixturesFolder = path.join(
       __dirname,
+      Array.from({ length: 4 }).reduce<string>(
+        (acc) => `${acc}..${path.sep}`,
+        '',
+      ),
       '__fixtures__',
       'ghost-testing',
     );
+
     const currentModularFolder = getModularRoot();
     let randomOutputFolder: string;
 
-    beforeEach(async () => {
+    beforeEach(() => {
       // Create random dir
       randomOutputFolder = tmp.dirSync({ unsafeCleanup: true }).name;
       fs.copySync(fixturesFolder, randomOutputFolder);
 
-      // Get all the files, recursively, and rename the .incognito files
-      const fileList = await getFileList(randomOutputFolder);
-      // Generate an array of promises that we can wait parallely on with Promise.all
-      await Promise.all(
-        fileList.reduce<Promise<void>[]>((acc, filePath) => {
-          if (path.basename(filePath) === 'package.json.incognito') {
-            acc.push(
-              fs.rename(
-                filePath,
-                path.join(path.dirname(filePath), 'package.json'),
-              ),
-            );
-          }
-          return acc;
-        }, []),
-      );
-
       // Create git repo & commit
       if (process.env.GIT_AUTHOR_NAME && process.env.GIT_AUTHOR_EMAIL) {
         execa.sync('git', [
@@ -228,19 +216,3 @@ function runRemoteModularTest(
     },
   );
 }
-
-// Recursively get all files in a directory and its subdirectories
-async function getFileList(dirName: string): Promise<string[]> {
-  let files: string[] = [];
-  const items = await fs.readdir(dirName, { withFileTypes: true });
-
-  for (const item of items) {
-    if (item.isDirectory()) {
-      files = [...files, ...(await getFileList(`${dirName}/${item.name}`))];
-    } else {
-      files.push(`${dirName}/${item.name}`);
-    }
-  }
-
-  return files;
-}
diff --git a/packages/workspace-resolver/src/__tests__/resolve-workspace.test.ts b/packages/workspace-resolver/src/__tests__/resolve-workspace.test.ts
@@ -10,14 +10,19 @@ import path from 'path';
 const dirsUp = 4;
 const traverseUp = Array.from({ length: dirsUp })
   .map(() => `..`)
-  .join(path.sep)
-  .concat(path.sep);
-const fixturesPath = `${__dirname}${path.sep}${traverseUp}__fixtures__${path.sep}`;
+  .join(path.sep);
+
+const fixturesPath = path.join(
+  __dirname,
+  traverseUp,
+  '__fixtures__',
+  'resolve-workspace',
+);
 
 describe('@modular-scripts/workspace-resolver', () => {
   describe('resolveWorkspace', () => {
     it('resolves a clean workspace, detecting modular packages as appropriate', async () => {
-      const projectRoot = `${fixturesPath}clean-workspace-1`;
+      const projectRoot = path.join(fixturesPath, 'clean-workspace-1');
       const [allPackages] = await resolveWorkspace(projectRoot, projectRoot);
       expect(allPackages.has('clean-workspace-1')).toEqual(true);
       expect(allPackages.has('app-one')).toEqual(true);
@@ -28,7 +33,7 @@ describe('@modular-scripts/workspace-resolver', () => {
     // This covers the alternative object workspaces syntax that yarn supports
     // See https://classic.yarnpkg.com/blog/2018/02/15/nohoist/
     it('resolves a clean workspace (using object workspaces syntax)', async () => {
-      const projectRoot = `${fixturesPath}clean-workspace-2`;
+      const projectRoot = path.join(fixturesPath, 'clean-workspace-2');
       const [allPackages] = await resolveWorkspace(projectRoot, projectRoot);
       expect(allPackages.has('clean-workspace-2')).toEqual(true);
       expect(allPackages.has('app-one')).toEqual(true);
@@ -37,7 +42,7 @@ describe('@modular-scripts/workspace-resolver', () => {
     });
 
     it('resolves a clean workspace (using workspace ranges)', async () => {
-      const projectRoot = `${fixturesPath}clean-workspace-3`;
+      const projectRoot = path.join(fixturesPath, 'clean-workspace-3');
       const [allPackages] = await resolveWorkspace(projectRoot, projectRoot);
       expect(allPackages.has('clean-workspace-3')).toEqual(true);
       expect(allPackages.has('app-one')).toEqual(true);
@@ -48,7 +53,7 @@ describe('@modular-scripts/workspace-resolver', () => {
     });
 
     it('does not support nested modular roots', async () => {
-      const projectRoot = `${fixturesPath}invalid-workspace-1`;
+      const projectRoot = path.join(fixturesPath, 'invalid-workspace-1');
       let thrown = false;
       let message = '';
 
@@ -68,7 +73,7 @@ describe('@modular-scripts/workspace-resolver', () => {
     });
 
     it('does not support nested yarn workspaces (implementation 1)', async () => {
-      const projectRoot = `${fixturesPath}invalid-workspace-2`;
+      const projectRoot = path.join(fixturesPath, 'invalid-workspace-2');
       let thrown = false;
       let message = '';
 
@@ -88,7 +93,7 @@ describe('@modular-scripts/workspace-resolver', () => {
     });
 
     it('does not support nested yarn workspaces (implementation 2)', async () => {
-      const projectRoot = `${fixturesPath}invalid-workspace-3`;
+      const projectRoot = path.join(fixturesPath, 'invalid-workspace-3');
       let thrown = false;
       let message = '';
 
@@ -108,7 +113,7 @@ describe('@modular-scripts/workspace-resolver', () => {
     });
 
     it('does not support packages with no name', async () => {
-      const projectRoot = `${fixturesPath}invalid-workspace-4`;
+      const projectRoot = path.join(fixturesPath, 'invalid-workspace-4');
       let thrown = false;
       let message = '';
 
@@ -128,7 +133,7 @@ describe('@modular-scripts/workspace-resolver', () => {
     });
 
     it('does not support packages with no version', async () => {
-      const projectRoot = `${fixturesPath}invalid-workspace-5`;
+      const projectRoot = path.join(fixturesPath, 'invalid-workspace-5');
       let thrown = false;
       let message = '';
 
@@ -150,7 +155,7 @@ describe('@modular-scripts/workspace-resolver', () => {
 
   describe('analyzeWorkspaceDependencies', () => {
     it('correctly identifies workspace dependencies for a clean workspace', async () => {
-      const projectRoot = `${fixturesPath}clean-workspace-1`;
+      const projectRoot = path.join(fixturesPath, 'clean-workspace-1');
       const [allPackages] = await resolveWorkspace(projectRoot, projectRoot);
 
       const result = analyzeWorkspaceDependencies(allPackages);
@@ -175,7 +180,7 @@ describe('@modular-scripts/workspace-resolver', () => {
     });
 
     it('correctly identifies mismatched dependencies', async () => {
-      const projectRoot = `${fixturesPath}mismatched-dependency`;
+      const projectRoot = path.join(fixturesPath, 'mismatched-dependency');
       const [allPackages] = await resolveWorkspace(projectRoot, projectRoot);
 
       const result = analyzeWorkspaceDependencies(allPackages);
@@ -200,7 +205,7 @@ describe('@modular-scripts/workspace-resolver', () => {
     });
 
     it('correctly identifies dependencies (workspace range)', async () => {
-      const projectRoot = `${fixturesPath}clean-workspace-3`;
+      const projectRoot = path.join(fixturesPath, 'clean-workspace-3');
       const [allPackages] = await resolveWorkspace(projectRoot, projectRoot);
 
       // Matches explanation (version 1.0.0):