diff --git a/tests/legacy-cli/e2e/tests/basic/assets.ts b/tests/legacy-cli/e2e/tests/basic/assets.ts index f35ebc6979..1d20c8bb38 100644 --- a/tests/legacy-cli/e2e/tests/basic/assets.ts +++ b/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')); } diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts index 6eda126667..3ca37f3bc1 100644 --- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts +++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts @@ -7,7 +7,6 @@ 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./; @@ -15,10 +14,6 @@ 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; diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts index 85bef90848..001eb29e9a 100644 --- a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts +++ b/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(); diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts index a2fac7d400..ee8fe2b672 100644 --- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts +++ b/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(); diff --git a/tests/legacy-cli/e2e/tests/build/build-errors.ts b/tests/legacy-cli/e2e/tests/build/build-errors.ts index 538a266908..66f4b36807 100644 --- a/tests/legacy-cli/e2e/tests/build/build-errors.ts +++ b/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(); diff --git a/tests/legacy-cli/e2e/tests/build/delete-output-path.ts b/tests/legacy-cli/e2e/tests/build/delete-output-path.ts index 3e8047418a..abb646d85d 100644 --- a/tests/legacy-cli/e2e/tests/build/delete-output-path.ts +++ b/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')) diff --git a/tests/legacy-cli/e2e/tests/build/deploy-url.ts b/tests/legacy-cli/e2e/tests/build/deploy-url.ts index 929b5006c3..ff5051ae48 100644 --- a/tests/legacy-cli/e2e/tests/build/deploy-url.ts +++ b/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\/";/)); } diff --git a/tests/legacy-cli/e2e/tests/build/eval-sourcemap.ts b/tests/legacy-cli/e2e/tests/build/eval-sourcemap.ts index 2c62f4b25f..37c811700c 100644 --- a/tests/legacy-cli/e2e/tests/build/eval-sourcemap.ts +++ b/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/)) diff --git a/tests/legacy-cli/e2e/tests/build/json.ts b/tests/legacy-cli/e2e/tests/build/json.ts index f67f50fd2b..d47e9aa9cf 100644 --- a/tests/legacy-cli/e2e/tests/build/json.ts +++ b/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()); diff --git a/tests/legacy-cli/e2e/tests/build/output-dir.ts b/tests/legacy-cli/e2e/tests/build/output-dir.ts index 5b245bb3d9..26ed3c38f3 100644 --- a/tests/legacy-cli/e2e/tests/build/output-dir.ts +++ b/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')) diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts index 1aeab4b099..3c7ab71a42 100644 --- a/tests/legacy-cli/e2e/tests/build/platform-server.ts +++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts @@ -14,11 +14,6 @@ import { readNgVersion } from '../../utils/version'; import { expectToFail } from '../../utils/utils'; export default function () { - // Skip this for ejected tests. - if (getGlobalVariable('argv').eject) { - return Promise.resolve(); - } - let platformServerVersion = readNgVersion(); let httpVersion = readNgVersion(); diff --git a/tests/legacy-cli/e2e/tests/build/prod-build.ts b/tests/legacy-cli/e2e/tests/build/prod-build.ts index 674f77161f..72e9f9b88f 100644 --- a/tests/legacy-cli/e2e/tests/build/prod-build.ts +++ b/tests/legacy-cli/e2e/tests/build/prod-build.ts @@ -9,9 +9,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. - const ejected = getGlobalVariable('argv').eject; - // Can't use the `ng` helper because somewhere the environment gets // stuck to the first build done return ng('build', '--prod') @@ -26,5 +23,5 @@ export default function() { expectFileToMatch(`dist/test-project/${main}`, /bootstrapModuleFactory\(/); }) // Check that the process didn't change local files. - .then(() => !ejected && expectGitToBeClean()); + .then(() => expectGitToBeClean()); } diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts b/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts index 5104466a77..739e946bd8 100644 --- a/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts +++ b/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts @@ -14,11 +14,6 @@ export default function() { if (process.platform.startsWith('win')) { return Promise.resolve(); } - // Skip this in ejected tests. - if (getGlobalVariable('argv').eject) { - return Promise.resolve(); - } - return execAndWaitForOutputToMatch('ng', ['serve'], webpackGoodRegEx) // Should trigger a rebuild. diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts b/tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts index db433abfb7..c73e9e983a 100644 --- a/tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts +++ b/tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts @@ -18,10 +18,6 @@ export default function() { if (process.platform.startsWith('win')) { return Promise.resolve(); } - // Skip this in ejected tests. - if (getGlobalVariable('argv').eject) { - return Promise.resolve(); - } return Promise.resolve() // Create and import files. diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-error.ts b/tests/legacy-cli/e2e/tests/build/rebuild-error.ts index f282d25d74..ac5070a29e 100644 --- a/tests/legacy-cli/e2e/tests/build/rebuild-error.ts +++ b/tests/legacy-cli/e2e/tests/build/rebuild-error.ts @@ -25,10 +25,6 @@ export default function () { if (process.platform.startsWith('win')) { 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) { diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts b/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts index 5af00acbc5..1828ca8efa 100644 --- a/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts +++ b/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts @@ -16,10 +16,6 @@ export default function () { if (process.platform.startsWith('win')) { 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) { diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-types.ts b/tests/legacy-cli/e2e/tests/build/rebuild-types.ts index 4f9a56e36e..4056dee0b8 100644 --- a/tests/legacy-cli/e2e/tests/build/rebuild-types.ts +++ b/tests/legacy-cli/e2e/tests/build/rebuild-types.ts @@ -15,10 +15,6 @@ export default async function() { if (process.platform.startsWith('win')) { return; } - // Skip this in ejected tests. - if (getGlobalVariable('argv').eject) { - return; - } await writeFile('src/app/type.ts', `export type MyType = number;`); await prependToFile('src/app/app.component.ts', 'import { MyType } from "./type";\n'); diff --git a/tests/legacy-cli/e2e/tests/build/service-worker.ts b/tests/legacy-cli/e2e/tests/build/service-worker.ts index ff2d165256..670f40e1e4 100644 --- a/tests/legacy-cli/e2e/tests/build/service-worker.ts +++ b/tests/legacy-cli/e2e/tests/build/service-worker.ts @@ -23,11 +23,6 @@ const MANIFEST = { }; export default function() { - // Skip this in ejected tests. - if (getGlobalVariable('argv').eject) { - return Promise.resolve(); - } - // Can't use the `ng` helper because somewhere the environment gets // stuck to the first build done return silentNpm('remove', '@angular/service-worker') @@ -46,12 +41,4 @@ export default function() { .then(() => ng('build', '--optimization')) .then(() => expectFileToExist('dist/test-project/safety-worker.js')) .then(() => expectFileToExist('dist/test-project/worker-basic.min.js')); - // WEBPACK4_DISABLED - eject temporarily disabled for webpack 4 integration - // .then(() => ng('eject', '--prod')) - // .then(() => silentNpm('install')) - // .then(() => npm('run', 'build')) - // .then(() => expectFileToMatch('package.json', /"sw-config"/)) - // .then(() => expectFileToExist(join(process.cwd(), 'dist/ngsw-worker.js'))) - // .then(() => expectFileToExist(join(process.cwd(), 'dist/ngsw.json'))) - // .then(() => ng('set', 'apps.0.serviceWorker=false')); } diff --git a/tests/legacy-cli/e2e/tests/build/styles/imports.ts b/tests/legacy-cli/e2e/tests/build/styles/imports.ts index c7a5f7cc1e..41bb0dc4b5 100644 --- a/tests/legacy-cli/e2e/tests/build/styles/imports.ts +++ b/tests/legacy-cli/e2e/tests/build/styles/imports.ts @@ -12,9 +12,6 @@ import { getGlobalVariable } from '../../../utils/env'; export default function () { // TODO(architect): Delete this test. It is now in devkit/build-angular. - // Disable parts of it in webpack tests. - const ejected = getGlobalVariable('argv').eject; - const extensions = ['css', 'scss', 'less', 'styl']; let promise = Promise.resolve(); @@ -64,7 +61,7 @@ export default function () { .then(() => expectFileToMatch('dist/test-project/main.js', /h1.*background:\s*#000+/)) // Also check imports work on ng test - .then(() => !ejected && ng('test', '--watch=false')) + .then(() => ng('test', '--watch=false')) .then(() => updateJsonFile('angular.json', workspaceJson => { const appArchitect = workspaceJson.projects['test-project'].architect; appArchitect.build.options.styles = [ diff --git a/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts b/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts index 38de272bde..e83b6b0455 100644 --- a/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts +++ b/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts @@ -12,6 +12,5 @@ export default function() { appArchitect.build.options.outputPath = './'; })) .then(() => expectToFail(() => ng('build'))) - .then(() => expectToFail(() => ng('serve'))) - .then(() => expectToFail(() => ng('eject'))); + .then(() => expectToFail(() => ng('serve'))); } diff --git a/tests/legacy-cli/e2e/utils/process.ts b/tests/legacy-cli/e2e/utils/process.ts index 31bd37a724..0864042796 100644 --- a/tests/legacy-cli/e2e/utils/process.ts +++ b/tests/legacy-cli/e2e/utils/process.ts @@ -181,24 +181,11 @@ export function execAndWaitForOutputToMatch(cmd: string, args: string[], match: } } -let npmInstalledEject = false; export function ng(...args: string[]) { const argv = getGlobalVariable('argv'); const maybeSilentNg = argv['nosilent'] ? noSilentNg : silentNg; if (['build', 'serve', 'test', 'e2e', 'xi18n'].indexOf(args[0]) != -1) { - // If we have the --eject, use webpack for the test. - if (args[0] == 'build' && argv.eject) { - return maybeSilentNg('eject', ...args.slice(1), '--force') - .then(() => { - if (!npmInstalledEject) { - npmInstalledEject = true; - // We need to delete node_modules, then run npm install on the first eject. - return rimraf('node_modules').then(() => silentNpm('install')); - } - }) - .then(() => rimraf('dist')) - .then(() => _exec({silent: true}, 'node_modules/.bin/webpack', [])); - } else if (args[0] == 'e2e') { + if (args[0] == 'e2e') { // Wait 1 second before running any end-to-end test. return new Promise(resolve => setTimeout(resolve, 1000)) .then(() => maybeSilentNg(...args)); diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts index 841de90265..5bb117aa8d 100644 --- a/tests/legacy-cli/e2e_runner.ts +++ b/tests/legacy-cli/e2e_runner.ts @@ -46,7 +46,6 @@ const argv = minimist(process.argv.slice(2), { 'boolean': [ 'appveyor', 'debug', - 'eject', 'ng-snapshots', 'noglobal', 'nosilent',