test: change E2E to zoneless

alan-agius4 · alan-agius4 · commit 6846024c64c8 · 2025-09-24T15:46:09.000+02:00
The e2e tests reflect the new default behaviour.
diff --git a/packages/angular_devkit/build_angular/src/builders/prerender/index.ts b/packages/angular_devkit/build_angular/src/builders/prerender/index.ts
@@ -168,7 +168,10 @@ async function _renderUniversal(
     browserOptions.optimization,
   );
 
-  const zonePackage = require.resolve('zone.js', { paths: [context.workspaceRoot] });
+  let zonePackage: string | undefined;
+  try {
+    zonePackage = require.resolve('zone.js/node', { paths: [context.workspaceRoot] });
+  } catch {}
 
   const { baseOutputPath = '' } = serverResult;
   const worker = new Piscina({
diff --git a/tests/legacy-cli/e2e/initialize/500-create-project.ts b/tests/legacy-cli/e2e/initialize/500-create-project.ts
@@ -20,7 +20,7 @@ export default async function () {
     // Ensure local test registry is used when outside a project
     await setNPMConfigRegistry(true);
 
-    await ng('new', 'test-project', '--skip-install', '--no-zoneless');
+    await ng('new', 'test-project', '--skip-install');
     await expectFileToExist(join(process.cwd(), 'test-project'));
     process.chdir('./test-project');
 
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -58,7 +58,6 @@ export default async function () {
     await expectFileToMatch(
       'dist/test-project/browser/index.html',
       [
-        '<script src="polyfills.js" type="module"></script>',
         '<script src="scripts.js" defer></script>',
         '<script src="renamed-script.js" defer></script>',
         '<script src="main.js" type="module"></script>',
@@ -69,7 +68,6 @@ export default async function () {
       'dist/test-project/browser/index.html',
       [
         '<script src="runtime.js" type="module"></script>',
-        '<script src="polyfills.js" type="module"></script>',
         '<script src="scripts.js" defer></script>',
         '<script src="renamed-script.js" defer></script>',
         '<script src="vendor.js" type="module"></script>',
diff --git a/tests/legacy-cli/e2e/tests/build/app-shell/app-shell-ngmodule.ts b/tests/legacy-cli/e2e/tests/build/app-shell/app-shell-ngmodule.ts
@@ -7,15 +7,7 @@ import { updateJsonFile } from '../../../utils/project';
 const snapshots = require('../../../ng-snapshot/package.json');
 
 export default async function () {
-  await ng(
-    'generate',
-    'app',
-    'test-project-two',
-    '--routing',
-    '--no-standalone',
-    '--skip-install',
-    '--no-zoneless',
-  );
+  await ng('generate', 'app', 'test-project-two', '--routing', '--no-standalone', '--skip-install');
   await ng('generate', 'app-shell', '--project', 'test-project-two');
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
diff --git a/tests/legacy-cli/e2e/tests/build/jit-ngmodule.ts b/tests/legacy-cli/e2e/tests/build/jit-ngmodule.ts
@@ -3,14 +3,7 @@ import { ng } from '../../utils/process';
 import { updateJsonFile, useCIChrome, useCIDefaults } from '../../utils/project';
 
 export default async function () {
-  await ng(
-    'generate',
-    'app',
-    'test-project-two',
-    '--no-standalone',
-    '--skip-install',
-    '--no-zoneless',
-  );
+  await ng('generate', 'app', 'test-project-two', '--no-standalone', '--skip-install');
   await ng('generate', 'private-e2e', '--related-app-name=test-project-two');
 
   // Setup testing to use CI Chrome.
diff --git a/tests/legacy-cli/e2e/tests/build/prerender/http-requests-assets.ts b/tests/legacy-cli/e2e/tests/build/prerender/http-requests-assets.ts
@@ -1,7 +1,7 @@
 import { ng } from '../../../utils/process';
 import { getGlobalVariable } from '../../../utils/env';
-import { expectFileToMatch, rimraf, writeMultipleFiles } from '../../../utils/fs';
-import { installWorkspacePackages } from '../../../utils/packages';
+import { expectFileToMatch, writeMultipleFiles } from '../../../utils/fs';
+import { installWorkspacePackages, uninstallPackage } from '../../../utils/packages';
 import { useSha } from '../../../utils/project';
 
 export default async function () {
@@ -11,16 +11,15 @@ export default async function () {
     return;
   }
 
-  // Forcibly remove in case another test doesn't clean itself up.
-  await rimraf('node_modules/@angular/ssr');
-  await ng('add', '@angular/ssr', '--skip-confirmation');
+  await uninstallPackage('@angular/ssr');
+  await ng('add', '@angular/ssr', '--skip-confirmation', '--skip-install');
   await useSha();
   await installWorkspacePackages();
 
   await writeMultipleFiles({
     // Add http client and route
     'src/app/app.config.ts': `
-      import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
+      import { ApplicationConfig } from '@angular/core';
       import { provideRouter } from '@angular/router';
 
       import {Home} from './home/home';
@@ -35,7 +34,6 @@ export default async function () {
           }]),
           provideClientHydration(),
           provideHttpClient(withFetch()),
-          provideZoneChangeDetection({ eventCoalescing: true }),
         ],
       };
     `,
@@ -46,7 +44,7 @@ export default async function () {
 
     // Update component to do an HTTP call to asset.
     'src/app/app.ts': `
-    import { Component, inject } from '@angular/core';
+    import { ChangeDetectorRef, Component, inject } from '@angular/core';
     import { CommonModule } from '@angular/common';
     import { RouterOutlet } from '@angular/router';
     import { HttpClient } from '@angular/common/http';
@@ -64,15 +62,18 @@ export default async function () {
     export class App {
       data: any;
       dataWithSpace: any;
+      private readonly cdr: ChangeDetectorRef = inject(ChangeDetectorRef);
 
       constructor() {
         const http = inject(HttpClient);
         http.get('/media.json').subscribe((d) => {
           this.data = d;
+          this.cdr.markForCheck();
         });
 
         http.get('/media%20with-space.json').subscribe((d) => {
           this.dataWithSpace = d;
+          this.cdr.markForCheck();
         });
       }
     }
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-ngmodule.ts b/tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-ngmodule.ts
@@ -15,14 +15,7 @@ export default async function () {
   // forcibly remove in case another test doesn't clean itself up
   await rimraf('node_modules/@angular/ssr');
 
-  await ng(
-    'generate',
-    'app',
-    'test-project-two',
-    '--no-standalone',
-    '--skip-install',
-    '--no-zoneless',
-  );
+  await ng('generate', 'app', 'test-project-two', '--no-standalone', '--skip-install');
   await ng('generate', 'private-e2e', '--related-app-name=test-project-two');
 
   // Setup testing to use CI Chrome.
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static-http-calls.ts b/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static-http-calls.ts
@@ -22,7 +22,7 @@ export default async function () {
     'public/media.json': JSON.stringify({ dataFromAssets: true }),
     // Update component to do an HTTP call to asset and API.
     'src/app/app.ts': `
-    import { Component, inject } from '@angular/core';
+    import { ChangeDetectorRef, Component, inject } from '@angular/core';
     import { JsonPipe } from '@angular/common';
     import { RouterOutlet } from '@angular/router';
     import { HttpClient } from '@angular/common/http';
@@ -40,23 +40,26 @@ export default async function () {
     export class App {
       assetsData: any;
       apiData: any;
+      private readonly cdr: ChangeDetectorRef = inject(ChangeDetectorRef);
 
       constructor() {
         const http = inject(HttpClient);
 
         http.get('/media.json').toPromise().then((d) => {
           this.assetsData = d;
+          this.cdr.markForCheck();
         });
 
         http.get('/api').toPromise().then((d) => {
           this.apiData = d;
+          this.cdr.markForCheck();
         });
       }
     }
     `,
     // Add http client and route
     'src/app/app.config.ts': `
-      import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
+      import { ApplicationConfig } from '@angular/core';
       import { provideRouter } from '@angular/router';
 
       import { Home } from './home/home';
@@ -71,7 +74,6 @@ export default async function () {
           }]),
           provideClientHydration(),
           provideHttpClient(withFetch()),
-          provideZoneChangeDetection({ eventCoalescing: true }),
         ],
       };
     `,
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static-i18n_APP_BASE_HREF.ts b/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static-i18n_APP_BASE_HREF.ts
@@ -1,7 +1,7 @@
 import { join } from 'node:path';
 import { existsSync } from 'node:fs';
 import assert from 'node:assert';
-import { expectFileNotToExist, expectFileToMatch, writeFile } from '../../../utils/fs';
+import { expectFileToMatch, writeFile } from '../../../utils/fs';
 import { ng, noSilentNg, silentNg } from '../../../utils/process';
 import { installWorkspacePackages, uninstallPackage } from '../../../utils/packages';
 import { useSha } from '../../../utils/project';
@@ -66,7 +66,7 @@ export default async function () {
   await writeFile(
     'src/app/app.config.ts',
     `
-      import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
+      import { ApplicationConfig } from '@angular/core';
       import { provideRouter } from '@angular/router';
 
       import { routes } from './app.routes';
@@ -75,7 +75,6 @@ export default async function () {
 
       export const appConfig: ApplicationConfig = {
         providers: [
-          provideZoneChangeDetection({ eventCoalescing: true }),
           provideRouter(routes),
           provideClientHydration(),
           {
diff --git a/tests/legacy-cli/e2e/tests/build/sourcemap.ts b/tests/legacy-cli/e2e/tests/build/sourcemap.ts
@@ -12,10 +12,10 @@ export default async function () {
   await ng('build', '--output-hashing=bundles', '--source-map', '--configuration=development');
 
   await ng('build', '--output-hashing=none', '--source-map');
-  await testForSourceMaps(useWebpackBuilder ? 3 : 2);
+  await testForSourceMaps(useWebpackBuilder ? 2 : 1);
 
   await ng('build', '--output-hashing=none', '--source-map', '--configuration=development');
-  await testForSourceMaps(useWebpackBuilder ? 4 : 2);
+  await testForSourceMaps(useWebpackBuilder ? 3 : 1);
 }
 
 async function testForSourceMaps(expectedNumberOfFiles: number): Promise<void> {
diff --git a/tests/legacy-cli/e2e/tests/build/wasm-esm.ts b/tests/legacy-cli/e2e/tests/build/wasm-esm.ts
@@ -62,16 +62,6 @@ export default async function () {
     // of a JIT production build.
     json.projects['test-project'].architect.build.options.polyfills = [];
   });
-  await replaceInFile(
-    'src/app/app.config.ts',
-    'provideZoneChangeDetection',
-    'provideZonelessChangeDetection',
-  );
-  await replaceInFile(
-    'src/app/app.config.ts',
-    'provideZoneChangeDetection({ eventCoalescing: true })',
-    'provideZonelessChangeDetection()',
-  );
 
   await ng('build');
 
@@ -94,7 +84,7 @@ export default async function () {
   await ng('e2e');
 
   // Setup prerendering and build to test Node.js functionality
-  await ng('add', '@angular/ssr', '--skip-confirmation');
+  await ng('add', '@angular/ssr', '--skip-confirmation', '--skip-install');
   await useSha();
   await installWorkspacePackages();
 
diff --git a/tests/legacy-cli/e2e/tests/commands/builder-project-by-cwd.ts b/tests/legacy-cli/e2e/tests/commands/builder-project-by-cwd.ts
@@ -3,8 +3,8 @@ import { expectFileToExist } from '../../utils/fs';
 import { ng } from '../../utils/process';
 
 export default async function () {
-  await ng('generate', 'app', 'second-app', '--skip-install', '--no-zoneless');
-  await ng('generate', 'app', 'third-app', '--skip-install', '--no-zoneless');
+  await ng('generate', 'app', 'second-app', '--skip-install');
+  await ng('generate', 'app', 'third-app', '--skip-install');
   const startCwd = process.cwd();
 
   try {
diff --git a/tests/legacy-cli/e2e/tests/commands/project-cannot-be-determined-by-cwd.ts b/tests/legacy-cli/e2e/tests/commands/project-cannot-be-determined-by-cwd.ts
@@ -14,8 +14,8 @@ export default async function () {
     delete workspaceJson.projects['test-project'];
   });
 
-  await ng('generate', 'app', 'second-app', '--skip-install', '--no-zoneless');
-  await ng('generate', 'app', 'third-app', '--skip-install', '--no-zoneless');
+  await ng('generate', 'app', 'second-app', '--skip-install');
+  await ng('generate', 'app', 'third-app', '--skip-install');
 
   const startCwd = process.cwd();
 
diff --git a/tests/legacy-cli/e2e/tests/commands/serve/ssr-http-requests-assets.ts b/tests/legacy-cli/e2e/tests/commands/serve/ssr-http-requests-assets.ts
@@ -1,30 +1,20 @@
 import assert from 'node:assert';
 
 import { killAllProcesses, ng } from '../../../utils/process';
-import { rimraf, writeMultipleFiles } from '../../../utils/fs';
-import { installWorkspacePackages } from '../../../utils/packages';
+import { writeMultipleFiles } from '../../../utils/fs';
+import { installWorkspacePackages, uninstallPackage } from '../../../utils/packages';
 import { ngServe, useSha } from '../../../utils/project';
-import { getGlobalVariable } from '../../../utils/env';
 
 export default async function () {
-  const useWebpackBuilder = !getGlobalVariable('argv')['esbuild'];
-
-  // Forcibly remove in case another test doesn't clean itself up.
-  await rimraf('node_modules/@angular/ssr');
-  if (useWebpackBuilder) {
-    // `--server-routing` not supported in `browser` builder.
-    await ng('add', '@angular/ssr', '--skip-confirmation', '--skip-install');
-  } else {
-    await ng('add', '@angular/ssr', '--skip-confirmation', '--skip-install');
-  }
-
+  await uninstallPackage('@angular/ssr');
+  await ng('add', '@angular/ssr', '--skip-confirmation', '--skip-install');
   await useSha();
   await installWorkspacePackages();
 
   await writeMultipleFiles({
     // Add http client and route
     'src/app/app.config.ts': `
-      import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
+      import { ApplicationConfig } from '@angular/core';
       import { provideRouter } from '@angular/router';
 
       import { Home } from './home/home';
@@ -39,15 +29,14 @@ export default async function () {
           }]),
           provideClientHydration(),
           provideHttpClient(withFetch()),
-          provideZoneChangeDetection({ eventCoalescing: true }),
         ],
       };
     `,
     // Add asset
     'public/media.json': JSON.stringify({ dataFromAssets: true }),
     // Update component to do an HTTP call to asset.
     'src/app/app.ts': `
-    import { Component, inject } from '@angular/core';
+    import { ChangeDetectorRef, Component, inject } from '@angular/core';
     import { CommonModule } from '@angular/common';
     import { RouterOutlet } from '@angular/router';
     import { HttpClient } from '@angular/common/http';
@@ -63,10 +52,13 @@ export default async function () {
     })
     export class App {
       data: any;
+      private readonly cdr: ChangeDetectorRef = inject(ChangeDetectorRef);
+
       constructor() {
         const http = inject(HttpClient);
         http.get('/media.json').toPromise().then((d) => {
           this.data = d;
+          this.cdr.markForCheck();
         });
       }
     }
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts b/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-no-zoneless-ng-module.ts b/tests/legacy-cli/e2e/tests/generate/application/application-no-zoneless-ng-module.ts
@@ -0,0 +1,16 @@
+import { installWorkspacePackages, uninstallPackage } from '../../../utils/packages';
+import { ng } from '../../../utils/process';
+import { useCIChrome, useSha } from '../../../utils/project';
+
+export default async function () {
+  try {
+    await ng('generate', 'app', 'ngmodules', '--no-standalone', '--skip-install', '--no-zoneless');
+    await useSha();
+    await installWorkspacePackages();
+    await useCIChrome('ngmodules', 'projects/ngmodules');
+    await ng('test', 'ngmodules', '--watch=false');
+    await ng('build', 'ngmodules');
+  } finally {
+    await uninstallPackage('zone.js');
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-no-zoneless-standalone.ts b/tests/legacy-cli/e2e/tests/generate/application/application-no-zoneless-standalone.ts
@@ -0,0 +1,16 @@
+import { installWorkspacePackages, uninstallPackage } from '../../../utils/packages';
+import { ng } from '../../../utils/process';
+import { useCIChrome, useSha } from '../../../utils/project';
+
+export default async function () {
+  try {
+    await ng('generate', 'app', 'standalone', '--standalone', '--skip-install', '--no-zoneless');
+    await useSha();
+    await installWorkspacePackages();
+    await useCIChrome('standalone', 'projects/standalone');
+    await ng('test', 'standalone', '--watch=false');
+    await ng('build', 'standalone');
+  } finally {
+    await uninstallPackage('zone.js');
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-zoneless-ng-module.ts b/tests/legacy-cli/e2e/tests/generate/application/application-zoneless-ng-module.ts
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-zoneless-standalone.ts b/tests/legacy-cli/e2e/tests/generate/application/application-zoneless-standalone.ts
diff --git a/tests/legacy-cli/e2e/tests/jest/no-zoneless.ts b/tests/legacy-cli/e2e/tests/jest/no-zoneless.ts
diff --git a/tests/legacy-cli/e2e/tests/misc/multiple-targets.ts b/tests/legacy-cli/e2e/tests/misc/multiple-targets.ts
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-error-stack.ts b/tests/legacy-cli/e2e/tests/vite/ssr-error-stack.ts
diff --git a/tests/legacy-cli/e2e/utils/jest.ts b/tests/legacy-cli/e2e/utils/jest.ts
