Skip to content

Commit cc4bd59

Browse files
committed
build: switch menu e2e to MDC
Removes the e2e app entry for the legacy menu and renames the MDC menu.
1 parent 9a31c53 commit cc4bd59

File tree

14 files changed

+14
-336
lines changed

14 files changed

+14
-336
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-menu/** @crisbeto
253252
/src/e2e-app/legacy-progress-bar/** @andrewseguin @crisbeto
254253
/src/e2e-app/legacy-progress-spinner/** @andrewseguin @crisbeto
255254
/src/e2e-app/legacy-radio/** @andrewseguin @devversion
@@ -261,7 +260,7 @@
261260
/src/e2e-app/checkbox/** @mmalerba
262261
/src/e2e-app/dialog/** @devversion
263262
/src/e2e-app/input/** @devversion
264-
/src/e2e-app/mdc-menu/** @crisbeto
263+
/src/e2e-app/menu/** @crisbeto
265264
/src/e2e-app/mdc-progress-bar/** @crisbeto
266265
/src/e2e-app/mdc-progress-spinner/** @mmalerba
267266
/src/e2e-app/mdc-radio/** @mmalerba

src/e2e-app/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ ng_module(
5252
"//src/material/input",
5353
"//src/material/legacy-form-field",
5454
"//src/material/legacy-list",
55-
"//src/material/legacy-menu",
5655
"//src/material/legacy-progress-bar",
5756
"//src/material/legacy-progress-spinner",
5857
"//src/material/legacy-radio",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export class E2eAppLayout {
3535
{path: 'cards', title: 'Cards'},
3636
{path: 'toolbar', title: 'Toolbar'},
3737
{path: 'virtual-scroll', title: 'Virtual Scroll'},
38-
{path: 'mdc-menu', title: 'MDC Menu'},
3938
{path: 'mdc-radio', title: 'MDC Radio'},
4039
{path: 'mdc-slide-toggle', title: 'MDC Slide Toggle'},
4140
{path: 'mdc-table', title: 'MDC Table'},

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

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

src/e2e-app/legacy-menu/legacy-menu-e2e.html

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

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

Lines changed: 0 additions & 21 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 {LegacyMenuE2eModule} from './legacy-menu/legacy-menu-e2e-module';
1514
import {LegacyProgressBarE2eModule} from './legacy-progress-bar/legacy-progress-bar-e2e-module';
1615
import {LegacyProgressSpinnerE2eModule} from './legacy-progress-spinner/legacy-progress-spinner-e2e-module';
1716
import {LegacyRadioE2eModule} from './legacy-radio/legacy-radio-e2e-module';
@@ -21,7 +20,7 @@ import {ListE2eModule} from './list/list-e2e-module';
2120
import {ButtonE2eModule} from './button/button-e2e-module';
2221
import {CheckboxE2eModule} from './checkbox/checkbox-e2e-module';
2322
import {DialogE2eModule} from './dialog/dialog-e2e-module';
24-
import {MdcMenuE2eModule} from './mdc-menu/mdc-menu-e2e-module';
23+
import {MenuE2eModule} from './menu/menu-e2e-module';
2524
import {MdcProgressBarE2eModule} from './mdc-progress-bar/mdc-progress-bar-e2e-module';
2625
import {MdcProgressSpinnerE2eModule} from './mdc-progress-spinner/mdc-progress-spinner-module';
2726
import {MdcRadioE2eModule} from './mdc-radio/mdc-radio-e2e-module';
@@ -53,7 +52,6 @@ const enableAnimations = window.location.search.includes('animations=true');
5352
ExpansionE2eModule,
5453
GridListE2eModule,
5554
IconE2eModule,
56-
LegacyMenuE2eModule,
5755
LegacyProgressBarE2eModule,
5856
LegacyProgressSpinnerE2eModule,
5957
LegacyRadioE2eModule,
@@ -63,7 +61,7 @@ const enableAnimations = window.location.search.includes('animations=true');
6361
ButtonE2eModule,
6462
CheckboxE2eModule,
6563
DialogE2eModule,
66-
MdcMenuE2eModule,
64+
MenuE2eModule,
6765
MdcProgressBarE2eModule,
6866
MdcProgressSpinnerE2eModule,
6967
MdcRadioE2eModule,

src/e2e-app/mdc-menu/mdc-menu-e2e-module.ts renamed to src/e2e-app/menu/menu-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 {MatMenuModule} from '@angular/material/menu';
11-
import {MdcMenuE2e} from './mdc-menu-e2e';
11+
import {MenuE2e} from './menu-e2e';
1212

1313
@NgModule({
1414
imports: [MatMenuModule],
15-
declarations: [MdcMenuE2e],
15+
declarations: [MenuE2e],
1616
})
17-
export class MdcMenuE2eModule {}
17+
export class MenuE2eModule {}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import {Component} from '@angular/core';
1010

1111
@Component({
12-
selector: 'mdc-menu-e2e',
13-
templateUrl: 'mdc-menu-e2e.html',
12+
selector: 'menu-e2e',
13+
templateUrl: 'menu-e2e.html',
1414
styles: [
1515
`
1616
#before-t, #above-t, #combined-t {
@@ -24,6 +24,6 @@ import {Component} from '@angular/core';
2424
`,
2525
],
2626
})
27-
export class MdcMenuE2e {
27+
export class MenuE2e {
2828
selected: string = '';
2929
}

0 commit comments

Comments
 (0)