test: use the targets property in legacy cli e2e

filipesilva · filipesilva · commit 15c36eb891ff · 2018-07-25T20:17:33.000+01:00
diff --git a/tests/legacy-cli/e2e/tests/basic/assets.ts b/tests/legacy-cli/e2e/tests/basic/assets.ts
@@ -95,7 +95,7 @@ export default function () {
         { 'glob': 'output-asset.txt', 'output': 'output-folder' },
         { 'glob': '**/*', 'input': 'node_modules/some-package/', 'output': 'package-folder' }
       ];
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.assets = assets;
       appArchitect.test.options.assets = assets;
     }))
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -29,7 +29,7 @@ export default function () {
   })
     .then(() => appendToFile('src/main.ts', 'import \'./string-script.js\';'))
     .then(() => updateJsonFile('angular.json', configJson => {
-      const appArchitect = configJson.projects['test-project'].architect;
+      const appArchitect = configJson.projects['test-project'].targets;
       appArchitect.build.options.scripts = [
         { input: 'src/string-script.js' },
         { input: 'src/zstring-script.js' },
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -17,7 +17,7 @@ export default function () {
     'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }'
   })
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'src/string-style.css' },
         { input: 'src/input-style.css' },
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
@@ -26,7 +26,7 @@ export default function () {
 
   return Promise.resolve()
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect['server'] = {
         builder: '@angular-devkit/build-angular:server',
         options: {
diff --git a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts b/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
@@ -35,7 +35,7 @@ export default function () {
     if (cfg.expectation === 'error') {
       return () => {
         return updateJsonFile('angular.json', (json) => {
-            json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
+            json.projects['test-project'].targets.build.options.budgets = [cfg.budget];
           })
           .then(() => expectToFail(() => ng('build', '--optimization')))
           .then(errorMessage => {
@@ -47,7 +47,7 @@ export default function () {
     } else if (cfg.expectation === 'warning') {
       return () => {
         return updateJsonFile('angular.json', (json) => {
-            json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
+            json.projects['test-project'].targets.build.options.budgets = [cfg.budget];
           })
           .then(() => ng('build', '--optimization'))
           .then(({ stdout }) => {
@@ -59,7 +59,7 @@ export default function () {
     } else { // pass
       return () => {
         return updateJsonFile('angular.json', (json) => {
-            json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
+            json.projects['test-project'].targets.build.options.budgets = [cfg.budget];
           })
           .then(() => ng('build', '--optimization'))
           .then(({ stdout }) => {
diff --git a/tests/legacy-cli/e2e/tests/build/dynamic-import.ts b/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
@@ -8,7 +8,7 @@ export default async function() {
   // Add a lazy module
   await ng('generate', 'module', 'lazy');
   await updateJsonFile('angular.json', workspaceJson => {
-    const appArchitect = workspaceJson.projects['test-project'].architect;
+    const appArchitect = workspaceJson.projects['test-project'].targets;
     appArchitect.build.options.lazyModules = [
       'src/app/lazy/lazy.module'
     ];
diff --git a/tests/legacy-cli/e2e/tests/build/environment.ts b/tests/legacy-cli/e2e/tests/build/environment.ts
@@ -7,7 +7,7 @@ export default function() {
   // Try a prod build.
   return Promise.resolve()
     .then(() => updateJsonFile('angular.json', configJson => {
-      const appArchitect = configJson.projects['test-project'].architect;
+      const appArchitect = configJson.projects['test-project'].targets;
       appArchitect.build.configurations['prod-env'] = {
         fileReplacements: [
           {
diff --git a/tests/legacy-cli/e2e/tests/build/output-dir.ts b/tests/legacy-cli/e2e/tests/build/output-dir.ts
@@ -19,7 +19,7 @@ export default function() {
     .then(() => expectFileToExist('./build-output/main.js'))
     .then(() => expectToFail(expectGitToBeClean))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.outputPath = 'config-build-output';
     }))
     .then(() => ng('build'))
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -36,7 +36,7 @@ export default function () {
       dependencies['@angular/platform-server'] = platformServerVersion;
     }))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect['server'] = {
         builder: '@angular-devkit/build-angular:server',
         options: {
diff --git a/tests/legacy-cli/e2e/tests/build/service-worker.ts b/tests/legacy-cli/e2e/tests/build/service-worker.ts
@@ -32,7 +32,7 @@ export default function() {
   // stuck to the first build done
   return silentNpm('remove', '@angular/service-worker')
     .then(() => silentNpm('install', '@angular/service-worker'))
-    .then(() => ng('config', 'projects.test-project.architect.build.options.serviceWorker', 'true'))
+    .then(() => ng('config', 'projects.test-project.targets.build.options.serviceWorker', 'true'))
     .then(() => writeFile('src/ngsw-config.json', JSON.stringify(MANIFEST, null, 2)))
     .then(() => ng('build', '--optimization'))
     .then(() => expectFileToExist(join(process.cwd(), 'dist')))
diff --git a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
@@ -20,7 +20,7 @@ export default function () {
       'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }'
     }))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'src/string-style.css' },
         { input: 'src/input-style.css' },
diff --git a/tests/legacy-cli/e2e/tests/build/styles/imports.ts b/tests/legacy-cli/e2e/tests/build/styles/imports.ts
@@ -41,7 +41,7 @@ export default function () {
         `})
         // change files to use preprocessor
         .then(() => updateJsonFile('angular.json', workspaceJson => {
-          const appArchitect = workspaceJson.projects['test-project'].architect;
+          const appArchitect = workspaceJson.projects['test-project'].targets;
           appArchitect.build.options.styles = [
             { input: `src/styles.${ext}` }
           ];
@@ -66,7 +66,7 @@ export default function () {
         // Also check imports work on ng test
         .then(() => !ejected && ng('test', '--watch=false'))
         .then(() => updateJsonFile('angular.json', workspaceJson => {
-          const appArchitect = workspaceJson.projects['test-project'].architect;
+          const appArchitect = workspaceJson.projects['test-project'].targets;
           appArchitect.build.options.styles = [
             { input: `src/styles.css` }
           ];
diff --git a/tests/legacy-cli/e2e/tests/build/styles/include-paths.ts b/tests/legacy-cli/e2e/tests/build/styles/include-paths.ts
@@ -47,7 +47,7 @@ export default function () {
     .then(() => replaceInFile('src/app/app.component.ts', `'./app.component.css\'`,
       `'./app.component.scss', './app.component.styl', './app.component.less'`))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'src/styles.scss' },
         { input: 'src/styles.styl' },
diff --git a/tests/legacy-cli/e2e/tests/build/styles/inline-urls.ts b/tests/legacy-cli/e2e/tests/build/styles/inline-urls.ts
@@ -38,7 +38,7 @@ export default function () {
     }))
     .then(() => copyProjectAsset('images/spectrum.png', './src/assets/large.png'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'src/styles.scss' }
       ];
diff --git a/tests/legacy-cli/e2e/tests/build/styles/less.ts b/tests/legacy-cli/e2e/tests/build/styles/less.ts
@@ -29,7 +29,7 @@ export default function () {
       `})
     .then(() => deleteFile('src/app/app.component.css'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'src/styles.less' }
       ];
diff --git a/tests/legacy-cli/e2e/tests/build/styles/loaders.ts b/tests/legacy-cli/e2e/tests/build/styles/loaders.ts
@@ -27,7 +27,7 @@ export default function () {
       `})
     .then(() => deleteFile('src/app/app.component.css'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'src/styles.scss' }
       ];
diff --git a/tests/legacy-cli/e2e/tests/build/styles/material-import.ts b/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
@@ -25,7 +25,7 @@ export default function () {
         })
         // change files to use preprocessor
         .then(() => updateJsonFile('angular.json', workspaceJson => {
-          const appArchitect = workspaceJson.projects['test-project'].architect;
+          const appArchitect = workspaceJson.projects['test-project'].targets;
           appArchitect.build.options.styles = [
             { input: `src/styles.${ext}` }
           ];
diff --git a/tests/legacy-cli/e2e/tests/build/styles/scss.ts b/tests/legacy-cli/e2e/tests/build/styles/scss.ts
@@ -29,7 +29,7 @@ export default function () {
       `})
     .then(() => deleteFile('src/app/app.component.css'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'src/styles.scss' }
       ];
diff --git a/tests/legacy-cli/e2e/tests/build/styles/stylus.ts b/tests/legacy-cli/e2e/tests/build/styles/stylus.ts
@@ -29,7 +29,7 @@ export default function () {
       `})
     .then(() => deleteFile('src/app/app.component.css'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'src/styles.styl' }
       ];
diff --git a/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts b/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts
@@ -8,7 +8,7 @@ export default function() {
 
   return Promise.resolve()
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.outputPath = './';
     }))
     .then(() => expectToFail(() => ng('build')))
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-set-serve-port.ts b/tests/legacy-cli/e2e/tests/commands/config/config-set-serve-port.ts
@@ -3,6 +3,6 @@ import { ng } from '../../../utils/process';
 
 export default function() {
   return Promise.resolve()
-    .then(() => ng('config', 'projects.test-project.architect.serve.options.port', '1234'))
+    .then(() => ng('config', 'projects.test-project.targets.serve.options.port', '1234'))
     .then(() => expectFileToMatch('angular.json', /"port": 1234/));
 }
diff --git a/tests/legacy-cli/e2e/tests/lint/lint-no-project.ts b/tests/legacy-cli/e2e/tests/lint/lint-no-project.ts
@@ -10,7 +10,7 @@ export default function () {
 
   return Promise.resolve()
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.lint.options.tsConfig = undefined;
     }))
     .then(() => ng('lint', 'app', '--type-check'))
diff --git a/tests/legacy-cli/e2e/tests/misc/coverage.ts b/tests/legacy-cli/e2e/tests/misc/coverage.ts
@@ -16,7 +16,7 @@ export default function () {
     .then(() => expectFileToMatch('coverage/lcov.info', 'polyfills.ts'))
     .then(() => expectFileToMatch('coverage/lcov.info', 'test.ts'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.test.options.codeCoverageExclude = [
         'src/polyfills.ts',
         '**/test.ts'
diff --git a/tests/legacy-cli/e2e/tests/misc/fallback.ts b/tests/legacy-cli/e2e/tests/misc/fallback.ts
@@ -21,7 +21,7 @@ export default function () {
     // should correctly fallback to a changed index
     .then(() => moveFile('src/index.html', 'src/not-index.html'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.index = 'src/not-index.html';
     }))
     .then(() => ngServe())
diff --git a/tests/legacy-cli/e2e/tests/test/e2e-baseurl.ts b/tests/legacy-cli/e2e/tests/test/e2e-baseurl.ts
@@ -11,7 +11,7 @@ export default function () {
   return Promise.resolve()
     .then(() => expectToFail(() => ng('e2e', 'test-project-e2e', '--devServerTarget=')))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.serve.options.port = 4400;
     }))
     .then(() => ngServe())
diff --git a/tests/legacy-cli/e2e/tests/test/test-assets.ts b/tests/legacy-cli/e2e/tests/test/test-assets.ts
@@ -38,14 +38,14 @@ export default function () {
     }))
     // Test failure condition (no assets in angular.json)
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.assets = [];
     }))
     .then(() => expectToFail(() => ng('test', '--watch=false'),
       'Should fail because the assets to serve were not in the Angular CLI config'))
     // Test passing condition (assets are included)
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.assets = [
         { 'glob': '**/*', 'input': 'src/assets' },
         { 'glob': 'file.txt' },
diff --git a/tests/legacy-cli/e2e/tests/test/test-environment.ts b/tests/legacy-cli/e2e/tests/test/test-environment.ts
@@ -15,7 +15,7 @@ export default function () {
     `)
     .then(() => ng('test', '--watch=false'))
     .then(() => updateJsonFile('angular.json', configJson => {
-      const appArchitect = configJson.projects['test-project'].architect;
+      const appArchitect = configJson.projects['test-project'].targets;
       appArchitect.test.configurations = {
         production: {
           fileReplacements: [
diff --git a/tests/legacy-cli/e2e/tests/test/test-scripts.ts b/tests/legacy-cli/e2e/tests/test/test-scripts.ts
@@ -63,7 +63,7 @@ export default function () {
     // should fail because the global scripts were not added to scripts array
     .then(() => expectToFail(() => ng('test', '--watch=false')))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.test.options.scripts = [
         { input: 'src/string-script.js' },
         { input: 'src/input-script.js' }
diff --git a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
@@ -10,7 +10,7 @@ export default function() {
   return Promise.resolve()
     .then(() => silentNpm('install', 'bootstrap@4.0.0-beta.3'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'node_modules/bootstrap/dist/css/bootstrap.css' }
       ];
diff --git a/tests/legacy-cli/e2e/tests/third-party/material-icons.ts b/tests/legacy-cli/e2e/tests/third-party/material-icons.ts
@@ -9,7 +9,7 @@ export default function() {
   return Promise.resolve()
     .then(() => silentNpm('install', 'material-design-icons@3.0.1'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
+      const appArchitect = workspaceJson.projects['test-project'].targets;
       appArchitect.build.options.styles = [
         { input: 'node_modules/material-design-icons/iconfont/material-icons.css' }
       ];
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
@@ -177,12 +177,12 @@ export function useNgVersion(version: string) {
 export function useCIDefaults(projectName = 'test-project') {
   return updateJsonFile('angular.json', workspaceJson => {
     // Disable progress reporting on CI to reduce spam.
-    const appArchitect = workspaceJson.projects[projectName].architect;
-    appArchitect.build.options.progress = false;
-    appArchitect.test.options.progress = false;
+    const appTargets = workspaceJson.projects[projectName].targets;
+    appTargets.build.options.progress = false;
+    appTargets.test.options.progress = false;
     // Disable auto-updating webdriver in e2e.
-    const e2eArchitect = workspaceJson.projects[projectName + '-e2e'].architect;
-    e2eArchitect.e2e.options.webdriverUpdate = false;
+    const e2eTargets = workspaceJson.projects[projectName + '-e2e'].targets;
+    e2eTargets.e2e.options.webdriverUpdate = false;
   })
   .then(() => updateJsonFile('package.json', json => {
     // We want to always use the same version of webdriver but can only do so on CircleCI.

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ export default function() {`
`7`	`7`	`// Try a prod build.`
`8`	`8`	`return Promise.resolve()`
`9`	`9`	`.then(() => updateJsonFile('angular.json', configJson => {`
`10`		`- const appArchitect = configJson.projects['test-project'].architect;`
	`10`	`+ const appArchitect = configJson.projects['test-project'].targets;`
`11`	`11`	`appArchitect.build.configurations['prod-env'] = {`
`12`	`12`	`fileReplacements: [`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ import { ng } from '../../../utils/process';`
`3`	`3`
`4`	`4`	`export default function() {`
`5`	`5`	`return Promise.resolve()`
`6`		`- .then(() => ng('config', 'projects.test-project.architect.serve.options.port', '1234'))`
	`6`	`+ .then(() => ng('config', 'projects.test-project.targets.serve.options.port', '1234'))`
`7`	`7`	`.then(() => expectFileToMatch('angular.json', /"port": 1234/));`
`8`	`8`	`}`