ci: fix ng2 and nightly jobs

Author: filipesilva

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

@@ -2,6 +2,8 @@ import { ng, npm } from '../../utils/process';
 import { expectFileToMatch } from '../../utils/fs';
 import { getGlobalVariable } from '../../utils/env';
 import { expectToFail } from '../../utils/utils';
+import { updateJsonFile } from '../../utils/project';
+import { readNgVersion } from '../../utils/version';
 
 
 export default function () {
@@ -15,8 +17,19 @@ export default function () {
     return Promise.resolve();
   }
 
+  let platformServerVersion = readNgVersion();
+
+  if (getGlobalVariable('argv').nightly) {
+    platformServerVersion = 'github:angular/platform-server-builds';
+  }
+
+
   return Promise.resolve()
     .then(() => ng('generate', 'appShell', 'name', '--universal-app', 'universal'))
+    .then(() => updateJsonFile('package.json', packageJson => {
+      const dependencies = packageJson['dependencies'];
+      dependencies['@angular/platform-server'] = platformServerVersion;
+    })
     .then(() => npm('install'))
     .then(() => ng('build', '--prod'))
     .then(() => expectFileToMatch('dist/index.html', /app-shell works!/))

tests/e2e/tests/build/build-errors.ts

@@ -1,6 +1,6 @@
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
-import { writeFile, appendToFile, readFile } from '../../utils/fs';
+import { writeFile, appendToFile, readFile, replaceInFile } from '../../utils/fs';
 import { getGlobalVariable } from '../../utils/env';
 import { expectToFail } from '../../utils/utils';
 
@@ -62,11 +62,12 @@ export default function () {
       }
     })
     .then(() => writeFile('./src/app/app.component.ts', origContent))
-    // Check errors when files were not emitted.
-    .then(() => writeFile('./src/app/app.component.ts', ''))
+    // Check errors when files were not emitted due to static analysis errors.
+    .then(() => replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`))
     .then(() => expectToFail(() => ng('build', '--aot')))
     .then(({ message }) => {
-      if (!message.includes(`Unexpected value 'AppComponent`)) {
+      if (!message.includes('Function calls are not supported')
+        && !message.includes('Function expressions are not supported in decorators')) {
         throw new Error(`Expected static analysis error, got this instead:\n${message}`);
       }
       if (extraErrors.some((e) => message.includes(e))) {

tests/e2e/tests/build/platform-server.ts

@@ -21,6 +21,10 @@ export default function () {
 
   let platformServerVersion = readNgVersion();
 
+  if (getGlobalVariable('argv').nightly) {
+    platformServerVersion = 'github:angular/platform-server-builds';
+  }
+
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();

tests/e2e/tests/build/rebuild-error.ts

@@ -37,13 +37,14 @@ export default function () {
     // Save the original contents of `./src/app/app.component.ts`.
     .then(() => readFile('./src/app/app.component.ts'))
     .then((contents) => origContent = contents)
-    // Add a major error on a non-main file to the initial build.
-    .then(() => writeFile('src/app/app.component.ts', ''))
+    // Add a major static analysis error on a non-main file to the initial build.
+    .then(() => replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`))
     // Should have an error.
     .then(() => execAndWaitForOutputToMatch('ng', ['serve', '--aot'], failedRe))
     .then((results) => {
       const stderr = results.stderr;
-      if (!stderr.includes(`Unexpected value 'AppComponent`)) {
+      if (!stderr.includes('Function calls are not supported')
+        && !stderr.includes('Function expressions are not supported in decorators')) {
         throw new Error(`Expected static analysis error, got this instead:\n${stderr}`);
       }
       if (extraErrors.some((e) => stderr.includes(e))) {
@@ -76,18 +77,19 @@ export default function () {
     // have an error message in 5s.
     .then(() => Promise.all([
       expectToFail(() => waitForAnyProcessOutputToMatch(errorRe, 5000)),
-      replaceInFile('src/app/app.component.ts', ']]]]]', '')
+      writeFile('src/app/app.component.ts', origContent)
     ]))
     .then(() => wait(2000))
-    // Add a major error on a rebuild.
+    // Add a major static analysis error on a rebuild.
     // Should fail the rebuild.
     .then(() => Promise.all([
       waitForAnyProcessOutputToMatch(failedRe, 20000),
-      writeFile('src/app/app.component.ts', '')
+      replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`)
     ]))
     .then((results) => {
       const stderr = results[0].stderr;
-      if (!stderr.includes(`Unexpected value 'AppComponent`)) {
+      if (!stderr.includes('Function calls are not supported')
+        && !stderr.includes('Function expressions are not supported in decorators')) {
         throw new Error(`Expected static analysis error, got this instead:\n${stderr}`);
       }
       if (extraErrors.some((e) => stderr.includes(e))) {

tests/e2e/tests/build/script-target.ts

@@ -1,9 +1,15 @@
 import { expectFileToMatch } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
+import { getGlobalVariable } from '../../utils/env';
 
 
 export default function () {
+  // Skip this test in Angular 2, it had different bundles.
+  if (getGlobalVariable('argv').ng2) {
+    return Promise.resolve();
+  }
+
   return Promise.resolve()
     .then(() => updateJsonFile('tsconfig.json', configJson => {
       const compilerOptions = configJson['compilerOptions'];