Skip to content

Commit 747e1c3

Browse files
committed
build: re-enable Material tests
Re-enables Material tests that had to be disabled during the TS 5.2 update.
1 parent 5f42ee4 commit 747e1c3

File tree

5 files changed

+6
-18
lines changed

5 files changed

+6
-18
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"@angular/core": "17.0.0-next.6",
7070
"@angular/forms": "17.0.0-next.6",
7171
"@angular/localize": "17.0.0-next.6",
72-
"@angular/material": "17.0.0-next.5",
72+
"@angular/material": "17.0.0-next.6",
7373
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#cabb66d8f767fd2b4962ae32b16ccb67334124a5",
7474
"@angular/platform-browser": "17.0.0-next.6",
7575
"@angular/platform-browser-dynamic": "17.0.0-next.6",

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ import { isPrereleaseCli, updateJsonFile } from '../../utils/project';
77
const snapshots = require('../../ng-snapshot/package.json');
88

99
export default async function () {
10-
// TODO(crisbeto): temporarily disabled until Material is updated to TS 5.2
11-
return;
12-
1310
let tag = (await isPrereleaseCli()) ? '@next' : '';
1411
await ng('add', `@angular/material${tag}`, '--skip-confirmation');
1512

tests/legacy-cli/e2e/tests/commands/add/add-material.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ import { ng } from '../../../utils/process';
55
import { isPrereleaseCli } from '../../../utils/project';
66

77
export default async function () {
8-
// TODO(crisbeto): temporarily disabled until Material is updated to TS 5.2
9-
return;
10-
118
// forcibly remove in case another test doesn't clean itself up
129
await rimraf('node_modules/@angular/material');
1310

tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ import { installPackage, uninstallPackage } from '../../utils/packages';
44
import { isPrereleaseCli } from '../../utils/project';
55

66
export default async function () {
7-
// TODO(crisbeto): temporarily disabled until Material is updated to TS 5.2
8-
return;
9-
107
// Must publish old version to local registry to allow install. This is especially important
118
// for release commits as npm will try to request tooling packages that are not on the npm registry yet
129
await publishOutdated('@schematics/angular@7');

yarn.lock

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@
123123
tslib "^2.3.0"
124124

125125
"@angular/bazel@https://github.com/angular/bazel-builds.git#f731eda6d131eea62b12e4f6d235eb0e618bce4d":
126-
version "17.0.0-next.6+sha-e1728a2"
127-
uid f731eda6d131eea62b12e4f6d235eb0e618bce4d
126+
version "17.0.0-next.6"
128127
resolved "https://github.com/angular/bazel-builds.git#f731eda6d131eea62b12e4f6d235eb0e618bce4d"
129128
dependencies:
130129
"@microsoft/api-extractor" "^7.24.2"
@@ -141,7 +140,6 @@
141140

142141
"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#2cfafd6c105b9b657261db43b910c6ff8017779a":
143142
version "0.0.0-76c632f6480810d48befe4743702eec9171fc763"
144-
uid "2cfafd6c105b9b657261db43b910c6ff8017779a"
145143
resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#2cfafd6c105b9b657261db43b910c6ff8017779a"
146144
dependencies:
147145
"@angular-devkit/build-angular" "17.0.0-next.6"
@@ -250,10 +248,10 @@
250248
fast-glob "3.3.1"
251249
yargs "^17.2.1"
252250

253-
"@angular/[email protected].5":
254-
version "17.0.0-next.5"
255-
resolved "https://registry.yarnpkg.com/@angular/material/-/material-17.0.0-next.5.tgz#1e67e3d6599bd18ac599f804e396a4692e7d2372"
256-
integrity sha512-dlyTJlJ48DsddiX/GLQVsz4Vkw0QdDeEZtyTn5CpWTuPP3aQ1Jb3lpt9CCVmyCwcsCneSNmFMyJLRKlDt61shQ==
251+
"@angular/[email protected].6":
252+
version "17.0.0-next.6"
253+
resolved "https://registry.yarnpkg.com/@angular/material/-/material-17.0.0-next.6.tgz#c66372c42f1fa61e8a452db56e76b96d7b217910"
254+
integrity sha512-50GoukzYuVv9DVuUzGpsF1osSM1kiu7YXmnyvHOK+DZgsDk6gd/XvgzzkxDYM/kdF90AjT7dHg8KzZChPYnxpg==
257255
dependencies:
258256
"@material/animation" "15.0.0-canary.a246a4439.0"
259257
"@material/auto-init" "15.0.0-canary.a246a4439.0"
@@ -306,7 +304,6 @@
306304

307305
"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#cabb66d8f767fd2b4962ae32b16ccb67334124a5":
308306
version "0.0.0-76c632f6480810d48befe4743702eec9171fc763"
309-
uid cabb66d8f767fd2b4962ae32b16ccb67334124a5
310307
resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#cabb66d8f767fd2b4962ae32b16ccb67334124a5"
311308
dependencies:
312309
"@yarnpkg/lockfile" "^1.1.0"

0 commit comments

Comments
 (0)