Skip to content

Commit 2cd1e41

Browse files
committed
build: switch radio e2e to MDC
Removes the e2e app entry for the legacy radio and renames the MDC radio.
1 parent 3be5d0e commit 2cd1e41

File tree

14 files changed

+14
-119
lines changed

14 files changed

+14
-119
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-radio/** @andrewseguin @devversion
253252
/src/e2e-app/legacy-slide-toggle/** @devversion
254253
/src/e2e-app/legacy-tabs/** @andrewseguin
255254
/src/e2e-app/list/** @andrewseguin
@@ -261,7 +260,7 @@
261260
/src/e2e-app/menu/** @crisbeto
262261
/src/e2e-app/progress-bar/** @crisbeto
263262
/src/e2e-app/progress-spinner/** @mmalerba
264-
/src/e2e-app/mdc-radio/** @mmalerba
263+
/src/e2e-app/radio/** @mmalerba
265264
/src/e2e-app/mdc-slide-toggle/** @crisbeto
266265
/src/e2e-app/mdc-slider/** @andrewseguin
267266
/src/e2e-app/mdc-table/** @andrewseguin

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-radio",
5655
"//src/material/legacy-slide-toggle",
5756
"//src/material/legacy-tabs",
5857
"//src/material/menu",

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class E2eAppLayout {
2626
{path: 'menu', title: 'Menu'},
2727
{path: 'progress-bar', title: 'Progress bar'},
2828
{path: 'progress-spinner', title: 'Progress Spinner'},
29-
{path: 'radio', title: 'Radios'},
29+
{path: 'radio', title: 'Radio'},
3030
{path: 'select', title: 'Select'},
3131
{path: 'sidenav', title: 'Sidenav'},
3232
{path: 'slide-toggle', title: 'Slide Toggle'},
@@ -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-radio', title: 'MDC Radio'},
3938
{path: 'mdc-slide-toggle', title: 'MDC Slide Toggle'},
4039
{path: 'mdc-table', title: 'MDC Table'},
4140
{path: 'mdc-tabs', title: 'MDC Tabs'},

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

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

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

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

src/e2e-app/legacy-radio/legacy-radio-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 {LegacyRadioE2eModule} from './legacy-radio/legacy-radio-e2e-module';
1514
import {LegacySlideToggleE2eModule} from './legacy-slide-toggle/legacy-slide-toggle-e2e-module';
1615
import {LegacyTabsE2eModule} from './legacy-tabs/legacy-tabs-e2e-module';
1716
import {ListE2eModule} from './list/list-e2e-module';
@@ -21,7 +20,7 @@ import {DialogE2eModule} from './dialog/dialog-e2e-module';
2120
import {MenuE2eModule} from './menu/menu-e2e-module';
2221
import {ProgressBarE2eModule} from './progress-bar/progress-bar-e2e-module';
2322
import {ProgressSpinnerE2eModule} from './progress-spinner/progress-spinner-module';
24-
import {MdcRadioE2eModule} from './mdc-radio/mdc-radio-e2e-module';
23+
import {RadioE2eModule} from './radio/radio-e2e-module';
2524
import {MdcSlideToggleE2eModule} from './mdc-slide-toggle/mdc-slide-toggle-e2e-module';
2625
import {MdcSliderE2eModule} from './mdc-slider/mdc-slider-e2e-module';
2726
import {MdcTableE2eModule} from './mdc-table/mdc-table-e2e-module';
@@ -50,7 +49,6 @@ const enableAnimations = window.location.search.includes('animations=true');
5049
ExpansionE2eModule,
5150
GridListE2eModule,
5251
IconE2eModule,
53-
LegacyRadioE2eModule,
5452
LegacySlideToggleE2eModule,
5553
LegacyTabsE2eModule,
5654
ListE2eModule,
@@ -60,7 +58,7 @@ const enableAnimations = window.location.search.includes('animations=true');
6058
MenuE2eModule,
6159
ProgressBarE2eModule,
6260
ProgressSpinnerE2eModule,
63-
MdcRadioE2eModule,
61+
RadioE2eModule,
6462
MdcSliderE2eModule,
6563
MdcSlideToggleE2eModule,
6664
MdcTableE2eModule,

src/e2e-app/mdc-radio/mdc-radio-e2e-module.ts renamed to src/e2e-app/radio/radio-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 {MatRadioModule} from '@angular/material/radio';
11-
import {MdcRadioE2e} from './mdc-radio-e2e';
11+
import {RadioE2e} from './radio-e2e';
1212

1313
@NgModule({
1414
imports: [MatRadioModule],
15-
declarations: [MdcRadioE2e],
15+
declarations: [RadioE2e],
1616
})
17-
export class MdcRadioE2eModule {}
17+
export class RadioE2eModule {}

src/e2e-app/mdc-radio/mdc-radio-e2e.ts renamed to src/e2e-app/radio/radio-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-radio-e2e',
13-
templateUrl: 'mdc-radio-e2e.html',
12+
selector: 'radio-e2e',
13+
templateUrl: 'radio-e2e.html',
1414
})
15-
export class MdcRadioE2e {
15+
export class RadioE2e {
1616
isGroupDisabled: boolean = false;
1717
groupValue: string;
1818
}

src/e2e-app/routes.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {Home} from './e2e-app/e2e-app-layout';
77
import {ExpansionE2e} from './expansion/expansion-e2e';
88
import {GridListE2E} from './grid-list/grid-list-e2e';
99
import {IconE2E} from './icon/icon-e2e';
10-
import {LegacyRadioE2e} from './legacy-radio/legacy-radio-e2e';
1110
import {LegacySlideToggleE2e} from './legacy-slide-toggle/legacy-slide-toggle-e2e';
1211
import {LegacyTabsE2e} from './legacy-tabs/legacy-tabs-e2e';
1312
import {ListE2e} from './list/list-e2e';
@@ -18,7 +17,7 @@ import {InputE2E} from './input/input-e2e';
1817
import {MenuE2e} from './menu/menu-e2e';
1918
import {ProgressBarE2E} from './progress-bar/progress-bar-e2e';
2019
import {ProgressSpinnerE2e} from './progress-spinner/progress-spinner-e2e';
21-
import {MdcRadioE2e} from './mdc-radio/mdc-radio-e2e';
20+
import {RadioE2e} from './radio/radio-e2e';
2221
import {MdcSlideToggleE2e} from './mdc-slide-toggle/mdc-slide-toggle-e2e';
2322
import {MdcSliderE2e} from './mdc-slider/mdc-slider-e2e';
2423
import {MdcTableE2e} from './mdc-table/mdc-table-e2e';
@@ -43,13 +42,12 @@ export const E2E_APP_ROUTES: Routes = [
4342
{path: 'menu', component: MenuE2e},
4443
{path: 'progress-bar', component: ProgressBarE2E},
4544
{path: 'progress-spinner', component: ProgressSpinnerE2e},
46-
{path: 'legacy-radio', component: LegacyRadioE2e},
45+
{path: 'radio', component: RadioE2e},
4746
{path: 'legacy-slide-toggle', component: LegacySlideToggleE2e},
4847
{path: 'legacy-tabs', component: LegacyTabsE2e},
4948
{path: 'list', component: ListE2e},
5049
{path: 'button', component: ButtonE2e},
5150
{path: 'dialog', component: DialogE2E},
52-
{path: 'mdc-radio', component: MdcRadioE2e},
5351
{path: 'mdc-slide-toggle', component: MdcSlideToggleE2e},
5452
{path: 'mdc-slider', component: MdcSliderE2e},
5553
{path: 'mdc-table', component: MdcTableE2e},

src/material/legacy-radio/BUILD.bazel

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
21
load(
32
"//tools:defaults.bzl",
4-
"ng_e2e_test_library",
53
"ng_module",
64
"ng_test_library",
75
"ng_web_test_suite",
@@ -48,10 +46,7 @@ sass_binary(
4846

4947
ng_test_library(
5048
name = "unit_test_sources",
51-
srcs = glob(
52-
["**/*.spec.ts"],
53-
exclude = ["**/*.e2e.spec.ts"],
54-
),
49+
srcs = glob(["**/*.spec.ts"]),
5550
deps = [
5651
":legacy-radio",
5752
"//src/cdk/testing/private",
@@ -66,22 +61,6 @@ ng_web_test_suite(
6661
deps = [":unit_test_sources"],
6762
)
6863

69-
ng_e2e_test_library(
70-
name = "e2e_test_sources",
71-
srcs = glob(["**/*.e2e.spec.ts"]),
72-
deps = [
73-
"//src/cdk/testing/private/e2e",
74-
],
75-
)
76-
77-
e2e_test_suite(
78-
name = "e2e_tests",
79-
deps = [
80-
":e2e_test_sources",
81-
"//src/cdk/testing/private/e2e",
82-
],
83-
)
84-
8564
filegroup(
8665
name = "source-files",
8766
srcs = glob(["**/*.ts"]),

src/material/legacy-radio/radio.e2e.spec.ts

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

src/material/radio/radio.e2e.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {browser, by, element} from 'protractor';
22

33
describe('radio', () => {
44
describe('disabling behavior', () => {
5-
beforeEach(async () => await browser.get('/mdc-radio'));
5+
beforeEach(async () => await browser.get('/radio'));
66

77
it('should be checked when clicked', async () => {
88
await element(by.id('water')).click();

0 commit comments

Comments
 (0)