Skip to content

Commit 021d281

Browse files
committed
test(@angular/cli): disable ng update tests that are no longer supported
Multiple versions update is no longer supported.
1 parent 460ea21 commit 021d281

File tree

5 files changed

+25
-14
lines changed

5 files changed

+25
-14
lines changed

packages/angular/cli/commands/update-impl.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -507,15 +507,14 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
507507
}
508508
}
509509

510+
let result: boolean;
510511
if (typeof options.migrateOnly == 'string') {
511-
await this.executeMigration(
512+
result = await this.executeMigration(
512513
packageName,
513514
migrations,
514515
options.migrateOnly,
515516
options.createCommits,
516517
);
517-
518-
return 0;
519518
} else {
520519
const from = coerceVersionNumber(options.from);
521520
if (!from) {
@@ -528,15 +527,15 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
528527
'>' + from + ' <=' + (options.to || packageNode.package.version),
529528
);
530529

531-
await this.executeMigrations(
530+
result = await this.executeMigrations(
532531
packageName,
533532
migrations,
534533
migrationRange,
535534
options.createCommits,
536535
);
537-
538-
return 0;
539536
}
537+
538+
return result ? 0 : 1;
540539
}
541540

542541
const requests: {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import { isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults } from '.
44
import { expectToFail } from '../../utils/utils';
55

66
export default async function() {
7+
return;
8+
79
const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
810

911
await createProjectFromAsset('1.0-project');

tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import { isPrereleaseCli, useBuiltPackages } from '../../utils/project';
44
import { expectToFail } from '../../utils/utils';
55

66
export default async function() {
7+
return;
8+
79
const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
810

9-
await createProjectFromAsset('1.7-project');
11+
await createProjectFromAsset('1.7-project', true);
1012

1113
await expectToFail(() => ng('build'));
12-
await ng('update', '@angular/cli', '--migrate-only', '--from=1.7.1');
14+
await ng('update', '@angular/cli@8', '--migrate-only', '--from=1.7.1');
1315
await useBuiltPackages();
1416
await silentNpm('install');
1517
await ng('update', '@angular/core@10', ...extraUpdateArgs);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults } from '.
55
import { expectToFail } from '../../utils/utils';
66

77
export default async function() {
8+
return;
89
const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
910

1011
await createProjectFromAsset('1.7-project');

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
import { createProjectFromAsset } from '../../utils/assets';
2-
import { expectFileMatchToExist, expectFileToExist, expectFileToMatch } from '../../utils/fs';
2+
import {
3+
expectFileMatchToExist,
4+
expectFileToExist,
5+
expectFileToMatch,
6+
writeFile,
7+
} from '../../utils/fs';
38
import { ng, noSilentNg, silentNpm } from '../../utils/process';
49
import { isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
510
import { expectToFail } from '../../utils/utils';
611

7-
export default async function() {
8-
await createProjectFromAsset('7.0-project');
9-
await ng('update', '@angular/cli', '--migrate-only', '--from=7');
12+
export default async function () {
13+
await createProjectFromAsset('7.0-project', true);
14+
// Update Angular.
15+
await ng('update', '@angular/core@8', '@angular/cli@8', '--force');
16+
await ng('update', '@angular/core@9', '@angular/cli@9', '--force');
1017

1118
// Test CLI migrations.
1219
// Should update the lazy route syntax via update-lazy-module-paths.
@@ -27,11 +34,11 @@ export default async function() {
2734
await useCIChrome('src/');
2835
await useCIChrome('e2e/');
2936
await useCIDefaults('seven-oh-project');
37+
await writeFile('.npmrc', 'registry = http://localhost:4873', 'utf8');
3038
await silentNpm('install');
3139

32-
// Update Angular.
3340
const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
34-
await ng('update', '@angular/core@10', ...extraUpdateArgs);
41+
await ng('update', '@angular/core@10', '@angular/cli@10', ...extraUpdateArgs);
3542

3643
// Run CLI commands.
3744
await ng('generate', 'component', 'my-comp');

0 commit comments

Comments
 (0)