test: use Ivy by default, opt-in to VE

Author: filipesilva

.circleci/config.yml

@@ -164,7 +164,7 @@ jobs:
 
   test-large:
     parameters:
-      ivy:
+      ve:
         type: boolean
         default: false
       glob:
@@ -176,11 +176,11 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: yarn webdriver-update
-      - run: yarn test-large --full <<# parameters.ivy >>--ivy<</ parameters.ivy >> <<# parameters.glob >>--glob="<< parameters.glob >>"<</ parameters.glob >> --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - run: yarn test-large --full <<# parameters.ve >>--ve<</ parameters.ve >> <<# parameters.glob >>--glob="<< parameters.glob >>"<</ parameters.glob >> --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   e2e-cli:
     parameters:
-      ivy:
+      ve:
         type: boolean
         default: false
       snapshots:
@@ -195,7 +195,7 @@ jobs:
           command: ./.circleci/env.sh
       - run:
           name: Execute CLI E2E Tests
-          command: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ivy >>--ivy<</ parameters.ivy >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >>
+          command: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ve >>--ve<</ parameters.ve >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >>
 
   e2e-cli-node-10:
     executor:
@@ -232,7 +232,8 @@ jobs:
         # Waits for the Saucelabs tunnel to be ready. This ensures that we don't run tests
         # too early without Saucelabs not being ready.
       - run: ./scripts/saucelabs/wait-for-tunnel.sh
-      - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts
+      - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts --ve
+      - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts 
       - run: ./scripts/saucelabs/stop-tunnel.sh
 
   build:
@@ -249,7 +250,7 @@ jobs:
       - attach_workspace: *attach_options
       - run: yarn webdriver-update
       - run: yarn test-large --full --flakey
-      - run: yarn test-large --full --flakey --ivy=true
+      - run: yarn test-large --full --flakey --ve=true
 
   build-bazel:
     executor: action-executor
@@ -307,7 +308,7 @@ jobs:
       - run: yarn build
       - run: yarn test --full
       # Run partial e2e suite on PRs only. Master will run the full e2e suite with sharding.
