test: remove all references to eject from CLI E2E tests

Author: clydin

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

@@ -8,7 +8,6 @@ import {
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
-import {getGlobalVariable} from '../../utils/env';
 
 
 // const temp = require('temp');
@@ -17,7 +16,6 @@ import {getGlobalVariable} from '../../utils/env';
 // tslint:disable:max-line-length
 export default function () {
   // Disable parts of it in webpack tests.
-  const ejected = getGlobalVariable('argv').eject;
 
   // TODO: update test
   return;
@@ -110,7 +108,7 @@ export default function () {
     // .gitkeep shouldn't be copied.
     .then(() => expectToFail(() => expectFileToExist('dist/assets/.gitkeep')))
     // Update app to test assets are present.
-    .then(_ => !ejected && writeMultipleFiles({
+    .then(_ => writeMultipleFiles({
       'src/app/app.module.ts': `
         import { BrowserModule } from '@angular/platform-browser';
         import { NgModule } from '@angular/core';
@@ -191,6 +189,6 @@ export default function () {
           });
         });`,
     }))
-    .then(() => !ejected && ng('test', '--watch=false'))
-    .then(() => !ejected && ng('e2e', 'test-project-e2e'));
+    .then(() => ng('test', '--watch=false'))
+    .then(() => ng('e2e', 'test-project-e2e'));
 }

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

@@ -7,18 +7,13 @@ import {
 import {writeFile, writeMultipleFiles} from '../../utils/fs';
 import {wait} from '../../utils/utils';
 import {request} from '../../utils/http';
-import {getGlobalVariable} from '../../utils/env';
 
 const validBundleRegEx = /: Compiled successfully./;
 
 export default function() {
   if (process.platform.startsWith('win')) {
     return Promise.resolve();
   }
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
 
   const lazyChunkRegExp = /lazy-module\.js/g;
 

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

@@ -7,11 +7,6 @@ import { readNgVersion } from '../../utils/version';
 
 
 export default function () {
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();

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

@@ -8,11 +8,6 @@ import { stripIndent } from 'common-tags';
 
 
 export default function () {
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();

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

@@ -19,11 +19,6 @@ export default function () {
     return Promise.resolve();
   }
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();

tests/legacy-cli/e2e/tests/build/delete-output-path.ts

@@ -6,11 +6,6 @@ import {getGlobalVariable} from '../../utils/env';
 export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   return ng('build')
     // This is supposed to fail since there's a missing file
     .then(() => deleteFile('src/app/app.component.ts'))

tests/legacy-cli/e2e/tests/build/deploy-url.ts

@@ -27,8 +27,6 @@ export default function () {
       /__webpack_require__\.p = "deployUrl\/";/));
     // // verify slash is appended to the end of --deploy-url if missing
     // .then(() => ng('build', '--deploy-url=deployUrl', '--extract-css=false'))
-    // // skip this in ejected tests
-    // .then(() => getGlobalVariable('argv').eject
-    //   ? Promise.resolve()
-    //   : expectFileToMatch('dist/test-project/untime.js', /__webpack_require__\.p = "deployUrl\/";/));
+    // .then(() =>
+    //   expectFileToMatch('dist/test-project/untime.js', /__webpack_require__\.p = "deployUrl\/";/));
 }

tests/legacy-cli/e2e/tests/build/eval-sourcemap.ts

@@ -1,16 +1,10 @@
 import {execAndWaitForOutputToMatch, killAllProcesses} from '../../utils/process';
-import {getGlobalVariable} from '../../utils/env';
 
 
 export default function() {
   // TODO(architect): Dev-server does not yet do this. Fix, reenable, validate, then delete this test.
   return;
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   return Promise.resolve()
     // Check that ng serve has eval sourcemaps by default.
     .then(() => execAndWaitForOutputToMatch('ng', ['serve'], /: Compiled successfully/))

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

@@ -7,11 +7,6 @@ import {getGlobalVariable} from '../../utils/env';
 export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   return ng('build', '--stats-json')
     .then(() => expectFileToExist('./dist/test-project/stats.json'))
     .then(() => expectGitToBeClean());

tests/legacy-cli/e2e/tests/build/output-dir.ts

@@ -9,11 +9,6 @@ import {expectToFail} from '../../utils/utils';
 export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   return ng('build', '--output-path', 'build-output')
     .then(() => expectFileToExist('./build-output/index.html'))
     .then(() => expectFileToExist('./build-output/main.js'))