Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/e2e-app/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ ng_module(
"//src/material-experimental/mdc-progress-bar",
"//src/material-experimental/mdc-radio",
"//src/material-experimental/mdc-slide-toggle",
"//src/material-experimental/mdc-table",
"//src/material-experimental/mdc-tabs",
"//src/material/button",
"//src/material/checkbox",
Expand Down
1 change: 1 addition & 0 deletions src/e2e-app/e2e-app/e2e-app-layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<a mat-list-item [routerLink]="['mdc-menu']">MDC Menu</a>
<a mat-list-item [routerLink]="['mdc-radio']">MDC Radio</a>
<a mat-list-item [routerLink]="['mdc-slide-toggle']">MDC Slide Toggle</a>
<a mat-list-item [routerLink]="['mdc-table']">MDC Table</a>
<a mat-list-item [routerLink]="['mdc-tabs']">MDC Tabs</a>
<a mat-list-item [routerLink]="['mdc-progress-bar']">MDC Progress bar</a>
</mat-nav-list>
Expand Down
2 changes: 2 additions & 0 deletions src/e2e-app/e2e-app/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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},
Expand Down
2 changes: 2 additions & 0 deletions src/e2e-app/main-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -66,6 +67,7 @@ import {MdcProgressBarE2eModule} from './mdc-progress-bar/mdc-progress-bar-e2e-m
MdcMenuE2eModule,
MdcRadioE2eModule,
MdcSlideToggleE2eModule,
MdcTableE2eModule,
MdcTabsE2eModule,
MdcProgressBarE2eModule,
MenuE2eModule,
Expand Down
18 changes: 18 additions & 0 deletions src/e2e-app/mdc-table/mdc-table-e2e-module.ts
Original file line number Diff line number Diff line change
@@ -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 {
}
30 changes: 30 additions & 0 deletions src/e2e-app/mdc-table/mdc-table-e2e.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<table mat-table [dataSource]="dataSource">

<!-- Position Column -->
<ng-container matColumnDef="position">
<th mat-header-cell *matHeaderCellDef> No. </th>
<td mat-cell *matCellDef="let element"> {{element.position}} </td>
</ng-container>

<!-- Name Column -->
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef> Name </th>
<td mat-cell *matCellDef="let element"> {{element.name}} </td>
</ng-container>

<!-- Weight Column -->
<ng-container matColumnDef="weight">
<th mat-header-cell *matHeaderCellDef> Weight </th>
<td mat-cell *matCellDef="let element"> {{element.weight}} </td>
</ng-container>

<!-- Symbol Column -->
<ng-container matColumnDef="symbol">
<th mat-header-cell *matHeaderCellDef> Symbol </th>
<td mat-cell *matCellDef="let element"> {{element.symbol}} </td>
</ng-container>

<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>

38 changes: 38 additions & 0 deletions src/e2e-app/mdc-table/mdc-table-e2e.ts
Original file line number Diff line number Diff line change
@@ -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;
}
11 changes: 11 additions & 0 deletions src/material-experimental/mdc-table/table.e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -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);
});

});