Skip to content

Commit d0924da

Browse files
committed
test(@angular/cli): fix failing LTS e2e tests
1 parent d6582d4 commit d0924da

File tree

3 files changed

+29
-26
lines changed

3 files changed

+29
-26
lines changed

tests/legacy-cli/e2e/assets/webpack/test-app/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"name": "test",
33
"license": "MIT",
44
"dependencies": {
5-
"@angular/common": "9.0.0",
6-
"@angular/compiler": "9.0.0",
7-
"@angular/compiler-cli": "9.0.0",
8-
"@angular/core": "9.0.0",
9-
"@angular/platform-browser": "9.0.0",
10-
"@angular/platform-browser-dynamic": "9.0.0",
11-
"@angular/platform-server": "9.0.0",
12-
"@angular/router": "9.0.0",
5+
"@angular/common": "^10.0.0",
6+
"@angular/compiler": "^10.0.0",
7+
"@angular/compiler-cli": "^10.0.0",
8+
"@angular/core": "^10.0.0",
9+
"@angular/platform-browser": "^10.0.0",
10+
"@angular/platform-browser-dynamic": "^10.0.0",
11+
"@angular/platform-server": "^10.0.0",
12+
"@angular/router": "^10.0.0",
1313
"@ngtools/webpack": "0.0.0",
1414
"core-js": "^3.0.0",
1515
"rxjs": "^6.4.0",
@@ -20,7 +20,7 @@
2020
"performance-now": "^0.2.0",
2121
"raw-loader": "^0.5.1",
2222
"sass-loader": "^6.0.0",
23-
"typescript": "~3.6.4",
23+
"typescript": "~4.0.2",
2424
"webpack": "~4.0.1",
2525
"webpack-cli": "~2.0.9"
2626
}

tests/legacy-cli/e2e/tests/build/material.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default async function () {
2727

2828
await silentNpm('install');
2929
} else {
30-
await silentNpm('install', '@angular/material-moment-adapter');
30+
await silentNpm('install', '@angular/material-moment-adapter@10');
3131
}
3232

3333
await silentNpm('install', 'moment');

tests/legacy-cli/e2e/tests/commands/add/add-pwa-yarn.ts

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,26 @@ import { expectFileToExist, readFile, rimraf } from '../../../utils/fs';
33
import { ng, npm } from '../../../utils/process';
44

55
export default async function () {
6-
// forcibly remove in case another test doesn't clean itself up
7-
await rimraf('node_modules/@angular/pwa');
6+
// forcibly remove in case another test doesn't clean itself up
7+
await rimraf('node_modules/@angular/pwa');
88

9-
// set yarn as package manager
10-
await ng('config', 'cli.packageManager', 'yarn');
11-
await ng('add', '@angular/pwa');
12-
await expectFileToExist(join(process.cwd(), 'src/manifest.webmanifest'));
9+
// set yarn as package manager
10+
await ng('config', 'cli.packageManager', 'yarn');
11+
await ng('add', '@angular/pwa', '--registry=http://localhost:4873');
12+
await expectFileToExist(join(process.cwd(), 'src/manifest.webmanifest'));
1313

14-
// Angular PWA doesn't install as a dependency
15-
const { dependencies, devDependencies } = JSON.parse(await readFile(join(process.cwd(), 'package.json')));
16-
const hasPWADep = Object.keys({ ...dependencies, ...devDependencies })
17-
.some(d => d === '@angular/pwa');
18-
if (hasPWADep) {
19-
throw new Error(`Expected 'package.json' not to contain a dependency on '@angular/pwa'.`);
20-
}
14+
// Angular PWA doesn't install as a dependency
15+
const { dependencies, devDependencies } = JSON.parse(
16+
await readFile(join(process.cwd(), 'package.json')),
17+
);
18+
const hasPWADep = Object.keys({ ...dependencies, ...devDependencies }).some(
19+
(d) => d === '@angular/pwa',
20+
);
21+
if (hasPWADep) {
22+
throw new Error(`Expected 'package.json' not to contain a dependency on '@angular/pwa'.`);
23+
}
2124

22-
// 'yarn' will nuke the entire node_modules when it is triggered during the above tests.
23-
await rimraf('node_modules');
24-
await npm('install');
25+
// 'yarn' will nuke the entire node_modules when it is triggered during the above tests.
26+
await rimraf('node_modules');
27+
await npm('install');
2528
}

0 commit comments

Comments
 (0)