ci: add separate CI track for Angular 4

Author: filipesilva

.travis.yml

@@ -44,23 +44,6 @@ matrix:
       script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent
       env: e2e-3
 
-    - node_js: "6"
-      os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent --nightly
-      env: nightly-0
-    - node_js: "6"
-      os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent --nightly
-      env: nightly-1
-    - node_js: "6"
-      os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent --nightly
-      env: nightly-2
-    - node_js: "6"
-      os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent --nightly
-      env: nightly-3
-
     - node_js: "6"
       os: linux
       script: node tests/run_e2e.js --eject "--glob=tests/build/**"

tests/e2e/setup/500-create-project.ts

@@ -5,6 +5,7 @@ import {
   updateTsConfig,
   updateJsonFile,
   useNg2,
+  useNg4,
   useSha,
   useCIChrome,
   useCIDefaults,
@@ -45,6 +46,7 @@ export default function() {
     .then(() => useCIChrome())
     .then(() => useCIDefaults())
     .then(() => argv['ng2'] ? useNg2() : Promise.resolve())
+    .then(() => argv['ng4'] ? useNg4() : Promise.resolve())
     .then(() => argv.nightly || argv['ng-sha'] ? useSha() : Promise.resolve())
     // npm link on Circle CI is very noisy.
     .then(() => silentNpm('install'))

tests/e2e/tests/build/aot/exclude.ts

@@ -7,9 +7,8 @@ export default function () {
   // Disable parts of it in webpack tests.
   const ejected = getGlobalVariable('argv').eject;
 
-  // Skip this in ng5 tests, it only happens in ng2/4.
-  // This check should be changed once ng5 because the default.
-  if (getGlobalVariable('argv').nightly) {
+  // This test is only for Angular 2/4 projects.
+  if (!getGlobalVariable('argv').ng2 && !getGlobalVariable('argv').ng4) {
     return Promise.resolve();
   }
 

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

@@ -15,13 +15,14 @@ export default function () {
   if (process.platform.startsWith('win')) {
     return Promise.resolve();
   }
+
   // Skip this in ejected tests.
   if (getGlobalVariable('argv').eject) {
     return Promise.resolve();
   }
 
-  // Skip in non-nightly tests. Switch this check around when ng5 is out.
-  if (!getGlobalVariable('argv').nightly) {
+  // Skip this test in Angular 2/4.
+  if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();
   }
 

tests/e2e/tests/build/build-optimizer.ts

@@ -9,12 +9,12 @@ export default function () {
     .then(() => expectToFail(() => expectFileToExist('dist/vendor.js')))
     .then(() => expectToFail(() => expectFileToMatch('dist/main.js', /\.decorators =/)))
     .then(() => {
-      // Check if build optimizer is on by default in ng5 prod builds
-      // This check should be changed once ng5 because the default.
-      if (!getGlobalVariable('argv').nightly) {
+      // Skip this part of the test in Angular 2/4.
+      if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
         return Promise.resolve();
       }
 
+      // Check if build optimizer is on by default in ng5 prod builds
       return Promise.resolve()
         .then(() => ng('build', '--prod'))
         .then(() => expectToFail(() => expectFileToExist('dist/vendor.js')))

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

@@ -26,8 +26,9 @@ 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();
   }
 
   return Promise.resolve()

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

@@ -26,8 +26,8 @@ export default function () {
     return Promise.resolve();
   }
 
-  // Skip in non-nightly tests. Switch this check around when ng5 is out.
-  if (!getGlobalVariable('argv').nightly) {
+  // Skip this test in Angular 2/4.
+  if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();
   }
 

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

@@ -70,8 +70,8 @@ export default function () {
       }
     })
     .then(() => {
-      // Skip in non-nightly tests. Switch this check around when ng5 is out.
-      if (!getGlobalVariable('argv').nightly) {
+      // Skip this part of the test in Angular 2/4.
+      if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
         return Promise.resolve();
       }
 

tests/e2e/tests/i18n/build-locale.ts

@@ -5,9 +5,8 @@ import { expectToFail } from '../../utils/utils';
 
 
 export default function () {
-  // Check if register locale works in ng5 prod builds
-  // This check should be changed once ng5 because the default.
-  if (!getGlobalVariable('argv').nightly) {
+  // Skip this test in Angular 2/4.
+  if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();
   }
 

tests/e2e/tests/misc/typescript-warning.ts

@@ -7,11 +7,9 @@ export default function () {
   // Update as needed.
   let unsupportedTsVersion = '2.5';
 
-  // TODO: re-enable for ng5, adjust as needed. This test fails on ng5 because the 2.5 is supported.
-  // When ng5 because the default this test will need to be adjusted to use 2.3 as the unsupported
-  // version, and to disable the experimental angular compiler (transforms need 2.4 minimum).
-  if (getGlobalVariable('argv').nightly) {
-    return;
+  // Skip this test in Angular 2/4.
+  if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
+    return Promise.resolve();
   }
 
   return Promise.resolve()