From 527d31baab7dbc38d9dc13252f9a855a1d0824b4 Mon Sep 17 00:00:00 2001 From: andrewseguin Date: Fri, 10 Jul 2020 09:04:08 -0700 Subject: [PATCH 1/2] tests(material-experimental/mdc-table): add e2e tests --- .github/CODEOWNERS | 1 + src/e2e-app/BUILD.bazel | 1 + src/e2e-app/e2e-app/e2e-app-layout.html | 1 + src/e2e-app/e2e-app/routes.ts | 2 + src/e2e-app/main-module.ts | 2 + src/e2e-app/mdc-table/mdc-table-e2e-module.ts | 18 +++++++++ src/e2e-app/mdc-table/mdc-table-e2e.html | 30 +++++++++++++++ src/e2e-app/mdc-table/mdc-table-e2e.ts | 38 +++++++++++++++++++ .../mdc-table/table.e2e.spec.ts | 11 ++++++ 9 files changed, 104 insertions(+) create mode 100644 src/e2e-app/mdc-table/mdc-table-e2e-module.ts create mode 100644 src/e2e-app/mdc-table/mdc-table-e2e.html create mode 100644 src/e2e-app/mdc-table/mdc-table-e2e.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a77e8a93818f..3f486679a2ce 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -236,6 +236,7 @@ /src/e2e-app/mdc-radio/** @mmalerba /src/e2e-app/mdc-slide-toggle/** @crisbeto /src/e2e-app/mdc-tabs/** @crisbeto +/src/e2e-app/mdc-table/** @andrewseguin /src/e2e-app/menu/** @crisbeto /src/e2e-app/progress-bar/** @jelbourn @crisbeto /src/e2e-app/progress-spinner/** @jelbourn @crisbeto diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index 391c5d00f217..a998a0f199d6 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -43,6 +43,7 @@ ng_module( "//src/material-experimental/mdc-radio", "//src/material-experimental/mdc-slide-toggle", "//src/material-experimental/mdc-tabs", + "//src/material-experimental/mdc-table", "//src/material/button", "//src/material/checkbox", "//src/material/core", diff --git a/src/e2e-app/e2e-app/e2e-app-layout.html b/src/e2e-app/e2e-app/e2e-app-layout.html index 36364d3abfe6..36147be3f023 100644 --- a/src/e2e-app/e2e-app/e2e-app-layout.html +++ b/src/e2e-app/e2e-app/e2e-app-layout.html @@ -31,6 +31,7 @@ MDC Menu MDC Radio MDC Slide Toggle + MDC Table MDC Tabs MDC Progress bar diff --git a/src/e2e-app/e2e-app/routes.ts b/src/e2e-app/e2e-app/routes.ts index 2ecd99e5441e..702bc1e06884 100644 --- a/src/e2e-app/e2e-app/routes.ts +++ b/src/e2e-app/e2e-app/routes.ts @@ -19,6 +19,7 @@ import {MdcInputE2E} from '../mdc-input/mdc-input-e2e'; import {MdcMenuE2e} from '../mdc-menu/mdc-menu-e2e'; import {MdcRadioE2e} from '../mdc-radio/mdc-radio-e2e'; import {MdcSlideToggleE2e} from '../mdc-slide-toggle/mdc-slide-toggle-e2e'; +import {MdcTableE2e} from '../mdc-table/mdc-table-e2e'; import {MdcTabsE2e} from '../mdc-tabs/mdc-tabs-e2e'; import {MdcProgressBarE2E} from '../mdc-progress-bar/mdc-progress-bar-e2e'; import {MenuE2E} from '../menu/menu-e2e'; @@ -56,6 +57,7 @@ export const E2E_APP_ROUTES: Routes = [ {path: 'mdc-radio', component: MdcRadioE2e}, {path: 'mdc-slide-toggle', component: MdcSlideToggleE2e}, {path: 'mdc-tabs', component: MdcTabsE2e}, + {path: 'mdc-table', component: MdcTableE2e}, {path: 'mdc-progress-bar', component: MdcProgressBarE2E}, {path: 'menu', component: MenuE2E}, {path: 'progress-bar', component: ProgressBarE2E}, diff --git a/src/e2e-app/main-module.ts b/src/e2e-app/main-module.ts index aea2883c9979..2e071bdae04e 100644 --- a/src/e2e-app/main-module.ts +++ b/src/e2e-app/main-module.ts @@ -26,6 +26,7 @@ import {MdcChipsE2eModule} from './mdc-chips/mdc-chips-e2e-module'; import {MdcMenuE2eModule} from './mdc-menu/mdc-menu-e2e-module'; import {MdcRadioE2eModule} from './mdc-radio/mdc-radio-e2e-module'; import {MdcSlideToggleE2eModule} from './mdc-slide-toggle/mdc-slide-toggle-e2e-module'; +import {MdcTableE2eModule} from './mdc-table/mdc-table-e2e-module'; import {MdcTabsE2eModule} from './mdc-tabs/mdc-tabs-e2e-module'; import {MenuE2eModule} from './menu/menu-e2e-module'; import {ProgressBarE2eModule} from './progress-bar/progress-bar-e2e-module'; @@ -66,6 +67,7 @@ import {MdcProgressBarE2eModule} from './mdc-progress-bar/mdc-progress-bar-e2e-m MdcMenuE2eModule, MdcRadioE2eModule, MdcSlideToggleE2eModule, + MdcTableE2eModule, MdcTabsE2eModule, MdcProgressBarE2eModule, MenuE2eModule, diff --git a/src/e2e-app/mdc-table/mdc-table-e2e-module.ts b/src/e2e-app/mdc-table/mdc-table-e2e-module.ts new file mode 100644 index 000000000000..436c99921651 --- /dev/null +++ b/src/e2e-app/mdc-table/mdc-table-e2e-module.ts @@ -0,0 +1,18 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import {NgModule} from '@angular/core'; +import {MatTableModule} from '@angular/material-experimental/mdc-table'; +import {MdcTableE2e} from './mdc-table-e2e'; + +@NgModule({ + imports: [MatTableModule], + declarations: [MdcTableE2e], +}) +export class MdcTableE2eModule { +} diff --git a/src/e2e-app/mdc-table/mdc-table-e2e.html b/src/e2e-app/mdc-table/mdc-table-e2e.html new file mode 100644 index 000000000000..c84fc7642cd4 --- /dev/null +++ b/src/e2e-app/mdc-table/mdc-table-e2e.html @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No. {{element.position}} Name {{element.name}} Weight {{element.weight}} Symbol {{element.symbol}}
+ diff --git a/src/e2e-app/mdc-table/mdc-table-e2e.ts b/src/e2e-app/mdc-table/mdc-table-e2e.ts new file mode 100644 index 000000000000..8dbdb9530806 --- /dev/null +++ b/src/e2e-app/mdc-table/mdc-table-e2e.ts @@ -0,0 +1,38 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import {Component} from '@angular/core'; + +export interface PeriodicElement { + name: string; + position: number; + weight: number; + symbol: string; +} + +const ELEMENT_DATA: PeriodicElement[] = [ + {position: 1, name: 'Hydrogen', weight: 1.0079, symbol: 'H'}, + {position: 2, name: 'Helium', weight: 4.0026, symbol: 'He'}, + {position: 3, name: 'Lithium', weight: 6.941, symbol: 'Li'}, + {position: 4, name: 'Beryllium', weight: 9.0122, symbol: 'Be'}, + {position: 5, name: 'Boron', weight: 10.811, symbol: 'B'}, + {position: 6, name: 'Carbon', weight: 12.0107, symbol: 'C'}, + {position: 7, name: 'Nitrogen', weight: 14.0067, symbol: 'N'}, + {position: 8, name: 'Oxygen', weight: 15.9994, symbol: 'O'}, + {position: 9, name: 'Fluorine', weight: 18.9984, symbol: 'F'}, + {position: 10, name: 'Neon', weight: 20.1797, symbol: 'Ne'}, +]; + +@Component({ + selector: 'mdc-table-e2e', + templateUrl: 'mdc-table-e2e.html', +}) +export class MdcTableE2e { + displayedColumns: string[] = ['position', 'name', 'weight', 'symbol']; + dataSource = ELEMENT_DATA; +} diff --git a/src/material-experimental/mdc-table/table.e2e.spec.ts b/src/material-experimental/mdc-table/table.e2e.spec.ts index e69de29bb2d1..930e63a118d8 100644 --- a/src/material-experimental/mdc-table/table.e2e.spec.ts +++ b/src/material-experimental/mdc-table/table.e2e.spec.ts @@ -0,0 +1,11 @@ +import {browser, by, element} from 'protractor'; + +describe('mat-table', () => { + + beforeEach(async () => await browser.get('/mdc-table')); + + it('should show a table', async () => { + expect(await element(by.tagName('table')).isPresent()).toBe(true); + }); + +}); From f411a2de71537fd70469a3236146c2be25ac4348 Mon Sep 17 00:00:00 2001 From: andrewseguin Date: Fri, 10 Jul 2020 09:06:07 -0700 Subject: [PATCH 2/2] lint --- src/e2e-app/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index a998a0f199d6..d7cfce0aa4ea 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -42,8 +42,8 @@ ng_module( "//src/material-experimental/mdc-progress-bar", "//src/material-experimental/mdc-radio", "//src/material-experimental/mdc-slide-toggle", - "//src/material-experimental/mdc-tabs", "//src/material-experimental/mdc-table", + "//src/material-experimental/mdc-tabs", "//src/material/button", "//src/material/checkbox", "//src/material/core",