Skip to content

Commit 161ea63

Browse files
committed
build: switch dialog e2e to MDC
Removes the e2e app entry for the legacy dialog and renames the MDC dialog.
1 parent 8639875 commit 161ea63

File tree

14 files changed

+14
-217
lines changed

14 files changed

+14
-217
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@
249249
/src/e2e-app/expansion/** @andrewseguin
250250
/src/e2e-app/grid-list/** @andrewseguin
251251
/src/e2e-app/icon/** @andrewseguin
252-
/src/e2e-app/legacy-dialog/** @andrewseguin @crisbeto
253252
/src/e2e-app/legacy-input/** @mmalerba
254253
/src/e2e-app/legacy-menu/** @crisbeto
255254
/src/e2e-app/legacy-progress-bar/** @andrewseguin @crisbeto
@@ -262,7 +261,7 @@
262261
/src/e2e-app/mdc-card/** @mmalerba
263262
/src/e2e-app/checkbox/** @mmalerba
264263
/src/e2e-app/mdc-chips/** @mmalerba
265-
/src/e2e-app/mdc-dialog/** @devversion
264+
/src/e2e-app/dialog/** @devversion
266265
/src/e2e-app/mdc-input/** @devversion
267266
/src/e2e-app/mdc-menu/** @crisbeto
268267
/src/e2e-app/mdc-progress-bar/** @crisbeto

src/e2e-app/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ ng_module(
5050
"//src/material/grid-list",
5151
"//src/material/icon",
5252
"//src/material/input",
53-
"//src/material/legacy-dialog",
5453
"//src/material/legacy-form-field",
5554
"//src/material/legacy-input",
5655
"//src/material/legacy-list",

src/e2e-app/mdc-dialog/mdc-dialog-e2e-module.ts renamed to src/e2e-app/dialog/dialog-e2e-module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
import {NgModule} from '@angular/core';
1010
import {MatDialogModule} from '@angular/material/dialog';
11-
import {MdcDialogE2E, TestDialog} from './mdc-dialog-e2e';
11+
import {DialogE2E, TestDialog} from './dialog-e2e';
1212

1313
@NgModule({
1414
imports: [MatDialogModule],
15-
declarations: [MdcDialogE2E, TestDialog],
15+
declarations: [DialogE2E, TestDialog],
1616
})
17-
export class MdcDialogE2eModule {}
17+
export class DialogE2eModule {}

src/e2e-app/mdc-dialog/mdc-dialog-e2e.ts renamed to src/e2e-app/dialog/dialog-e2e.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import {Component, ViewChild, TemplateRef} from '@angular/core';
22
import {MatDialog, MatDialogRef, MatDialogConfig} from '@angular/material/dialog';
33

44
@Component({
5-
selector: 'mdc-dialog-e2e',
6-
templateUrl: 'mdc-dialog-e2e.html',
5+
selector: 'dialog-e2e',
6+
templateUrl: 'dialog-e2e.html',
77
})
8-
export class MdcDialogE2E {
8+
export class DialogE2E {
99
dialogRef: MatDialogRef<TestDialog> | null;
1010

1111
@ViewChild(TemplateRef) templateRef: TemplateRef<any>;

src/e2e-app/e2e-app/e2e-app-layout.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export class E2eAppLayout {
3636
{path: 'toolbar', title: 'Toolbar'},
3737
{path: 'virtual-scroll', title: 'Virtual Scroll'},
3838
{path: 'mdc-chips', title: 'MDC Chips'},
39-
{path: 'mdc-dialog', title: 'MDC Dialog'},
4039
{path: 'mdc-input', title: 'MDC Input'},
4140
{path: 'mdc-menu', title: 'MDC Menu'},
4241
{path: 'mdc-radio', title: 'MDC Radio'},

src/e2e-app/legacy-dialog/legacy-dialog-e2e-module.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/e2e-app/legacy-dialog/legacy-dialog-e2e.ts

Lines changed: 0 additions & 48 deletions
This file was deleted.

src/e2e-app/main-module.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {E2eAppModule} from './e2e-app/e2e-app-module';
1111
import {ExpansionE2eModule} from './expansion/expansion-e2e-module';
1212
import {GridListE2eModule} from './grid-list/grid-list-e2e-module';
1313
import {IconE2eModule} from './icon/icon-e2e-module';
14-
import {LegacyDialogE2eModule} from './legacy-dialog/legacy-dialog-e2e-module';
1514
import {LegacyInputE2eModule} from './legacy-input/legacy-input-e2e-module';
1615
import {LegacyMenuE2eModule} from './legacy-menu/legacy-menu-e2e-module';
1716
import {LegacyProgressBarE2eModule} from './legacy-progress-bar/legacy-progress-bar-e2e-module';
@@ -23,7 +22,7 @@ import {ListE2eModule} from './list/list-e2e-module';
2322
import {ButtonE2eModule} from './button/button-e2e-module';
2423
import {CheckboxE2eModule} from './checkbox/checkbox-e2e-module';
2524
import {MdcChipsE2eModule} from './mdc-chips/mdc-chips-e2e-module';
26-
import {MdcDialogE2eModule} from './mdc-dialog/mdc-dialog-e2e-module';
25+
import {DialogE2eModule} from './dialog/dialog-e2e-module';
2726
import {MdcMenuE2eModule} from './mdc-menu/mdc-menu-e2e-module';
2827
import {MdcProgressBarE2eModule} from './mdc-progress-bar/mdc-progress-bar-e2e-module';
2928
import {MdcProgressSpinnerE2eModule} from './mdc-progress-spinner/mdc-progress-spinner-module';
@@ -56,7 +55,6 @@ const enableAnimations = window.location.search.includes('animations=true');
5655
ExpansionE2eModule,
5756
GridListE2eModule,
5857
IconE2eModule,
59-
LegacyDialogE2eModule,
6058
LegacyInputE2eModule,
6159
LegacyMenuE2eModule,
6260
LegacyProgressBarE2eModule,
@@ -68,7 +66,7 @@ const enableAnimations = window.location.search.includes('animations=true');
6866
ButtonE2eModule,
6967
CheckboxE2eModule,
7068
MdcChipsE2eModule,
71-
MdcDialogE2eModule,
69+
DialogE2eModule,
7270
MdcMenuE2eModule,
7371
MdcProgressBarE2eModule,
7472
MdcProgressSpinnerE2eModule,

src/e2e-app/mdc-dialog/mdc-dialog-e2e.html

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)