test: update E2E tests to account for the .html template extension

clydin · clydin · commit 0253bc9c452d · 2025-04-08T09:05:42.000-04:00
Effectively reverts commit 770b993 while accounting for the `.component` change.
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -83,7 +83,7 @@ export default async function () {
   await Promise.all([
     waitForAnyProcessOutputToMatch(validBundleRegEx),
     writeMultipleFiles({
-      'src/app/app.ng.html': '<h1>testingTESTING123</h1>',
+      'src/app/app.html': '<h1>testingTESTING123</h1>',
     }),
   ]);
 
diff --git a/tests/legacy-cli/e2e/tests/build/app-shell/app-shell-with-schematic.ts b/tests/legacy-cli/e2e/tests/build/app-shell/app-shell-with-schematic.ts
@@ -7,7 +7,7 @@ import { updateJsonFile } from '../../../utils/project';
 const snapshots = require('../../../ng-snapshot/package.json');
 
 export default async function () {
-  await appendToFile('src/app/app.ng.html', '<router-outlet></router-outlet>');
+  await appendToFile('src/app/app.html', '<router-outlet></router-outlet>');
   await ng('generate', 'app-shell', '--project', 'test-project');
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
diff --git a/tests/legacy-cli/e2e/tests/build/app-shell/app-shell-with-service-worker.ts b/tests/legacy-cli/e2e/tests/build/app-shell/app-shell-with-service-worker.ts
@@ -7,7 +7,7 @@ import { updateJsonFile } from '../../../utils/project';
 const snapshots = require('../../../ng-snapshot/package.json');
 
 export default async function () {
-  await appendToFile('src/app/app.ng.html', '<router-outlet></router-outlet>');
+  await appendToFile('src/app/app.html', '<router-outlet></router-outlet>');
   await ng('generate', 'service-worker', '--project', 'test-project');
   await ng('generate', 'app-shell', '--project', 'test-project');
 
diff --git a/tests/legacy-cli/e2e/tests/build/library/setup.ts b/tests/legacy-cli/e2e/tests/build/library/setup.ts
@@ -6,13 +6,13 @@ export async function libraryConsumptionSetup(): Promise<void> {
 
   // Force an external template
   await writeMultipleFiles({
-    'projects/my-lib/src/lib/my-lib.ng.html': `<p>my-lib works!</p>`,
+    'projects/my-lib/src/lib/my-lib.html': `<p>my-lib works!</p>`,
     'projects/my-lib/src/lib/my-lib.ts': `import { Component } from '@angular/core';
 
     @Component({
       standalone: true,
       selector: 'lib-my-lib',
-      templateUrl: './my-lib.ng.html',
+      templateUrl: './my-lib.html',
     })
     export class MyLibComponent {}`,
     './src/app/app.ts': `
diff --git a/tests/legacy-cli/e2e/tests/build/prerender/error-with-sourcemaps.ts b/tests/legacy-cli/e2e/tests/build/prerender/error-with-sourcemaps.ts
@@ -28,7 +28,7 @@ export default async function () {
         selector: 'app-root',
         standalone: true,
         imports: [CommonModule, RouterOutlet],
-        templateUrl: './app.ng.html',
+        templateUrl: './app.html',
         styleUrls: ['./app.css']
       })
       export class App {
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-platform-neutral.ts b/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server-platform-neutral.ts
@@ -28,7 +28,7 @@ export default async function () {
 
   await writeMultipleFiles({
     // Replace the template of app.ng.html as it makes it harder to debug
-    'src/app/app.ng.html': '<router-outlet />',
+    'src/app/app.html': '<router-outlet />',
     'src/app/app.routes.ts': `
       import { Routes } from '@angular/router';
       import { Home } from './home/home';
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-basic.ts b/tests/legacy-cli/e2e/tests/generate/component/component-basic.ts
@@ -11,7 +11,7 @@ export default function () {
       .then(() => expectFileToExist(componentDir))
       .then(() => expectFileToExist(join(componentDir, 'test-component.ts')))
       .then(() => expectFileToExist(join(componentDir, 'test-component.spec.ts')))
-      .then(() => expectFileToExist(join(componentDir, 'test-component.ng.html')))
+      .then(() => expectFileToExist(join(componentDir, 'test-component.html')))
       .then(() => expectFileToExist(join(componentDir, 'test-component.css')))
 
       // Try to run the unit tests.
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-child-dir.ts b/tests/legacy-cli/e2e/tests/generate/component/component-child-dir.ts
@@ -21,7 +21,7 @@ export default async function () {
     const componentDirectory = join(childDirectory, 'test-component');
     await expectFileToExist(join(componentDirectory, 'test-component.ts'));
     await expectFileToExist(join(componentDirectory, 'test-component.spec.ts'));
-    await expectFileToExist(join(componentDirectory, 'test-component.ng.html'));
+    await expectFileToExist(join(componentDirectory, 'test-component.html'));
     await expectFileToExist(join(componentDirectory, 'test-component.css'));
 
     // Ensure unit test execute and pass
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-flat.ts b/tests/legacy-cli/e2e/tests/generate/component/component-flat.ts
@@ -18,7 +18,7 @@ export default function () {
       .then(() => expectFileToExist(appDir))
       .then(() => expectFileToExist(join(appDir, 'test-component.ts')))
       .then(() => expectFileToExist(join(appDir, 'test-component.spec.ts')))
-      .then(() => expectFileToExist(join(appDir, 'test-component.ng.html')))
+      .then(() => expectFileToExist(join(appDir, 'test-component.html')))
       .then(() => expectFileToExist(join(appDir, 'test-component.css')))
 
       // Try to run the unit tests.
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-inline-template.ts b/tests/legacy-cli/e2e/tests/generate/component/component-inline-template.ts
@@ -20,9 +20,7 @@ export default function () {
       .then(() => expectFileToExist(componentDir))
       .then(() => expectFileToExist(join(componentDir, 'test-component.ts')))
       .then(() => expectFileToExist(join(componentDir, 'test-component.spec.ts')))
-      .then(() =>
-        expectToFail(() => expectFileToExist(join(componentDir, 'test-component.ng.html'))),
-      )
+      .then(() => expectToFail(() => expectFileToExist(join(componentDir, 'test-component.html'))))
       .then(() => expectFileToExist(join(componentDir, 'test-component.css')))
 
       // Try to run the unit tests.
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-not-flat.ts b/tests/legacy-cli/e2e/tests/generate/component/component-not-flat.ts
@@ -19,7 +19,7 @@ export default function () {
       .then(() => expectFileToExist(componentDir))
       .then(() => expectFileToExist(join(componentDir, 'test-component.ts')))
       .then(() => expectFileToExist(join(componentDir, 'test-component.spec.ts')))
-      .then(() => expectFileToExist(join(componentDir, 'test-component.ng.html')))
+      .then(() => expectFileToExist(join(componentDir, 'test-component.html')))
       .then(() => expectFileToExist(join(componentDir, 'test-component.css')))
 
       // Try to run the unit tests.
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-path-case.ts b/tests/legacy-cli/e2e/tests/generate/component/component-path-case.ts
@@ -16,7 +16,7 @@ export default async function () {
     // Ensure component is created in the correct location relative to the workspace root
     await expectFileToExist(join(componentDirectory, 'test-component.ts'));
     await expectFileToExist(join(componentDirectory, 'test-component.spec.ts'));
-    await expectFileToExist(join(componentDirectory, 'test-component.ng.html'));
+    await expectFileToExist(join(componentDirectory, 'test-component.html'));
     await expectFileToExist(join(componentDirectory, 'test-component.css'));
 
     // Generate another component
@@ -25,7 +25,7 @@ export default async function () {
     // Ensure component is created in the correct location relative to the workspace root
     await expectFileToExist(join(componentTwoDirectory, 'test-component-two.ts'));
     await expectFileToExist(join(componentTwoDirectory, 'test-component-two.spec.ts'));
-    await expectFileToExist(join(componentTwoDirectory, 'test-component-two.ng.html'));
+    await expectFileToExist(join(componentTwoDirectory, 'test-component-two.html'));
     await expectFileToExist(join(componentTwoDirectory, 'test-component-two.css'));
 
     // Ensure unit test execute and pass
diff --git a/tests/legacy-cli/e2e/tests/generate/generate-name-check.ts b/tests/legacy-cli/e2e/tests/generate/generate-name-check.ts
@@ -18,7 +18,7 @@ export default function () {
       .then(() => expectFileToExist(compDir))
       .then(() => expectFileToExist(join(compDir, 'test-component.ts')))
       .then(() => expectFileToExist(join(compDir, 'test-component.spec.ts')))
-      .then(() => expectFileToExist(join(compDir, 'test-component.ng.html')))
+      .then(() => expectFileToExist(join(compDir, 'test-component.html')))
       .then(() => expectFileToExist(join(compDir, 'test-component.css')))
 
       // Try to run the unit tests.
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-ivy-disk-cache.ts b/tests/legacy-cli/e2e/tests/i18n/extract-ivy-disk-cache.ts
@@ -15,7 +15,7 @@ export default async function () {
 
   // Setup an i18n enabled component
   await ng('generate', 'component', 'i18n-test');
-  await writeFile(join('src/app/i18n-test', 'i18n-test.ng.html'), '<p i18n>Hello world</p>');
+  await writeFile(join('src/app/i18n-test', 'i18n-test.html'), '<p i18n>Hello world</p>');
 
   await writeFile(
     'src/app/app.ts',
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-ivy-libraries.ts b/tests/legacy-cli/e2e/tests/i18n/extract-ivy-libraries.ts
@@ -17,7 +17,7 @@ export default async function () {
   await prependToFile('src/app/app.ts', `import { I18nLibTest } from 'i18n-lib-test';`);
 
   await writeFile(
-    'src/app/app.ng.html',
+    'src/app/app.html',
     `
       <p i18n>Hello world</p>
       <lib-i18n-lib-test></lib-i18n-lib-test>
@@ -35,7 +35,7 @@ export default async function () {
   await ng('extract-i18n');
   await expectFileToMatch('messages.xlf', 'Hello world');
   await expectFileToMatch('messages.xlf', 'i18n-lib-test works!');
-  await expectFileToMatch('messages.xlf', 'src/app/app.ng.html');
+  await expectFileToMatch('messages.xlf', 'src/app/app.html');
   await expectFileToMatch('messages.xlf', 'projects/i18n-lib-test/src/lib/i18n-lib-test.ts');
 
   await uninstallPackage('@angular/localize');
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts b/tests/legacy-cli/e2e/tests/i18n/extract-ivy.ts
@@ -9,7 +9,7 @@ import { readNgVersion } from '../../utils/version';
 export default async function () {
   // Setup an i18n enabled component
   await ng('generate', 'component', 'i18n-test');
-  await writeFile(join('src/app/i18n-test', 'i18n-test.ng.html'), '<p i18n>Hello world</p>');
+  await writeFile(join('src/app/i18n-test', 'i18n-test.html'), '<p i18n>Hello world</p>');
   // Actually use the generated component to ensure it is present in the application output
   await writeFile(
     'src/app/app.ts',
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell-service-worker.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell-service-worker.ts
@@ -17,7 +17,7 @@ export default async function () {
       : readNgVersion();
   });
 
-  await appendToFile('src/app/app.ng.html', '<router-outlet></router-outlet>');
+  await appendToFile('src/app/app.html', '<router-outlet></router-outlet>');
 
   // Add app-shell and service-worker
   await silentNg('generate', 'app-shell');
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-app-shell.ts
@@ -23,7 +23,7 @@ export default async function () {
       : readNgVersion();
   });
 
-  await appendToFile('src/app/app.ng.html', '<router-outlet></router-outlet>');
+  await appendToFile('src/app/app.html', '<router-outlet></router-outlet>');
   await ng('generate', 'app-shell', '--project', 'test-project');
 
   if (isSnapshotBuild) {
@@ -62,15 +62,15 @@ export default async function () {
   });
 
   await writeFile(
-    'src/app/app-shell/app-shell.ng.html',
+    'src/app/app-shell/app-shell.html',
     '<h1 i18n="An introduction header for this sample">Hello i18n!</h1>',
   );
 
   // Add a translatable element
   // Extraction of i18n only works on browser targets.
   // Let's add the same translation that there is in the app-shell
   await writeFile(
-    'src/app/app.ng.html',
+    'src/app/app.html',
     '<h1 i18n="An introduction header for this sample">Hello i18n!</h1>',
   );
 
@@ -81,7 +81,7 @@ export default async function () {
 
   // Clean up app.ng.html so that we can easily
   // find the translation text
-  await writeFile('src/app/app.ng.html', '<router-outlet></router-outlet>');
+  await writeFile('src/app/app.html', '<router-outlet></router-outlet>');
 
   for (const { lang, translation } of langTranslations) {
     if (lang != 'en-US') {
diff --git a/tests/legacy-cli/e2e/tests/i18n/setup.ts b/tests/legacy-cli/e2e/tests/i18n/setup.ts
@@ -108,7 +108,7 @@ export async function setupI18nConfig() {
       selector: 'app-root',
       imports: [DatePipe, RouterOutlet],
       standalone: true,
-      templateUrl: './app.ng.html'
+      templateUrl: './app.html'
     })
     export class App {
       constructor(@Inject(LOCALE_ID) public locale: string) { }
@@ -119,7 +119,7 @@ export async function setupI18nConfig() {
   `,
   );
   await writeFile(
-    `src/app/app.ng.html`,
+    `src/app/app.html`,
     `
     <p id="hello" i18n="An introduction header for this sample">Hello {{ title }}! </p>
     <p id="locale">{{ locale }}</p>
@@ -140,22 +140,22 @@ export async function setupI18nConfig() {
           <trans-unit id="4286451273117902052" datatype="html">
             <source>Hello <x id="INTERPOLATION" equiv-text="{{ title }}"/>! </source>
             <context-group purpose="location">
-              <context context-type="sourcefile">src/app/app.ng.html</context>
+              <context context-type="sourcefile">src/app/app.html</context>
               <context context-type="linenumber">2,3</context>
             </context-group>
             <note priority="1" from="description">An introduction header for this sample</note>
           </trans-unit>
           <trans-unit id="4606963464835766483" datatype="html">
             <source>Updated <x id="ICU" equiv-text="{minutes, plural, =0 {just now} =1 {one minute ago} other {{{minutes}} minutes ago}}" xid="1887283401472369100"/></source>
             <context-group purpose="location">
-              <context context-type="sourcefile">src/app/app.ng.html</context>
+              <context context-type="sourcefile">src/app/app.html</context>
               <context context-type="linenumber">5,6</context>
             </context-group>
           </trans-unit>
           <trans-unit id="2002272803511843863" datatype="html">
             <source>{VAR_PLURAL, plural, =0 {just now} =1 {one minute ago} other {<x id="INTERPOLATION"/> minutes ago}}</source>
             <context-group purpose="location">
-              <context context-type="sourcefile">src/app/app.ng.html</context>
+              <context context-type="sourcefile">src/app/app.html</context>
               <context context-type="linenumber">5,6</context>
             </context-group>
           </trans-unit>
diff --git a/tests/legacy-cli/e2e/tests/misc/browsers.ts b/tests/legacy-cli/e2e/tests/misc/browsers.ts
@@ -11,7 +11,7 @@ export default async function () {
   }
 
   // Workaround for https://github.com/angular/angular/issues/32192
-  await replaceInFile('src/app/app.ng.html', /class="material-icons"/g, '');
+  await replaceInFile('src/app/app.html', /class="material-icons"/g, '');
 
   await ng('build');
 
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-entry-express.ts b/tests/legacy-cli/e2e/tests/vite/ssr-entry-express.ts
@@ -20,7 +20,7 @@ export default async function () {
 
   await writeMultipleFiles({
     // Replace the template of app.ng.html as it makes it harder to debug
-    'src/app/app.ng.html': '<router-outlet />',
+    'src/app/app.html': '<router-outlet />',
     'src/app/app.routes.ts': `
       import { Routes } from '@angular/router';
       import { Home } from './home/home';
@@ -94,7 +94,7 @@ export default async function () {
 
   // Modify the home component and validate the change.
   await modifyFileAndWaitUntilUpdated(
-    'src/app/home/home.ng.html',
+    'src/app/home/home.html',
     'home works',
     'yay home works!!!',
     true,
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-entry-fastify.ts b/tests/legacy-cli/e2e/tests/vite/ssr-entry-fastify.ts
@@ -21,7 +21,7 @@ export default async function () {
 
   await writeMultipleFiles({
     // Replace the template of app.ng.html as it makes it harder to debug
-    'src/app/app.ng.html': '<router-outlet />',
+    'src/app/app.html': '<router-outlet />',
     'src/app/app.routes.ts': `
       import { Routes } from '@angular/router';
       import { Home } from './home/home';
@@ -87,7 +87,7 @@ export default async function () {
 
   // Modify the home component and validate the change.
   await modifyFileAndWaitUntilUpdated(
-    'src/app/home/home.ng.html',
+    'src/app/home/home.html',
     'home works',
     'yay home works!!!',
     true,
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-entry-h3.ts b/tests/legacy-cli/e2e/tests/vite/ssr-entry-h3.ts
@@ -21,7 +21,7 @@ export default async function () {
 
   await writeMultipleFiles({
     // Replace the template of app.ng.html as it makes it harder to debug
-    'src/app/app.ng.html': '<router-outlet />',
+    'src/app/app.html': '<router-outlet />',
     'src/app/app.routes.ts': `
       import { Routes } from '@angular/router';
       import { Home } from './home/home';
@@ -78,7 +78,7 @@ export default async function () {
 
   // Modify the home component and validate the change.
   await modifyFileAndWaitUntilUpdated(
-    'src/app/home/home.ng.html',
+    'src/app/home/home.html',
     'home works',
     'yay home works!!!',
     true,
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-entry-hono.ts b/tests/legacy-cli/e2e/tests/vite/ssr-entry-hono.ts
@@ -21,7 +21,7 @@ export default async function () {
 
   await writeMultipleFiles({
     // Replace the template of app.ng.html as it makes it harder to debug
-    'src/app/app.ng.html': '<router-outlet />',
+    'src/app/app.html': '<router-outlet />',
     'src/app/app.routes.ts': `
       import { Routes } from '@angular/router';
       import { Home } from './home/home';
@@ -70,7 +70,7 @@ export default async function () {
 
   // Modify the home component and validate the change.
   await modifyFileAndWaitUntilUpdated(
-    'src/app/home/home.ng.html',
+    'src/app/home/home.html',
     'home works',
     'yay home works!!!',
     true,
diff --git a/tests/legacy-cli/e2e/tests/vite/ssr-with-ssl.ts b/tests/legacy-cli/e2e/tests/vite/ssr-with-ssl.ts
@@ -19,7 +19,7 @@ export default async function () {
 
   await writeMultipleFiles({
     // Replace the template of app.ng.html as it makes it harder to debug
-    'src/app/app.ng.html': '<router-outlet />',
+    'src/app/app.html': '<router-outlet />',
     'src/app/app.routes.ts': `
       import { Routes } from '@angular/router';
       import { Home } from './home/home';
