Skip to content

build: re-enable Material tests #25930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alan-agius4 merged 1 commit into from
Oct 9, 2023
Merged

build: re-enable Material tests #25930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions tests/legacy-cli/e2e/tests/build/material.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ import { isPrereleaseCli, updateJsonFile } from '../../utils/project';
const snapshots = require('../../ng-snapshot/package.json');

export default async function () {
// TODO(crisbeto): temporarily disabled until Material is updated to TS 5.2
return;

let tag = (await isPrereleaseCli()) ? '@next' : '';
await ng('add', `@angular/material${tag}`, '--skip-confirmation');

Expand Down Expand Up @@ -46,10 +43,10 @@ export default async function () {
// Ensure moment adapter works (uses unique importing mechanism for moment)
// Issue: https://github.com/angular/angular-cli/issues/17320
await replaceInFile(
'src/app/app.module.ts',
`import { AppComponent } from './app.component';`,
'src/app/app.config.ts',
`import { ApplicationConfig } from '@angular/core';`,
`
import { AppComponent } from './app.component';
import { ApplicationConfig } from '@angular/core';
import {
MomentDateAdapter,
MAT_MOMENT_DATE_FORMATS
Expand All @@ -63,10 +60,11 @@ export default async function () {
);

await replaceInFile(
'src/app/app.module.ts',
`providers: []`,
'src/app/app.config.ts',
`providers: [provideRouter(routes) ]`,
`
providers: [
provideRouter(routes),
{
provide: DateAdapter,
useClass: MomentDateAdapter,
Expand Down
3 changes: 0 additions & 3 deletions tests/legacy-cli/e2e/tests/commands/add/add-material.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import { ng } from '../../../utils/process';
import { isPrereleaseCli } from '../../../utils/project';

export default async function () {
// TODO(crisbeto): temporarily disabled until Material is updated to TS 5.2
return;

// forcibly remove in case another test doesn't clean itself up
await rimraf('node_modules/@angular/material');

Expand Down
3 changes: 0 additions & 3 deletions tests/legacy-cli/e2e/tests/misc/invalid-schematic-dependencies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import { installPackage, uninstallPackage } from '../../utils/packages';
import { isPrereleaseCli } from '../../utils/project';

export default async function () {
// TODO(crisbeto): temporarily disabled until Material is updated to TS 5.2
return;

// Must publish old version to local registry to allow install. This is especially important
// for release commits as npm will try to request tooling packages that are not on the npm registry yet
await publishOutdated('@schematics/angular@7');
Expand Down