feat: run all app e2e tests when configuring new sub apps

When a new SubApp is added to a project the project is now configured to run all E2E tests by default. Closes nestjs#1167
MitchellCash · Sep 7, 2022 · c50bc2c · c50bc2c
1 parent 3dc496c
commit c50bc2c
Showing 1 changed file with 58 additions and 13 deletions.
diff --git a/src/lib/sub-app/sub-app.factory.ts b/src/lib/sub-app/sub-app.factory.ts
@@ -43,7 +43,7 @@ export function main(options: SubAppOptions): Rule {
   options = transform(options);
   return chain([
     updateTsConfig(),
-    updatePackageJson(options, appName),
+    updatePackageJson(options),
     (tree, context) =>
       isMonorepo(tree)
         ? noop()(tree, context)
@@ -52,6 +52,7 @@ export function main(options: SubAppOptions): Rule {
             moveDefaultAppToApps(options.path, appName, options.sourceRoot),
           ])(tree, context),
     addAppsToCliOptions(options.path, options.name, appName),
+    addAppsToE2eOptions(options.path, options.name, appName),
     branchAndMerge(mergeWith(generate(options))),
   ]);
 }
@@ -145,7 +146,7 @@ function updateTsConfig() {
   };
 }
 
-function updatePackageJson(options: SubAppOptions, defaultAppName: string) {
+function updatePackageJson(options: SubAppOptions) {
   return (host: Tree) => {
     if (!host.exists('package.json')) {
       return host;
@@ -154,7 +155,7 @@ function updatePackageJson(options: SubAppOptions, defaultAppName: string) {
       host,
       'package.json',
       (packageJson: Record<string, any>) => {
-        updateNpmScripts(packageJson.scripts, options, defaultAppName);
+        updateNpmScripts(packageJson.scripts, options);
         updateJestOptions(packageJson.jest, options);
       },
     );
@@ -164,7 +165,6 @@ function updatePackageJson(options: SubAppOptions, defaultAppName: string) {
 function updateNpmScripts(
   scripts: Record<string, any>,
   options: SubAppOptions,
-  defaultAppName: string,
 ) {
   if (!scripts) {
     return;
@@ -178,15 +178,11 @@ function updateNpmScripts(
     scripts[defaultTestScriptName] &&
     scripts[defaultTestScriptName].indexOf(options.path as string) < 0
   ) {
-    const defaultTestDir = 'test';
-    const newTestDir = join(
-      options.path as Path,
-      defaultAppName,
-      defaultTestDir,
-    );
-    scripts[defaultTestScriptName] = (
-      scripts[defaultTestScriptName] as string
-    ).replace(defaultTestDir, newTestDir);
+    const defaultSourceRoot =
+      options.rootDir !== undefined ? options.rootDir : DEFAULT_APPS_PATH;
+    scripts[
+      defaultTestScriptName
+      ] = `jest --config ${defaultSourceRoot}/jest-e2e.json`;
   }
   if (
     scripts[defaultFormatScriptName] &&
@@ -299,6 +295,40 @@ function addAppsToCliOptions(
   };
 }
 
+function addAppsToE2eOptions(
+  projectRoot: string,
+  projectName: string,
+  appName: string,
+): Rule {
+  return (host: Tree) => {
+    const rootE2eFileExists = host.exists('apps/jest-e2e.json');
+    if (!rootE2eFileExists) {
+      host.create('apps/jest-e2e.json', '{}');
+    }
+
+    return updateJsonFile(
+      host,
+      'apps/jest-e2e.json',
+      (optionsFile: Record<string, any>) => {
+        updateMainAppE2eOptions(optionsFile, projectRoot, appName);
+        if (!optionsFile.projects) {
+          optionsFile.projects = [] as string[];
+        }
+
+        for (const project of optionsFile.projects as string) {
+          if (project.includes(`apps/${projectName}/test/jest-e2e.json`)) {
+            throw new SchematicsException(
+              `Project "${projectName}" exists in the root E2E config already.`,
+            );
+          }
+        }
+
+        optionsFile.projects.push(`apps/${projectName}/test/jest-e2e.json`);
+      },
+    );
+  }
+}
+
 function updateMainAppOptions(
   optionsFile: Record<string, any>,
   projectRoot: string,
@@ -337,6 +367,21 @@ function updateMainAppOptions(
   };
 }
 
+function updateMainAppE2eOptions(
+  optionsFile: Record<string, any>,
+  projectRoot: string,
+  appName: string,
+) {
+  if (optionsFile.projects) {
+    return;
+  }
+  const rootFilePath = join(projectRoot as Path, appName);
+  const e2ePath = join(rootFilePath, 'test/jest-e2e.json');
+
+  optionsFile.projects = [] as string[];
+  optionsFile.projects.push(e2ePath);
+}
+
 function generateWorkspace(options: SubAppOptions, appName: string): Source {
   const path = join(options.path as Path, appName);
   return apply(url(join('./workspace' as Path, options.language)), [