Skip to content

Commit 89a8940

Browse files
committed
build: switch tabs e2e to MDC
Removes the e2e app entry for the legacy tabs and renames the MDC tabs.
1 parent f116872 commit 89a8940

File tree

14 files changed

+14
-179
lines changed

14 files changed

+14
-179
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-tabs/** @andrewseguin
253252
/src/e2e-app/list/** @andrewseguin
254253
/src/e2e-app/button/** @andrewseguin
255254
/src/e2e-app/mdc-card/** @mmalerba
@@ -263,7 +262,7 @@
263262
/src/e2e-app/slide-toggle/** @crisbeto
264263
/src/e2e-app/mdc-slider/** @andrewseguin
265264
/src/e2e-app/mdc-table/** @andrewseguin
266-
/src/e2e-app/mdc-tabs/** @crisbeto
265+
/src/e2e-app/tabs/** @crisbeto
267266
/src/e2e-app/select/** @crisbeto
268267
/src/e2e-app/sidenav/** @mmalerba
269268
/src/e2e-app/stepper/** @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-tabs",
5655
"//src/material/menu",
5756
"//src/material/progress-bar",
5857
"//src/material/progress-spinner",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ export class E2eAppLayout {
3636
{path: 'toolbar', title: 'Toolbar'},
3737
{path: 'virtual-scroll', title: 'Virtual Scroll'},
3838
{path: 'mdc-table', title: 'MDC Table'},
39-
{path: 'mdc-tabs', title: 'MDC Tabs'},
4039
];
4140
}

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

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

src/e2e-app/legacy-tabs/legacy-tabs-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 {LegacyTabsE2eModule} from './legacy-tabs/legacy-tabs-e2e-module';
1514
import {ListE2eModule} from './list/list-e2e-module';
1615
import {ButtonE2eModule} from './button/button-e2e-module';
1716
import {CheckboxE2eModule} from './checkbox/checkbox-e2e-module';
@@ -23,7 +22,7 @@ import {RadioE2eModule} from './radio/radio-e2e-module';
2322
import {SlideToggleE2eModule} from './slide-toggle/slide-toggle-e2e-module';
2423
import {MdcSliderE2eModule} from './mdc-slider/mdc-slider-e2e-module';
2524
import {MdcTableE2eModule} from './mdc-table/mdc-table-e2e-module';
26-
import {MdcTabsE2eModule} from './mdc-tabs/mdc-tabs-e2e-module';
25+
import {TabsE2eModule} from './tabs/tabs-e2e-module';
2726
import {E2E_APP_ROUTES} from './routes';
2827
import {SidenavE2eModule} from './sidenav/sidenav-e2e-module';
2928
import {StepperE2eModule} from './stepper/stepper-e2e-module';
@@ -48,7 +47,6 @@ const enableAnimations = window.location.search.includes('animations=true');
4847
ExpansionE2eModule,
4948
GridListE2eModule,
5049
IconE2eModule,
51-
LegacyTabsE2eModule,
5250
ListE2eModule,
5351
ButtonE2eModule,
5452
CheckboxE2eModule,
@@ -60,7 +58,7 @@ const enableAnimations = window.location.search.includes('animations=true');
6058
MdcSliderE2eModule,
6159
SlideToggleE2eModule,
6260
MdcTableE2eModule,
63-
MdcTabsE2eModule,
61+
TabsE2eModule,
6462
SidenavE2eModule,
6563
StepperE2eModule,
6664
ToolbarE2eModule,

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

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

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 {LegacyTabsE2e} from './legacy-tabs/legacy-tabs-e2e';
1110
import {ListE2e} from './list/list-e2e';
1211
import {ButtonE2e} from './button/button-e2e';
1312
import {CheckboxE2e} from './checkbox/checkbox-e2e';
@@ -19,7 +18,7 @@ import {ProgressSpinnerE2e} from './progress-spinner/progress-spinner-e2e';
1918
import {RadioE2e} from './radio/radio-e2e';
2019
import {MdcSliderE2e} from './mdc-slider/mdc-slider-e2e';
2120
import {MdcTableE2e} from './mdc-table/mdc-table-e2e';
22-
import {MdcTabsE2e} from './mdc-tabs/mdc-tabs-e2e';
21+
import {TabsE2e} from './tabs/tabs-e2e';
2322
import {SelectE2e} from './select/select-e2e';
2423
import {SidenavE2E} from './sidenav/sidenav-e2e';
2524
import {StepperE2e} from './stepper/stepper-e2e';
@@ -43,13 +42,12 @@ export const E2E_APP_ROUTES: Routes = [
4342
{path: 'progress-spinner', component: ProgressSpinnerE2e},
4443
{path: 'radio', component: RadioE2e},
4544
{path: 'slide-toggle', component: SlideToggleE2e},
46-
{path: 'legacy-tabs', component: LegacyTabsE2e},
45+
{path: 'tabs', component: TabsE2e},
4746
{path: 'list', component: ListE2e},
4847
{path: 'button', component: ButtonE2e},
4948
{path: 'dialog', component: DialogE2E},
5049
{path: 'mdc-slider', component: MdcSliderE2e},
5150
{path: 'mdc-table', component: MdcTableE2e},
52-
{path: 'mdc-tabs', component: MdcTabsE2e},
5351
{path: 'select', component: SelectE2e},
5452
{path: 'sidenav', component: SidenavE2E},
5553
{path: 'stepper', component: StepperE2e},

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import {NgModule} from '@angular/core';
1010
import {MatFormFieldModule} from '@angular/material/form-field';
1111
import {MatInputModule} from '@angular/material/input';
1212
import {MatTabsModule} from '@angular/material/tabs';
13-
import {MdcTabsE2e} from './mdc-tabs-e2e';
13+
import {TabsE2e} from './tabs-e2e';
1414

1515
@NgModule({
1616
imports: [MatTabsModule, MatFormFieldModule, MatInputModule],
17-
declarations: [MdcTabsE2e],
17+
declarations: [TabsE2e],
1818
})
19-
export class MdcTabsE2eModule {}
19+
export class TabsE2eModule {}

src/e2e-app/mdc-tabs/mdc-tabs-e2e.ts renamed to src/e2e-app/tabs/tabs-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-tabs-e2e',
13-
templateUrl: 'mdc-tabs-e2e.html',
12+
selector: 'tabs-e2e',
13+
templateUrl: 'tabs-e2e.html',
1414
})
15-
export class MdcTabsE2e {}
15+
export class TabsE2e {}

src/material/legacy-tabs/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",
@@ -85,10 +83,7 @@ sass_binary(
8583

8684
ng_test_library(
8785
name = "unit_test_sources",
88-
srcs = glob(
89-
["**/*.spec.ts"],
90-
exclude = ["**/*.e2e.spec.ts"],
91-
),
86+
srcs = glob(["**/*.spec.ts"]),
9287
deps = [
9388
":legacy-tabs",
9489
"//src/cdk/bidi",
@@ -109,22 +104,6 @@ ng_web_test_suite(
109104
deps = [":unit_test_sources"],
110105
)
111106

112-
ng_e2e_test_library(
113-
name = "e2e_test_sources",
114-
srcs = glob(["**/*.e2e.spec.ts"]),
115-
deps = [
116-
"//src/cdk/testing/private/e2e",
117-
],
118-
)
119-
120-
e2e_test_suite(
121-
name = "e2e_tests",
122-
deps = [
123-
":e2e_test_sources",
124-
"//src/cdk/testing/private/e2e",
125-
],
126-
)
127-
128107
filegroup(
129108
name = "source-files",
130109
srcs = glob(["**/*.ts"]),

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

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

src/material/tabs/tabs.e2e.spec.ts

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

4-
describe('MDC-based tabs', () => {
4+
describe('tabs', () => {
55
describe('basic behavior', () => {
66
let tabLabels: ElementArrayFinder;
77
let tabBodies: ElementArrayFinder;
88

99
beforeEach(async () => {
10-
await browser.get('/mdc-tabs');
10+
await browser.get('/tabs');
1111
tabLabels = element.all(by.css('.mat-mdc-tab'));
1212
tabBodies = element.all(by.css('mat-tab-body'));
1313
});

0 commit comments

Comments
 (0)