test: update to support targets & architect fields

Author: clydin

packages/angular/pwa/pwa/index_spec.ts

@@ -51,7 +51,7 @@ describe('PWA Schematic', () => {
     const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
-    const swFlag = config.projects.bar.targets.build.configurations.production.serviceWorker;
+    const swFlag = config.projects.bar.architect.build.configurations.production.serviceWorker;
     expect(swFlag).toEqual(true);
   });
 
@@ -101,7 +101,7 @@ describe('PWA Schematic', () => {
     const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
-    const targets = config.projects.bar.targets;
+    const targets = config.projects.bar.architect;
     ['build', 'test'].forEach((target) => {
       expect(targets[target].options.assets).toContain('projects/bar/src/manifest.json');
     });

packages/schematics/angular/app-shell/index_spec.ts

@@ -64,7 +64,7 @@ describe('App Shell Schematic', () => {
     const filePath = '/angular.json';
     const content = tree.readContent(filePath);
     const workspace = JSON.parse(content);
-    const target = workspace.projects.bar.targets['app-shell'];
+    const target = workspace.projects.bar.architect['app-shell'];
     expect(target.options.browserTarget).toEqual('bar:build');
     expect(target.options.serverTarget).toEqual('bar:server');
     expect(target.options.route).toEqual('shell');

packages/schematics/angular/application/index_spec.ts

@@ -207,13 +207,13 @@ describe('Application Schematic', () => {
       const config = JSON.parse(tree.readContent('/angular.json'));
       const prj = config.projects.foo;
       expect(prj.root).toEqual('');
-      const buildOpt = prj.targets.build.options;
+      const buildOpt = prj.architect.build.options;
       expect(buildOpt.index).toEqual('src/index.html');
       expect(buildOpt.main).toEqual('src/main.ts');
       expect(buildOpt.polyfills).toEqual('src/polyfills.ts');
       expect(buildOpt.tsConfig).toEqual('src/tsconfig.app.json');
 
-      const testOpt = prj.targets.test.options;
+      const testOpt = prj.architect.test.options;
       expect(testOpt.main).toEqual('src/test.ts');
       expect(testOpt.tsConfig).toEqual('src/tsconfig.spec.json');
       expect(testOpt.karmaConfig).toEqual('src/karma.conf.js');

packages/schematics/angular/e2e/index_spec.ts

@@ -79,22 +79,22 @@ describe('Application Schematic', () => {
     it('should set 2 targets for the app', () => {
       const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
       const workspace = JSON.parse(tree.readContent('/angular.json'));
-      const targets = workspace.projects.foo.targets;
+      const targets = workspace.projects.foo.architect;
       expect(Object.keys(targets)).toEqual(['e2e', 'lint']);
     });
 
     it('should set the e2e options', () => {
       const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
       const workspace = JSON.parse(tree.readContent('/angular.json'));
-      const e2eOptions = workspace.projects.foo.targets.e2e.options;
+      const e2eOptions = workspace.projects.foo.architect.e2e.options;
       expect(e2eOptions.protractorConfig).toEqual('projects/foo/protractor.conf.js');
       expect(e2eOptions.devServerTarget).toEqual('app:serve');
     });
 
     it('should set the lint options', () => {
       const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
       const workspace = JSON.parse(tree.readContent('/angular.json'));
-      const lintOptions = workspace.projects.foo.targets.lint.options;
+      const lintOptions = workspace.projects.foo.architect.lint.options;
       expect(lintOptions.tsConfig).toEqual('projects/foo/tsconfig.e2e.json');
     });
   });

packages/schematics/angular/migrations/update-6/index.ts

@@ -121,7 +121,7 @@ function migrateConfiguration(oldConfig: CliConfig, logger: logging.LoggerApi):
     }
     const targetsConfig = extractTargetsConfig(oldConfig);
     if (targetsConfig !== null) {
-      config.targets = targetsConfig;
+      config.architect = targetsConfig;
     }
 
     context.logger.info(`Removing old config file (${oldConfigPath})`);
@@ -577,7 +577,7 @@ function extractProjectsConfig(
       };
       e2eTargets.lint = e2eLintTarget;
       if (protractorConfig) {
-        e2eProject.targets = e2eTargets;
+        e2eProject.architect = e2eTargets;
       }
 
       return { name, project, e2eProject };

packages/schematics/angular/migrations/update-6/index_spec.ts

@@ -124,6 +124,13 @@ describe('Migration to v6', () => {
     return JSON.parse(tree.readContent(configPath));
   }
 
+  // tslint:disable-next-line:no-any
+  function getTarget(tree: UnitTestTree, targetName: string): any {
+    const project = getConfig(tree).projects.foo;
+
+    return project.architect[targetName];
+  }
+
   describe('file creation/deletion', () => {
     it('should delete the old config file', () => {
       tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
@@ -474,7 +481,7 @@ describe('Migration to v6', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
         const config = getConfig(tree);
-        expect(config.targets).not.toBeDefined();
+        expect(config.architect).not.toBeDefined();
       });
     });
 
@@ -526,7 +533,7 @@ describe('Migration to v6', () => {
       it('should set build target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const build = getConfig(tree).projects.foo.targets.build;
+        const build = getTarget(tree, 'build');
         expect(build.builder).toEqual('@angular-devkit/build-angular:browser');
         expect(build.options.scripts).toEqual([]);
         expect(build.options.styles).toEqual(['src/styles.css']);
@@ -560,7 +567,7 @@ describe('Migration to v6', () => {
       it('should not set baseHref on build & serve targets if not defined', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const build = getConfig(tree).projects.foo.targets.build;
+        const build = getTarget(tree, 'build');
         expect(build.options.baseHref).toBeUndefined();
       });
 
@@ -569,27 +576,25 @@ describe('Migration to v6', () => {
         config.apps[0].baseHref = '/base/href/';
         tree.create(oldConfigPath, JSON.stringify(config, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const build = getConfig(tree).projects.foo.targets.build;
+        const build = getTarget(tree, 'build');
         expect(build.options.baseHref).toEqual('/base/href/');
       });
 
       it('should add serviceWorker to production configuration', () => {
         baseConfig.apps[0].serviceWorker = true;
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const config = getConfig(tree);
-        expect(config.projects.foo.targets.build.options.serviceWorker).toBeUndefined();
-        expect(
-          config.projects.foo.targets.build.configurations.production.serviceWorker,
-        ).toBe(true);
+        const build = getTarget(tree, 'build');
+        expect(build.options.serviceWorker).toBeUndefined();
+        expect(build.configurations.production.serviceWorker).toBe(true);
       });
 
       it('should add production configuration when no environments', () => {
         delete baseConfig.apps[0].environments;
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const config = getConfig(tree);
-        expect(config.projects.foo.targets.build.configurations).toEqual({
+        const build = getTarget(tree, 'build');
+        expect(build.configurations).toEqual({
           production: {
             optimization: true,
             outputHashing: 'all',
@@ -608,8 +613,8 @@ describe('Migration to v6', () => {
         tree.delete('/src/environments/environment.prod.ts');
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const config = getConfig(tree);
-        expect(config.projects.foo.targets.build.configurations).toEqual({
+        const build = getTarget(tree, 'build');
+        expect(build.configurations).toEqual({
           prod: {
             fileReplacements: [{
               replace: 'src/environments/environment.ts',
@@ -633,7 +638,7 @@ describe('Migration to v6', () => {
       it('should set the serve target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const serve = getConfig(tree).projects.foo.targets.serve;
+        const serve = getTarget(tree, 'serve');
         expect(serve.builder).toEqual('@angular-devkit/build-angular:dev-server');
         expect(serve.options).toEqual({
           browserTarget: 'foo:build',
@@ -646,7 +651,7 @@ describe('Migration to v6', () => {
       it('should set the test target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const test = getConfig(tree).projects.foo.targets['test'];
+        const test = getTarget(tree, 'test');
         expect(test.builder).toEqual('@angular-devkit/build-angular:karma');
         expect(test.options.main).toEqual('src/test.ts');
         expect(test.options.polyfills).toEqual('src/polyfills.ts');
@@ -665,7 +670,7 @@ describe('Migration to v6', () => {
       it('should set the extract i18n target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const extract = getConfig(tree).projects.foo.targets['extract-i18n'];
+        const extract = getTarget(tree, 'extract-i18n');
         expect(extract.builder).toEqual('@angular-devkit/build-angular:extract-i18n');
         expect(extract.options).toBeDefined();
         expect(extract.options.browserTarget).toEqual(`foo:build` );
@@ -674,7 +679,7 @@ describe('Migration to v6', () => {
       it('should set the lint target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const tslint = getConfig(tree).projects.foo.targets['lint'];
+        const tslint = getTarget(tree, 'lint');
         expect(tslint.builder).toEqual('@angular-devkit/build-angular:tslint');
         expect(tslint.options).toBeDefined();
         expect(tslint.options.tsConfig)
@@ -691,8 +696,8 @@ describe('Migration to v6', () => {
 
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const config = getConfig(tree);
-        const budgets = config.projects.foo.targets.build.configurations.production.budgets;
+        const build = getTarget(tree, 'build');
+        const budgets = build.configurations.production.budgets;
         expect(budgets.length).toEqual(1);
         expect(budgets[0].type).toEqual('bundle');
         expect(budgets[0].name).toEqual('main');
@@ -707,7 +712,7 @@ describe('Migration to v6', () => {
         const e2eProject = getConfig(tree).projects['foo-e2e'];
         expect(e2eProject.root).toBe('e2e');
         expect(e2eProject.sourceRoot).toBe('e2e');
-        const e2eOptions = e2eProject.targets.e2e;
+        const e2eOptions = e2eProject.architect.e2e;
         expect(e2eOptions.builder).toEqual('@angular-devkit/build-angular:protractor');
         const options = e2eOptions.options;
         expect(options.protractorConfig).toEqual('./protractor.conf.js');
@@ -721,7 +726,7 @@ describe('Migration to v6', () => {
         const e2eProject = getConfig(tree).projects['foo-e2e'];
         expect(e2eProject.root).toBe('apps/app1/e2e');
         expect(e2eProject.sourceRoot).toBe('apps/app1/e2e');
-        const e2eOptions = e2eProject.targets.e2e;
+        const e2eOptions = e2eProject.architect.e2e;
         expect(e2eOptions.builder).toEqual('@angular-devkit/build-angular:protractor');
         const options = e2eOptions.options;
         expect(options.protractorConfig).toEqual('./protractor.conf.js');
@@ -731,7 +736,7 @@ describe('Migration to v6', () => {
       it('should set the lint target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const tslint = getConfig(tree).projects['foo-e2e'].targets.lint;
+        const tslint = getConfig(tree).projects['foo-e2e'].architect.lint;
         expect(tslint.builder).toEqual('@angular-devkit/build-angular:tslint');
         expect(tslint.options).toBeDefined();
         expect(tslint.options.tsConfig).toEqual(['e2e/tsconfig.e2e.json']);
@@ -988,7 +993,7 @@ describe('Migration to v6', () => {
       tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
       tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
       const config = getConfig(tree);
-      const target = config.projects.foo.targets.server;
+      const target = config.projects.foo.architect.server;
       expect(target).toBeDefined();
       expect(target.builder).toEqual('@angular-devkit/build-angular:server');
       expect(target.options.outputPath).toEqual('dist/server');

packages/schematics/angular/service-worker/index_spec.ts

@@ -45,11 +45,12 @@ describe('Service Worker Schematic', () => {
     appTree = schematicRunner.runSchematic('application', appOptions, appTree);
   });
 
-  it('should update the proudction configuration', () => {
+  it('should update the production configuration', () => {
     const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
-    const swFlag = config.projects.bar.targets.build.configurations.production.serviceWorker;
+    const swFlag = config.projects.bar.architect
+      .build.configurations.production.serviceWorker;
     expect(swFlag).toEqual(true);
   });
 
@@ -58,7 +59,8 @@ describe('Service Worker Schematic', () => {
     const tree = schematicRunner.runSchematic('service-worker', options, appTree);
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
-    const swFlag = config.projects.bar.targets.build.options.serviceWorker;
+    const swFlag = config.projects.bar.architect
+      .build.options.serviceWorker;
     expect(swFlag).toEqual(true);
   });
 

packages/schematics/angular/universal/index_spec.ts

@@ -87,8 +87,8 @@ describe('Universal Schematic', () => {
       },
     });
     const angularConfig = JSON.parse(tree.readContent('angular.json'));
-    expect(angularConfig.projects.workspace.targets.server.options.tsConfig)
-      .toEqual('src/tsconfig.server.json');
+    expect(angularConfig.projects.workspace.architect
+      .server.options.tsConfig).toEqual('src/tsconfig.server.json');
   });
 
   it('should create a tsconfig file for a generated application', () => {
@@ -107,8 +107,8 @@ describe('Universal Schematic', () => {
       },
     });
     const angularConfig = JSON.parse(tree.readContent('angular.json'));
-    expect(angularConfig.projects.bar.targets.server.options.tsConfig)
-      .toEqual('projects/bar/tsconfig.server.json');
+    expect(angularConfig.projects.bar.architect
+      .server.options.tsConfig).toEqual('projects/bar/tsconfig.server.json');
   });
 
   it('should add dependency: @angular/platform-server', () => {
@@ -123,7 +123,7 @@ describe('Universal Schematic', () => {
     const filePath = '/angular.json';
     const contents = tree.readContent(filePath);
     const config = JSON.parse(contents.toString());
-    const targets = config.projects.bar.targets;
+    const targets = config.projects.bar.architect;
     expect(targets.server).toBeDefined();
     expect(targets.server.builder).toBeDefined();
     const opts = targets.server.options;

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

@@ -93,9 +93,9 @@ export default function () {
         { 'glob': '**/*', 'input': 'src/folder', 'output': 'folder' },
         { 'glob': 'glob-asset.txt' },
         { 'glob': 'output-asset.txt', 'output': 'output-folder' },
-        { 'glob': '**/*', 'input': 'node_modules/some-package/', 'output': 'package-folder' }
+        { 'glob': '**/*', 'input': 'node_modules/some-package/', 'output': 'package-folder' },
       ];
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.assets = assets;
       appArchitect.test.options.assets = assets;
     }))

tests/legacy-cli/e2e/tests/basic/scripts-array.ts

@@ -25,11 +25,11 @@ export default function () {
     'src/input-script.js': 'console.log(\'input-script\');',
     'src/lazy-script.js': 'console.log(\'lazy-script\');',
     'src/pre-rename-script.js': 'console.log(\'pre-rename-script\');',
-    'src/pre-rename-lazy-script.js': 'console.log(\'pre-rename-lazy-script\');'
+    'src/pre-rename-lazy-script.js': 'console.log(\'pre-rename-lazy-script\');',
   })
     .then(() => appendToFile('src/main.ts', 'import \'./string-script.js\';'))
     .then(() => updateJsonFile('angular.json', configJson => {
-      const appArchitect = configJson.projects['test-project'].targets;
+      const appArchitect = configJson.projects['test-project'].architect;
       appArchitect.build.options.scripts = [
         { input: 'src/string-script.js' },
         { input: 'src/zstring-script.js' },

tests/legacy-cli/e2e/tests/basic/styles-array.ts

@@ -14,10 +14,10 @@ export default function () {
     'src/input-style.css': '.input-style { color: red }',
     'src/lazy-style.css': '.lazy-style { color: red }',
     'src/pre-rename-style.css': '.pre-rename-style { color: red }',
-    'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }'
+    'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
   })
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
         { input: 'src/string-style.css' },
         { input: 'src/input-style.css' },

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'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect['server'] = {
         builder: '@angular-devkit/build-angular:server',
         options: {