Skip to content

Commit 616ad39

Browse files
committed
build: switch button e2e to MDC
Removes the e2e app entry for the legacy button and renames the MDC button.
1 parent 15288a9 commit 616ad39

16 files changed

+15
-180
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-button/** @andrewseguin
253252
/src/e2e-app/legacy-checkbox/** @andrewseguin @devversion
254253
/src/e2e-app/legacy-dialog/** @andrewseguin @crisbeto
255254
/src/e2e-app/legacy-input/** @mmalerba
@@ -260,7 +259,7 @@
260259
/src/e2e-app/legacy-slide-toggle/** @devversion
261260
/src/e2e-app/legacy-tabs/** @andrewseguin
262261
/src/e2e-app/list/** @andrewseguin
263-
/src/e2e-app/mdc-button/** @andrewseguin
262+
/src/e2e-app/button/** @andrewseguin
264263
/src/e2e-app/mdc-card/** @mmalerba
265264
/src/e2e-app/mdc-checkbox/** @mmalerba
266265
/src/e2e-app/mdc-chips/** @mmalerba

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-button",
5453
"//src/material/legacy-checkbox",
5554
"//src/material/legacy-dialog",
5655
"//src/material/legacy-form-field",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import {NgModule} from '@angular/core';
1010
import {MatButtonModule} from '@angular/material/button';
1111
import {MatIconModule} from '@angular/material/icon';
12-
import {MdcButtonE2e} from './mdc-button-e2e';
12+
import {ButtonE2e} from './button-e2e';
1313

1414
@NgModule({
1515
imports: [MatButtonModule, MatIconModule],
16-
declarations: [MdcButtonE2e],
16+
declarations: [ButtonE2e],
1717
})
18-
export class MdcButtonE2eModule {}
18+
export class ButtonE2eModule {}

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

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

1111
@Component({
12-
selector: 'mdc-button-e2e',
13-
templateUrl: 'mdc-button-e2e.html',
12+
selector: 'button-e2e',
13+
templateUrl: 'button-e2e.html',
1414
})
15-
export class MdcButtonE2e {
15+
export class ButtonE2e {
1616
isDisabled: boolean = false;
1717
clickCounter: number = 0;
1818
}

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-button', title: 'MDC Button'},
3938
{path: 'mdc-checkbox', title: 'MDC Checkbox'},
4039
{path: 'mdc-chips', title: 'MDC Chips'},
4140
{path: 'mdc-dialog', title: 'MDC Dialog'},

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

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

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

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

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

Lines changed: 0 additions & 10 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 {LegacyButtonE2eModule} from './legacy-button/legacy-button-e2e-module';
1514
import {LegacyCheckboxE2eModule} from './legacy-checkbox/legacy-checkbox-e2e-module';
1615
import {LegacyDialogE2eModule} from './legacy-dialog/legacy-dialog-e2e-module';
1716
import {LegacyInputE2eModule} from './legacy-input/legacy-input-e2e-module';
@@ -22,7 +21,7 @@ import {LegacyRadioE2eModule} from './legacy-radio/legacy-radio-e2e-module';
2221
import {LegacySlideToggleE2eModule} from './legacy-slide-toggle/legacy-slide-toggle-e2e-module';
2322
import {LegacyTabsE2eModule} from './legacy-tabs/legacy-tabs-e2e-module';
2423
import {ListE2eModule} from './list/list-e2e-module';
25-
import {MdcButtonE2eModule} from './mdc-button/mdc-button-e2e-module';
24+
import {ButtonE2eModule} from './button/button-e2e-module';
2625
import {MdcCheckboxE2eModule} from './mdc-checkbox/mdc-checkbox-e2e-module';
2726
import {MdcChipsE2eModule} from './mdc-chips/mdc-chips-e2e-module';
2827
import {MdcDialogE2eModule} from './mdc-dialog/mdc-dialog-e2e-module';
@@ -58,7 +57,6 @@ const enableAnimations = window.location.search.includes('animations=true');
5857
ExpansionE2eModule,
5958
GridListE2eModule,
6059
IconE2eModule,
61-
LegacyButtonE2eModule,
6260
LegacyCheckboxE2eModule,
6361
LegacyDialogE2eModule,
6462
LegacyInputE2eModule,
@@ -69,7 +67,7 @@ const enableAnimations = window.location.search.includes('animations=true');
6967
LegacySlideToggleE2eModule,
7068
LegacyTabsE2eModule,
7169
ListE2eModule,
72-
MdcButtonE2eModule,
70+
ButtonE2eModule,
7371
MdcCheckboxE2eModule,
7472
MdcChipsE2eModule,
7573
MdcDialogE2eModule,

0 commit comments

Comments
 (0)