test(@angular-devkit/build-angular): update tests to reflect Webpack 5 behavior

clydin · clydin · commit 94b207abf512 · 2021-02-24T16:15:56.000-05:00
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/errors_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/errors_spec.ts
@@ -94,6 +94,6 @@ describe('Browser Builder errors', () => {
     // Wait for the builder to complete
     await run.stop();
 
-    expect(logs.join()).toContain(`export 'missingExport' was not found in 'rxjs'`);
+    expect(logs.join()).toContain(`export 'missingExport' (imported as 'missingExport') was not found in 'rxjs'`);
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/lazy-module_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/lazy-module_spec.ts
@@ -69,7 +69,11 @@ describe('Browser Builder lazy modules', () => {
         }
 
         const { files } = await browserBuild(architect, host, target);
-        expect('lazy-lazy-module.js' in files).toBe(true);
+        if (veEnabled && name === 'string') {
+          expect(files['lazy-lazy-module.js']).toBeDefined();
+        } else {
+          expect('src_app_lazy_lazy_module_ts.js' in files).toBe(true);
+        }
       });
 
       it('supports lazy bundle for lazy routes with AOT', async () => {
@@ -79,9 +83,11 @@ describe('Browser Builder lazy modules', () => {
 
         const { files } = await browserBuild(architect, host, target, { aot: true });
         if (!veEnabled) {
-          const data = await files['lazy-lazy-module.js'];
+          const data = await files['src_app_lazy_lazy_module_ts.js'];
           expect(data).not.toBeUndefined('Lazy module output bundle does not exist');
           expect(data).toContain('LazyModule.ɵmod');
+        } else if (name === 'function') {
+          expect(files['src_app_lazy_lazy_module_ngfactory_js.js']).toBeDefined();
         } else {
           expect(files['lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
         }
@@ -146,7 +152,7 @@ describe('Browser Builder lazy modules', () => {
     host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     const { files } = await browserBuild(architect, host, target);
-    expect(files['lazy-module.js']).not.toBeUndefined();
+    expect(files['src_lazy-module_ts.js']).not.toBeUndefined();
   });
 
   it(`supports lazy bundle for dynamic import() calls`, async () => {
@@ -157,20 +163,11 @@ describe('Browser Builder lazy modules', () => {
         import(/*webpackChunkName: '[request]'*/'./lazy-' + lazyFileName);
       `,
     });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
-
-    const { files } = await browserBuild(architect, host, target);
-    expect(files['lazy-module.js']).not.toBeUndefined();
-  });
-
-  it(`supports lazy bundle for System.import() calls`, async () => {
-    const lazyfiles = {
-      'src/lazy-module.ts': 'export const value = 42;',
-      'src/main.ts': `declare var System: any; System.import('./lazy-module');`,
-    };
-
-    host.writeMultipleFiles(lazyfiles);
-    addLazyLoadedModulesInTsConfig(host, lazyfiles);
+    host.replaceInFile(
+      'src/tsconfig.app.json',
+      '"main.ts"',
+      `"main.ts","lazy-module.ts"`,
+    );
 
     const { files } = await browserBuild(architect, host, target);
     expect(files['lazy-module.js']).not.toBeUndefined();
@@ -184,10 +181,13 @@ describe('Browser Builder lazy modules', () => {
     });
 
     const { files } = await browserBuild(architect, host, target);
-    expect(files['one.js']).not.toBeUndefined();
-    expect(files['two.js']).not.toBeUndefined();
-    // TODO: the chunk with common modules used to be called `common`, see why that changed.
-    expect(files['default~one~two.js']).not.toBeUndefined();
+    expect(files['src_one_ts.js']).not.toBeUndefined();
+    expect(files['src_two_ts.js']).not.toBeUndefined();
+    if (veEnabled) {
+    expect(files['default-node_modules_angular_common_fesm2015_http_js.js']).not.toBeUndefined();
+    } else {
+      expect(files['default-node_modules_angular_common___ivy_ngcc___fesm2015_http_js.js']).toBeDefined();
+    }
   });
 
   it(`supports disabling the common bundle`, async () => {
@@ -198,9 +198,13 @@ describe('Browser Builder lazy modules', () => {
     });
 
     const { files } = await browserBuild(architect, host, target, { commonChunk: false });
-    expect(files['one.js']).not.toBeUndefined();
-    expect(files['two.js']).not.toBeUndefined();
-    expect(files['common.js']).toBeUndefined();
+    expect(files['src_one_ts.js']).not.toBeUndefined();
+    expect(files['src_two_ts.js']).not.toBeUndefined();
+    if (veEnabled) {
+    expect(files['default-node_modules_angular_common_fesm2015_http_js.js']).toBeUndefined();
+    } else {
+      expect(files['default-node_modules_angular_common___ivy_ngcc___fesm2015_http_js.js']).toBeUndefined();
+    }
   });
 
   it(`supports extra lazy modules array in JIT`, async () => {
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/rebuild_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/rebuild_spec.ts
@@ -82,7 +82,7 @@ describe('Browser Builder rebuilds', () => {
         debounceTime(rebuildDebounceTime),
         tap(result => {
           expect(result.success).toBe(true, 'build should succeed');
-          const hasLazyChunk = host.scopedSync().exists(normalize('dist/lazy-lazy-module.js'));
+          const hasLazyChunk = host.scopedSync().exists(normalize('dist/src_app_lazy_lazy_module_ts.js'));
           switch (phase) {
             case 1:
               // No lazy chunk should exist.
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/resolve-json-module_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/resolve-json-module_spec.ts
@@ -46,13 +46,13 @@ describe('Browser Builder resolve json module', () => {
 
         switch (buildCount) {
           case 1:
-            expect(content).toContain('\\"foo\\":\\"1\\"');
+            expect(content).toContain('"foo":"1"');
             host.writeMultipleFiles({
               'src/my-json-file.json': `{"foo": "2"}`,
             });
             break;
           case 2:
-            expect(content).toContain('\\"foo\\":\\"2\\"');
+            expect(content).toContain('"foo":"2"');
             break;
         }
 
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/styles_spec.ts
@@ -266,7 +266,7 @@ describe('Browser Builder styles', () => {
 
     const overrides = { extractCss: true, styles: [`src/styles.scss`] };
     await browserBuild(architect, host, target, overrides);
-  }, 30000);
+  });
 
   it(`supports font-awesome imports (tilde)`, async () => {
     host.writeMultipleFiles({
@@ -278,7 +278,7 @@ describe('Browser Builder styles', () => {
 
     const overrides = { extractCss: true, styles: [`src/styles.scss`] };
     await browserBuild(architect, host, target, overrides);
-  }, 30000);
+  });
 
   it(`supports font-awesome imports without extractCss`, async () => {
     host.writeMultipleFiles({
@@ -289,7 +289,7 @@ describe('Browser Builder styles', () => {
 
     const overrides = { extractCss: false, styles: [`src/styles.scss`] };
     await browserBuild(architect, host, target, overrides);
-  }, 30000);
+  });
 
   it(`uses autoprefixer`, async () => {
     host.writeMultipleFiles({
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/behavior/rebuild-errors_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/behavior/rebuild-errors_spec.ts
@@ -21,7 +21,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       const buildCount = await harness
         .execute({ outputLogsOnFailure: false })
         .pipe(
-          timeout(30000),
+          timeout(60000),
           concatMap(async ({ result, logs }, index) => {
             switch (index) {
               case 0:
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/named-chunks_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/named-chunks_spec.ts
@@ -9,8 +9,8 @@ import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
 const MAIN_OUTPUT = 'dist/main.js';
-const NAMED_LAZY_OUTPUT = 'dist/lazy-module.js';
-const UNNAMED_LAZY_OUTPUT = 'dist/0.js';
+const NAMED_LAZY_OUTPUT = 'dist/src_lazy-module_ts.js';
+const UNNAMED_LAZY_OUTPUT = 'dist/339.js';
 
 describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
   describe('Option: "namedChunks"', () => {
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/watch_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/watch_spec.ts
@@ -9,6 +9,11 @@ import { concatMap, count, take, timeout } from 'rxjs/operators';
 import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
+/**
+ * Maximum time in milliseconds for a single build of the test application
+ */
+const BUILD_TIMEOUT = 20000;
+
 describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
   describe('Option: "watch"', () => {
     it('does not wait for file changes when false', (done) => {
@@ -22,7 +27,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       let count = 0;
       harness
         .execute()
-        .pipe(timeout(15000))
+        .pipe(timeout(BUILD_TIMEOUT))
         .subscribe({
           complete() {
             expect(count).toBe(1);
@@ -48,7 +53,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       let count = 0;
       harness
         .execute()
-        .pipe(timeout(15000))
+        .pipe(timeout(BUILD_TIMEOUT))
         .subscribe({
           complete() {
             expect(count).toBe(1);
@@ -74,7 +79,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       const buildCount = await harness
         .execute()
         .pipe(
-          timeout(30000),
+          timeout(BUILD_TIMEOUT * 2),
           concatMap(async ({ result }, index) => {
             expect(result?.success).toBe(true);
 
diff --git a/packages/angular_devkit/build_angular/src/test-utils.ts b/packages/angular_devkit/build_angular/src/test-utils.ts
@@ -81,6 +81,13 @@ export async function browserBuild(
   const output = (await run.result) as BrowserBuilderOutput;
   expect(output.success).toBe(true);
 
+  if (!output.success) {
+    return {
+      output,
+      files: {},
+    };
+  }
+
   expect(output.outputPaths[0]).not.toBeUndefined();
   const outputPath = normalize(output.outputPaths[0]);
 
diff --git a/tests/legacy-cli/e2e/tests/build/differential-loading-sri.ts b/tests/legacy-cli/e2e/tests/build/differential-loading-sri.ts
@@ -1,4 +1,5 @@
 import { createHash } from 'crypto';
+import { getGlobalVariable } from '../../utils/env';
 import {
   appendToFile,
   expectFileToMatch,
@@ -46,6 +47,7 @@ export default async function () {
     '--prod',
     '--subresource-integrity',
     '--output-hashing=none',
+    '--named-chunks',
     '--output-path=dist/first',
   );
 
@@ -55,14 +57,19 @@ export default async function () {
     '--prod',
     '--subresource-integrity',
     '--output-hashing=none',
+    '--named-chunks',
     '--output-path=dist/second',
   );
 
+  const lazyFileBase = getGlobalVariable('argv')['ve']
+    ? 'src_app_lazy_lazy_module_ngfactory_js'
+    : 'src_app_lazy_lazy_module_ts';
+
   const codeHashES5 = createHash('sha384')
-    .update(await readFile('dist/first/5-es5.js'))
+    .update(await readFile(`dist/first/${lazyFileBase}-es5.js`))
     .digest('base64');
   const codeHashES2015 = createHash('sha384')
-    .update(await readFile('dist/first/5-es2015.js'))
+    .update(await readFile(`dist/first/${lazyFileBase}-es2015.js`))
     .digest('base64');
 
   await expectFileToMatch('dist/first/runtime-es5.js', 'sha384-' + codeHashES5);
diff --git a/tests/legacy-cli/e2e/tests/misc/lazy-module.ts b/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
@@ -28,30 +28,10 @@ export default function() {
       }
       oldNumberOfFiles = currentNumberOfDistFiles;
 
-      if (!distFiles.includes('too-lazy-lazy-module.js')) {
+      if (!distFiles.includes('src_app_too_lazy_lazy_module_ts.js')) {
         throw new Error('The lazy module chunk did not use a unique name.');
       }
     })
-    // verify System.import still works
-    .then(() => writeFile('src/app/lazy-file.ts', ''))
-    .then(() => appendToFile('src/app/app.component.ts', `
-      // verify other System.import still work
-      declare var System: any;
-      const lazyFile = 'file';
-      System.import(/*webpackChunkName: '[request]'*/'./lazy-' + lazyFile);
-    `))
-    .then(() => ng('build', '--named-chunks'))
-    .then(() => readdirSync('dist/test-project'))
-    .then((distFiles) => {
-      const currentNumberOfDistFiles = distFiles.length;
-      if (oldNumberOfFiles >= currentNumberOfDistFiles) {
-        throw new Error('A bundle for the lazy file was not created.');
-      }
-      if (!distFiles.includes('lazy-file.js')) {
-        throw new Error('The lazy file chunk did not have a name.');
-      }
-      oldNumberOfFiles = currentNumberOfDistFiles;
-    })
     // verify 'import *' syntax doesn't break lazy modules
     .then(() => installPackage('moment'))
     .then(() => appendToFile('src/app/app.component.ts', `
