test: enable app-shell e2e test

Author: alan-agius4

tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts

@@ -1,37 +1,26 @@
-import { ng, npm } from '../../utils/process';
-import { expectFileToMatch, appendToFile } from '../../utils/fs';
 import { getGlobalVariable } from '../../utils/env';
-import { expectToFail } from '../../utils/utils';
+import { appendToFile, expectFileToMatch } from '../../utils/fs';
+import { ng, silentNpm } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { readNgVersion } from '../../utils/version';
 
 
-export default function () {
+export default async function () {
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
-    return Promise.resolve();
+    return;
   }
 
-  let platformServerVersion = readNgVersion();
+  await appendToFile('src/app/app.component.html', '<router-outlet></router-outlet>');
+  await ng('generate', 'appShell', '--client-project', 'test-project');
+  await updateJsonFile('package.json', packageJson => {
+    const dependencies = packageJson['dependencies'];
+    dependencies['@angular/platform-server'] = getGlobalVariable('argv')['ng-snapshots']
+      ? 'github:angular/platform-server-builds'
+      : readNgVersion();
+  });
 
-  if (getGlobalVariable('argv')['ng-snapshots']) {
-    platformServerVersion = 'github:angular/platform-server-builds';
-  }
-
-
-  return Promise.resolve()
-    .then(() => expectToFail(() => {
-      return ng('generate', 'appShell', '--universal-app', 'universal');
-    })
-    .then(() => appendToFile('src/app/app.component.html', '<router-outlet></router-outlet>'))
-    .then(() => ng('generate', 'appShell', '--universal-app', 'universal'))
-    .then(() => updateJsonFile('package.json', packageJson => {
-      const dependencies = packageJson['dependencies'];
-      dependencies['@angular/platform-server'] = platformServerVersion;
-    })
-    .then(() => npm('install'))
-    .then(() => ng('build', '--optimization'))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /app-shell works!/))
-    .then(() => ng('build', '--optimization', '--skip-app-shell'))
-    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/index.html', /app-shell works!/)));
+  await silentNpm('install');
+  await ng('run', 'test-project:app-shell');
+  await expectFileToMatch('dist/test-project/index.html', /app-shell works!/);
 }

tests/legacy-cli/e2e_runner.ts

@@ -80,7 +80,6 @@ let allTests = glob
 
 // TODO: either update or remove these tests.
 allTests = allTests
-  .filter(name => !name.endsWith('/build-app-shell-with-schematic.ts'))
   // IS this test still valid? \/
   .filter(name => !name.endsWith('/module-id.ts'))
   // Do we want to support this?