Skip to content

Commit f116872

Browse files
committed
build: switch slide toggle e2e to MDC
Removes the e2e app entry for the legacy slide toggle and renames the MDC slide toggle.
1 parent 2cd1e41 commit f116872

File tree

14 files changed

+14
-133
lines changed

14 files changed

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

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

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-slide-toggle', title: 'MDC Slide Toggle'},
3938
{path: 'mdc-table', title: 'MDC Table'},
4039
{path: 'mdc-tabs', title: 'MDC Tabs'},
4140
];

src/e2e-app/legacy-slide-toggle/legacy-slide-toggle-e2e-module.ts

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

src/e2e-app/legacy-slide-toggle/legacy-slide-toggle-e2e.html

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

src/e2e-app/legacy-slide-toggle/legacy-slide-toggle-e2e.ts

Lines changed: 0 additions & 7 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 {LegacySlideToggleE2eModule} from './legacy-slide-toggle/legacy-slide-toggle-e2e-module';
1514
import {LegacyTabsE2eModule} from './legacy-tabs/legacy-tabs-e2e-module';
1615
import {ListE2eModule} from './list/list-e2e-module';
1716
import {ButtonE2eModule} from './button/button-e2e-module';
@@ -21,7 +20,7 @@ import {MenuE2eModule} from './menu/menu-e2e-module';
2120
import {ProgressBarE2eModule} from './progress-bar/progress-bar-e2e-module';
2221
import {ProgressSpinnerE2eModule} from './progress-spinner/progress-spinner-module';
2322
import {RadioE2eModule} from './radio/radio-e2e-module';
24-
import {MdcSlideToggleE2eModule} from './mdc-slide-toggle/mdc-slide-toggle-e2e-module';
23+
import {SlideToggleE2eModule} from './slide-toggle/slide-toggle-e2e-module';
2524
import {MdcSliderE2eModule} from './mdc-slider/mdc-slider-e2e-module';
2625
import {MdcTableE2eModule} from './mdc-table/mdc-table-e2e-module';
2726
import {MdcTabsE2eModule} from './mdc-tabs/mdc-tabs-e2e-module';
@@ -49,7 +48,6 @@ const enableAnimations = window.location.search.includes('animations=true');
4948
ExpansionE2eModule,
5049
GridListE2eModule,
5150
IconE2eModule,
52-
LegacySlideToggleE2eModule,
5351
LegacyTabsE2eModule,
5452
ListE2eModule,
5553
ButtonE2eModule,
@@ -60,7 +58,7 @@ const enableAnimations = window.location.search.includes('animations=true');
6058
ProgressSpinnerE2eModule,
6159
RadioE2eModule,
6260
MdcSliderE2eModule,
63-
MdcSlideToggleE2eModule,
61+
SlideToggleE2eModule,
6462
MdcTableE2eModule,
6563
MdcTabsE2eModule,
6664
SidenavE2eModule,

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 {LegacySlideToggleE2e} from './legacy-slide-toggle/legacy-slide-toggle-e2e';
1110
import {LegacyTabsE2e} from './legacy-tabs/legacy-tabs-e2e';
1211
import {ListE2e} from './list/list-e2e';
1312
import {ButtonE2e} from './button/button-e2e';
@@ -18,7 +17,6 @@ import {MenuE2e} from './menu/menu-e2e';
1817
import {ProgressBarE2E} from './progress-bar/progress-bar-e2e';
1918
import {ProgressSpinnerE2e} from './progress-spinner/progress-spinner-e2e';
2019
import {RadioE2e} from './radio/radio-e2e';
21-
import {MdcSlideToggleE2e} from './mdc-slide-toggle/mdc-slide-toggle-e2e';
2220
import {MdcSliderE2e} from './mdc-slider/mdc-slider-e2e';
2321
import {MdcTableE2e} from './mdc-table/mdc-table-e2e';
2422
import {MdcTabsE2e} from './mdc-tabs/mdc-tabs-e2e';
@@ -27,6 +25,7 @@ import {SidenavE2E} from './sidenav/sidenav-e2e';
2725
import {StepperE2e} from './stepper/stepper-e2e';
2826
import {ToolbarE2e} from './toolbar/toolbar-e2e';
2927
import {VirtualScrollE2E} from './virtual-scroll/virtual-scroll-e2e';
28+
import {SlideToggleE2e} from './slide-toggle/slide-toggle-e2e';
3029

