test: couple of clean ups in e2e tests

Split tests and remove disabled tests

Author: alan-agius4

tests/legacy-cli/e2e/tests/basic/build.ts

@@ -4,57 +4,21 @@ import { ng } from '../../utils/process';
 
 export default async function () {
   // Development build
-  const { stdout: stdoutDev } = await ng('build', '--configuration=development');
+  const { stdout } = await ng('build', '--configuration=development');
   await expectFileToMatch('dist/test-project/index.html', 'main.js');
-  if (stdoutDev.includes('Estimated Transfer Size')) {
+
+  if (stdout.includes('Estimated Transfer Size')) {
     throw new Error(
-      `Expected stdout not to contain 'Estimated Transfer Size' but it did.\n${stdoutDev}`,
+      `Expected stdout not to contain 'Estimated Transfer Size' but it did.\n${stdout}`,
     );
   }
 
-  // Named Development build
-  await ng('build', 'test-project', '--configuration=development');
-  await ng('build', '--configuration=development', 'test-project', '--no-progress');
-  await ng('build', '--configuration=development', '--no-progress', 'test-project');
-
   // Production build
-  const { stderr: stderrProgress, stdout } = await ng('build', '--progress');
+  await ng('build');
   if (getGlobalVariable('argv')['esbuild']) {
     // esbuild uses an 8 character hash
     await expectFileToMatch('dist/test-project/index.html', /main\.[a-zA-Z0-9]{8}\.js/);
-
-    // EXPERIMENTAL_ESBUILD: esbuild does not yet output build stats
-    return;
   } else {
     await expectFileToMatch('dist/test-project/index.html', /main\.[a-zA-Z0-9]{16}\.js/);
   }
-
-  if (!stdout.includes('Initial Total')) {
-    throw new Error(`Expected stdout to contain 'Initial Total' but it did not.\n${stdout}`);
-  }
-
-  if (!stdout.includes('Estimated Transfer Size')) {
-    throw new Error(
-      `Expected stdout to contain 'Estimated Transfer Size' but it did not.\n${stdout}`,
-    );
-  }
-
-  const logs: string[] = [
-    'Browser application bundle generation complete',
-    'Copying assets complete',
-    'Index html generation complete',
-  ];
-
-  for (const log of logs) {
-    if (!stderrProgress.includes(log)) {
-      throw new Error(`Expected stderr to contain '${log}' but didn't.\n${stderrProgress}`);
-    }
-  }
-
-  const { stderr: stderrNoProgress } = await ng('build', '--no-progress');
-  for (const log of logs) {
-    if (stderrNoProgress.includes(log)) {
-      throw new Error(`Expected stderr not to contain '${log}' but it did.\n${stderrProgress}`);
-    }
-  }
 }

tests/legacy-cli/e2e/tests/basic/e2e.ts

@@ -1,64 +1,10 @@
-import { ng, execAndWaitForOutputToMatch, killAllProcesses } from '../../utils/process';
+import { silentNg } from '../../utils/process';
 import { expectToFail } from '../../utils/utils';
-import { moveFile, copyFile, replaceInFile } from '../../utils/fs';
 
-export default function () {
-  return (
-    Promise.resolve()
-      // Should fail without serving
-      .then(() => expectToFail(() => ng('e2e', 'test-project', '--dev-server-target=')))
-      // These should work.
-      .then(() => ng('e2e', 'test-project'))
-      .then(() => ng('e2e', 'test-project', '--dev-server-target=test-project:serve'))
-      // Should accept different config file
-      .then(() => moveFile('./e2e/protractor.conf.js', './e2e/renamed-protractor.conf.js'))
-      .then(() => ng('e2e', 'test-project', '--protractor-config=e2e/renamed-protractor.conf.js'))
-      .then(() => moveFile('./e2e/renamed-protractor.conf.js', './e2e/protractor.conf.js'))
-      // Should accept different multiple spec files
-      .then(() => moveFile('./e2e/src/app.e2e-spec.ts', './e2e/src/renamed-app.e2e-spec.ts'))
-      .then(() =>
-        copyFile('./e2e/src/renamed-app.e2e-spec.ts', './e2e/src/another-app.e2e-spec.ts'),
-      )
-      .then(() =>
-        ng(
-          'e2e',
-          'test-project',
-          '--specs',
-          './e2e/renamed-app.e2e-spec.ts',
-          '--specs',
-          './e2e/another-app.e2e-spec.ts',
-        ),
-      )
-      // Rename the spec back to how it was.
-      .then(() => moveFile('./e2e/src/renamed-app.e2e-spec.ts', './e2e/src/app.e2e-spec.ts'))
-      // Suites block need to be added in the protractor.conf.js file to test suites
-      .then(() =>
-        replaceInFile(
-          'e2e/protractor.conf.js',
-          `allScriptsTimeout: 11000,`,
-          `allScriptsTimeout: 11000,
-          suites: {
-            app: './e2e/src/app.e2e-spec.ts'
-          },
-    `,
-        ),
-      )
-      .then(() => ng('e2e', 'test-project', '--suite=app'))
-      // Remove suites block from protractor.conf.js file after testing suites
-      .then(() =>
-        replaceInFile(
-          'e2e/protractor.conf.js',
-          `allScriptsTimeout: 11000,
-          suites: {
-            app: './e2e/src/app.e2e-spec.ts'
-          },
-    `,
-          `allScriptsTimeout: 11000,`,
-        ),
-      )
-      // Should run side-by-side with `ng serve`
-      .then(() => execAndWaitForOutputToMatch('ng', ['serve'], / Compiled successfully./))
-      .then(() => ng('e2e', 'test-project', '--dev-server-target='))
-      .finally(() => killAllProcesses())
-  );
+export default async function () {
+  await expectToFail(() => silentNg('e2e', 'test-project', '--dev-server-target='));
+
+  // These should work.
+  await silentNg('e2e', 'test-project');
+  await silentNg('e2e', 'test-project', '--dev-server-target=test-project:serve');
 }