test(@angular/cli): several fixes to update-8 E2E test

Previously in `update-8` test we used the Angular CLI in node_modules which caused incorrect result.

We now don't run `ng update @angular/core --next` or `ng update @angular/core`. This is due to our bumping strategy, which causes a period were `@angular/cli@latest` (v12.0.0) `@angular/core@latest` (v11.2.x) are of different major/minor version on the local NPM server. This causes `ng update` to fail.

NB: `ng update @angula/cli` will still cause `@angular/core` packages to be updated.

(cherry picked from commit 6d5043b)

Author: alan-agius4

tests/legacy-cli/e2e/setup/010-local-publish.ts

@@ -1,26 +1,18 @@
-import { prerelease } from 'semver';
-import { packages } from '../../../../lib/packages';
 import { getGlobalVariable } from '../utils/env';
 import { npm } from '../utils/process';
+import { isPrereleaseCli } from '../utils/project';
 
-export default async function() {
+export default async function () {
   const testRegistry = getGlobalVariable('package-registry');
-  const publishArgs = [
+  await npm(
     'run',
     'admin',
     '--',
     'publish',
     '--no-versionCheck',
     '--no-branchCheck',
     `--registry=${testRegistry}`,
-  ];
-
-  const pre = prerelease(packages['@angular/cli'].version);
-  if (pre && pre.length > 0) {
-    publishArgs.push('--tag', 'next');
-  } else {
-    publishArgs.push('--tag', 'latest');
-  }
-
-  await npm(...publishArgs);
+    '--tag',
+    isPrereleaseCli() ? 'next' : 'latest',
+  );
 }

tests/legacy-cli/e2e/tests/update/update-8.ts

@@ -1,23 +1,43 @@
 import { createProjectFromAsset } from '../../utils/assets';
 import { expectFileMatchToExist } from '../../utils/fs';
-import { installWorkspacePackages } from '../../utils/packages';
-import { ng, noSilentNg, silentNpm } from '../../utils/process';
-import { isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
+import { installPackage, installWorkspacePackages, setRegistry } from '../../utils/packages';
+import { ng, noSilentNg } from '../../utils/process';
+import { isPrereleaseCli, useCIChrome, useCIDefaults } from '../../utils/project';
 
-export default async function() {
-  await createProjectFromAsset('8.0-project');
-  await ng('update', '@angular/cli', '--migrate-only', '--from=8');
+export default async function () {
+  // We need to use the public registry because in the local NPM server we don't have
+  // older versions @angular/cli packages which would cause `npm install` during `ng update` to fail.
+  try {
+    await createProjectFromAsset('8.0-project', true, true);
 
-  // Use the packages we are building in this commit, and CI Chrome.
-  await useBuiltPackages();
+    await setRegistry(false);
+    await installWorkspacePackages();
+
+    // Update Angular to 9
+    await installPackage('@angular/cli@8');
+    const { stdout } = await ng('update', '@angular/cli@9.x', '@angular/core@9.x');
+    if (!stdout.includes("Executing migrations of package '@angular/cli'")) {
+      throw new Error('Update did not execute migrations. OUTPUT: \n' + stdout);
+    }
+
+    // Update Angular to 10
+    await ng('update', '@angular/cli@10', '@angular/core@10');
+  } finally {
+    await setRegistry(true);
+  }
+
+  // Update Angular current build
+  const extraUpdateArgs = isPrereleaseCli() ? ['--next', '--force'] : ['--force'];
+  // For the latest/next release we purposely don't add `@angular/core`.
+  // This is due to our bumping strategy, which causes a period were `@angular/cli@latest` (v12.0.0) `@angular/core@latest` (v11.2.x)
+  // are of different major/minor version on the local NPM server. This causes `ng update` to fail.
+  // NB: `ng update @angula/cli` will still cause `@angular/core` packages to be updated.
+  await ng('update', '@angular/cli', ...extraUpdateArgs);
+
+  // Setup testing to use CI Chrome.
   await useCIChrome('./');
   await useCIChrome('./e2e/');
   await useCIDefaults('eight-project');
-  await installWorkspacePackages();
-
-  // Update Angular.
-  const extraUpdateArgs = await isPrereleaseCli() ? ['--next', '--force'] : [];
-  await ng('update', '@angular/core', ...extraUpdateArgs);
 
   // Run CLI commands.
   await ng('generate', 'component', 'my-comp');

tests/legacy-cli/e2e/utils/packages.ts

@@ -1,5 +1,6 @@
 import { getGlobalVariable } from './env';
-import { ProcessOutput, silentNpm, silentYarn } from './process';
+import { writeFile } from './fs';
+import { npm, ProcessOutput, silentNpm, silentYarn } from './process';
 
 export function getActivePackageManager(): 'npm' | 'yarn' {
   const value = getGlobalVariable('package-manager');
@@ -39,3 +40,21 @@ export async function uninstallPackage(name: string): Promise<ProcessOutput> {
       return silentYarn('remove', name);
   }
 }
+
+export async function setRegistry(useTestRegistry: boolean): Promise<void> {
+  const url = useTestRegistry
+    ? getGlobalVariable('package-registry')
+    : 'https://registry.npmjs.org';
+
+  const isCI = getGlobalVariable('ci');
+
+  // Ensure local test registry is used when outside a project
+  if (isCI) {
+    // Safe to set a user configuration on CI
+    await npm('config', 'set', 'registry', url);
+  } else {
+    // Yarn does not use the environment variable so an .npmrc file is also required
+    await writeFile('.npmrc', `registry=${url}`);
+    process.env['NPM_CONFIG_REGISTRY'] = url;
+  }
+}

tests/legacy-cli/e2e/utils/project.ts

@@ -7,9 +7,6 @@ import { gitCommit } from './git';
 import { installWorkspacePackages } from './packages';
 import { execAndWaitForOutputToMatch, git, ng, npm } from './process';
 
-const tsConfigPath = 'tsconfig.json';
-
-
 export function updateJsonFile(filePath: string, fn: (json: any) => any | void) {
   return readFile(filePath)
     .then(tsConfigJson => {
@@ -23,7 +20,7 @@ export function updateJsonFile(filePath: string, fn: (json: any) => any | void)
 
 
 export function updateTsConfig(fn: (json: any) => any | void) {
-  return updateJsonFile(tsConfigPath, fn);
+  return updateJsonFile('tsconfig.json', fn);
 }
 
 
@@ -293,9 +290,8 @@ export function useCIChrome(projectDir: string) {
     });
 }
 
-export async function isPrereleaseCli() {
-  const angularCliPkgJson = JSON.parse(await readFile('node_modules/@angular/cli/package.json'));
-  const pre = prerelease(angularCliPkgJson.version);
+export function isPrereleaseCli(): boolean {
+  const pre = prerelease(packages['@angular/cli'].version);
 
   return pre && pre.length > 0;
 }