-      - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }
+      - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/basic/**" }
 
   e2e-cli-win:
     executor: windows-executor
@@ -348,8 +349,8 @@ workflows:
           requires:
             - build
       - test-large:
-          name: test-large-ivy
-          ivy: true
+          name: test-large-ve
+          ve: true
           glob: "packages/angular_devkit/@(build_angular|build_ng_packagr)/@(src|test)/@(build|browser)/*_spec_large.ts"
           requires:
             - build
@@ -361,8 +362,8 @@ workflows:
           requires:
             - build
       - e2e-cli:
-          name: e2e-cli-ivy
-          ivy: true
+          name: e2e-cli-ve
+          ve: true
           requires:
             - build
       - e2e-cli:
@@ -379,9 +380,9 @@ workflows:
                     circleci step halt
                   fi
       - e2e-cli:
-          name: e2e-cli-ng-ivy-snapshots
+          name: e2e-cli-ng-ve-snapshots
           snapshots: true
-          ivy: true
+          ve: true
           requires:
             - e2e-cli
           pre-steps:

packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts

@@ -9,10 +9,11 @@
 import { Architect } from '@angular-devkit/architect/src/architect';
 import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
 import * as express from 'express'; // tslint:disable-line:no-implicit-dependencies
-import { createArchitect, host } from '../utils';
+import { createArchitect, host, veEnabled } from '../utils';
 
 
-describe('AppShell Builder', () => {
+// DISABLED_FOR_IVY   These should pass but are currently not supported
+(veEnabled ? describe : xdescribe)('AppShell Builder', () => {
   const target = { project: 'app', target: 'app-shell' };
   let architect: Architect;
 

packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts

@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
-import { createArchitect, host, ivyEnabled } from '../utils';
+import { createArchitect, host, veEnabled } from '../utils';
 
 describe('Browser Builder AOT', () => {
   const targetSpec = { project: 'app', target: 'build' };
@@ -31,7 +31,7 @@ describe('Browser Builder AOT', () => {
 
     const fileName = join(normalize(output.outputPath), 'main.js');
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    if (ivyEnabled) {
+    if (!veEnabled) {
       expect(content).toContain('AppComponent.ngComponentDef');
     } else {
       expect(content).toMatch(/platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/);

packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { createArchitect, host, ivyEnabled } from '../utils';
+import { createArchitect, host, veEnabled } from '../utils';
 
 describe('Browser Builder errors', () => {
   const targetSpec = { project: 'app', target: 'build' };
@@ -64,7 +64,7 @@ describe('Browser Builder errors', () => {
     const run = await architect.scheduleTarget(targetSpec, { aot: true }, { logger });
     const output = await run.result;
     expect(output.success).toBe(false);
-    if (ivyEnabled) {
+    if (!veEnabled) {
       expect(logs.join()).toContain('selector must be a string');
     } else {
       expect(logs.join()).toContain('Function expressions are not supported in');

packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts

@@ -8,10 +8,10 @@
 import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
-import { createArchitect, host, ivyEnabled } from '../utils';
+import { createArchitect, host, veEnabled } from '../utils';
 
 // DISABLED_FOR_IVY - These should pass but are currently not supported
-(ivyEnabled ? xdescribe : describe)('Browser Builder i18n', () => {
+(veEnabled ? describe : xdescribe)('Browser Builder i18n', () => {
   const emptyTranslationFile = `
       <?xml version="1.0" encoding="UTF-8" ?>
       <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">

packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts

@@ -13,10 +13,10 @@ import {
   browserBuild,
   createArchitect,
   host,
-  ivyEnabled,
   lazyModuleFiles,
   lazyModuleFnImport,
   lazyModuleStringImport,
+  veEnabled,
 } from '../utils';
 
 // tslint:disable-next-line:no-big-function
@@ -64,14 +64,14 @@ describe('Browser Builder lazy modules', () => {
       });
 
       it('should show error when lazy route is invalid on watch mode AOT', async () => {
-        if (ivyEnabled && name === 'string') {
+        if (!veEnabled && name === 'string') {
           pending('Does not apply to Ivy.');
 
           return;
         }
 
         // DISABLED_FOR_IVY - These should pass but are currently not supported
-        if (ivyEnabled) {
+        if (!veEnabled) {
           pending('Broken in Ivy');
 
           return;
@@ -113,7 +113,7 @@ describe('Browser Builder lazy modules', () => {
         addLazyLoadedModulesInTsConfig(host, lazyModuleFiles);
 
         const { files } = await browserBuild(architect, host, target, { aot: true });
-        if (ivyEnabled) {
+        if (!veEnabled) {
           const data = await files['lazy-lazy-module.js'];
           expect(data).not.toBeUndefined('Lazy module output bundle does not exist');
           expect(data).toContain('LazyModule.ngModuleDef');
@@ -257,7 +257,7 @@ describe('Browser Builder lazy modules', () => {
       aot: true,
     });
 
-    if (ivyEnabled) {
+    if (!veEnabled) {
       const data = await files['src-app-lazy-lazy-module.js'];
       expect(data).not.toBeUndefined('Lazy module output bundle does not exist');
       expect(data).toContain('LazyModule.ngModuleDef');

packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts

@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
-import { browserBuild, createArchitect, host, ivyEnabled } from '../utils';
+import { browserBuild, createArchitect, host, veEnabled } from '../utils';
 
 describe('Browser Builder no entry module', () => {
   const target = { project: 'app', target: 'build' };
@@ -29,7 +29,7 @@ describe('Browser Builder no entry module', () => {
   });
 
   it('reports warning when no bootstrap code', async () => {
-    if (ivyEnabled) {
+    if (!veEnabled) {
       pending('Does not apply to Ivy.');
 
       return;

packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts

@@ -13,10 +13,10 @@ import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
 import {
   createArchitect,
   host,
-  ivyEnabled,
   lazyModuleFiles,
   lazyModuleFnImport,
   outputPath,
+  veEnabled,
 } from '../utils';
 
 describe('Browser Builder rebuilds', () => {
@@ -267,7 +267,7 @@ describe('Browser Builder rebuilds', () => {
 
   it('rebuilds after errors in AOT', async () => {
     // DISABLED_FOR_IVY - These should pass but are currently not supported
-    if (ivyEnabled) {
+    if (!veEnabled) {
       pending('Broken in Ivy');
 
       return;
@@ -282,7 +282,7 @@ describe('Browser Builder rebuilds', () => {
 
     const overrides = { watch: true, aot: true };
     const logger = new TestLogger('rebuild-aot-errors');
-    const staticAnalysisError = ivyEnabled
+    const staticAnalysisError = !veEnabled
       ? 'selector must be a string'
       : 'Function expressions are not supported in decorators';
     const syntaxError = 'Declaration or statement expected.';

packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts

@@ -7,7 +7,7 @@
  */
 import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host, ivyEnabled, outputPath } from '../utils';