3130
export const E2E_APP_ROUTES: Routes = [
3231
{path: '', component: Home},
@@ -43,12 +42,11 @@ export const E2E_APP_ROUTES: Routes = [
4342
{path: 'progress-bar', component: ProgressBarE2E},
4443
{path: 'progress-spinner', component: ProgressSpinnerE2e},
4544
{path: 'radio', component: RadioE2e},
46-
{path: 'legacy-slide-toggle', component: LegacySlideToggleE2e},
45+
{path: 'slide-toggle', component: SlideToggleE2e},
4746
{path: 'legacy-tabs', component: LegacyTabsE2e},
4847
{path: 'list', component: ListE2e},
4948
{path: 'button', component: ButtonE2e},
5049
{path: 'dialog', component: DialogE2E},
51-
{path: 'mdc-slide-toggle', component: MdcSlideToggleE2e},
5250
{path: 'mdc-slider', component: MdcSliderE2e},
5351
{path: 'mdc-table', component: MdcTableE2e},
5452
{path: 'mdc-tabs', component: MdcTabsE2e},

src/e2e-app/mdc-slide-toggle/mdc-slide-toggle-e2e-module.ts renamed to src/e2e-app/slide-toggle/slide-toggle-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 {MatSlideToggleModule} from '@angular/material/slide-toggle';
11-
import {MdcSlideToggleE2e} from './mdc-slide-toggle-e2e';
11+
import {SlideToggleE2e} from './slide-toggle-e2e';
1212

1313
@NgModule({
1414
imports: [MatSlideToggleModule],
15-
declarations: [MdcSlideToggleE2e],
15+
declarations: [SlideToggleE2e],
1616
})
17-
export class MdcSlideToggleE2eModule {}
17+
export class SlideToggleE2eModule {}

src/e2e-app/mdc-slide-toggle/mdc-slide-toggle-e2e.ts renamed to src/e2e-app/slide-toggle/slide-toggle-e2e.ts

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

1111
@Component({
12-
selector: 'mdc-slide-toggle-e2e',
13-
templateUrl: 'mdc-slide-toggle-e2e.html',
12+
selector: 'slide-toggle-e2e',
13+
templateUrl: 'slide-toggle-e2e.html',
1414
})
15-
export class MdcSlideToggleE2e {}
15+
export class SlideToggleE2e {}

src/material/legacy-slide-toggle/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-slide-toggle",
5752
"//src/cdk/a11y",
@@ -68,22 +63,6 @@ ng_web_test_suite(
6863
deps = [":unit_test_sources"],
6964
)
7065

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

src/material/legacy-slide-toggle/slide-toggle.e2e.spec.ts

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

src/material/slide-toggle/slide-toggle.e2e.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import {browser, element, by, Key} from 'protractor';
22
import {expectToExist} from '../../cdk/testing/private/e2e';
33

4-
describe('MDC-based slide-toggle', () => {
4+
describe('slide-toggle', () => {
55
const getButton = () => element(by.css('#normal-slide-toggle button'));
66
const getNormalToggle = () => element(by.css('#normal-slide-toggle'));
77

8-
beforeEach(async () => await browser.get('mdc-slide-toggle'));
8+
beforeEach(async () => await browser.get('/slide-toggle'));
99

1010
it('should render a slide-toggle', async () => {
1111
await expectToExist('mat-slide-toggle');

0 commit comments

Comments
 (0)