+import { createArchitect, host, outputPath, veEnabled } from '../utils';
 
 describe('Browser Builder allow svg', () => {
   const target = { project: 'app', target: 'build' };
@@ -55,7 +55,7 @@ describe('Browser Builder allow svg', () => {
         host.scopedSync().read(join(outputPath, 'main.js')),
       );
 
-      if (ivyEnabled) {
+      if (!veEnabled) {
         expect(content).toContain('ɵɵnamespaceSVG');
       } else {
         expect(content).toContain('":svg:svg"');

packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts

@@ -9,7 +9,7 @@ import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { debounceTime, take, tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser/index';
-import { createArchitect, host, ivyEnabled } from '../utils';
+import { createArchitect, host, veEnabled } from '../utils';
 
 // tslint:disable-next-line:no-big-function
 describe('Browser Builder unused files warnings', () => {
@@ -25,7 +25,7 @@ describe('Browser Builder unused files warnings', () => {
   afterEach(async () => host.restore().toPromise());
 
   it('should not show warning when all files are used', async () => {
-    if (!ivyEnabled) {
+    if (veEnabled) {
       // TODO: https://github.com/angular/angular-cli/issues/15056
       pending('Only supported in Ivy.');
 
@@ -43,7 +43,7 @@ describe('Browser Builder unused files warnings', () => {
   });
 
   it('should show warning when some files are unused', async () => {
-    if (!ivyEnabled) {
+    if (veEnabled) {
       // TODO: https://github.com/angular/angular-cli/issues/15056
       pending('Only supported in Ivy.');
 
@@ -67,7 +67,7 @@ describe('Browser Builder unused files warnings', () => {
   });
 
   it('should not show warning when type files are used', async () => {
-    if (!ivyEnabled) {
+    if (veEnabled) {
       // TODO: https://github.com/angular/angular-cli/issues/15056
       pending('Only supported in Ivy.');
 
@@ -95,7 +95,7 @@ describe('Browser Builder unused files warnings', () => {
   });
 
   it('works for rebuilds', async () => {
-    if (!ivyEnabled) {
+    if (veEnabled) {
       // TODO: https://github.com/angular/angular-cli/issues/15056
       pending('Only supported in Ivy.');
 
@@ -163,7 +163,7 @@ describe('Browser Builder unused files warnings', () => {
   });
 
   it('should only show warning once per file', async () => {
-    if (!ivyEnabled) {
+    if (veEnabled) {
       // TODO: https://github.com/angular/angular-cli/issues/15056
       pending('Only supported in Ivy.');
 

packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts

@@ -7,10 +7,10 @@
  */
 import { Architect } from '@angular-devkit/architect';
 import * as path from 'path';
-import { browserBuild, createArchitect, host, ivyEnabled } from '../utils';
+import { browserBuild, createArchitect, host, veEnabled } from '../utils';
 
 // DISABLED_FOR_IVY   These should pass but are currently not supported
-(ivyEnabled ? xdescribe : describe)('Browser Builder external source map', () => {
+(veEnabled ? describe : xdescribe)('Browser Builder external source map', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
 

packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts

@@ -8,10 +8,11 @@
 import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, extractI18nTargetSpec, host } from '../utils';
+import { createArchitect, extractI18nTargetSpec, host, veEnabled } from '../utils';
 
 
-describe('Extract i18n Target', () => {
+// DISABLED_FOR_IVY   These should pass but are currently not supported
+(veEnabled ? describe : xdescribe)('Extract i18n Target', () => {
   const extractionFile = join(normalize('src'), 'messages.xlf');
   let architect: Architect;
 

packages/angular_devkit/build_angular/test/server/base_spec_large.ts

@@ -10,10 +10,11 @@ import { Architect } from '@angular-devkit/architect';
 import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser';
-import { createArchitect, host } from '../utils';
+import { createArchitect, host, veEnabled } from '../utils';
 
 
-describe('Server Builder', () => {
+// DISABLED_FOR_IVY   These should pass but are currently not supported
+(veEnabled ? describe : xdescribe)('Server Builder', () => {
   const target = { project: 'app', target: 'server' };
   let architect: Architect;
 

packages/angular_devkit/build_angular/test/utils.ts

@@ -20,12 +20,12 @@ import {
 } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../src/browser';
 
-export const ivyEnabled = process.argv.includes('--ivy');
+export const veEnabled = process.argv.includes('--ve');
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
 export const workspaceRoot = join(
   devkitRoot,
-  `tests/angular_devkit/build_angular/hello-world-app${ivyEnabled ? '-ivy' : ''}/`,
+  `tests/angular_devkit/build_angular/hello-world-app${veEnabled ? '-ve' : ''}/`,
 );
 export const host = new TestProjectHost(workspaceRoot);
 export const outputPath: Path = normalize('dist');