Skip to content

Commit af8df2f

Browse files
committed
Temporary revert all changes ...
1 parent 0b64e70 commit af8df2f

File tree

7 files changed

+16
-102
lines changed

7 files changed

+16
-102
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@
5151
"@types/node": "^6.0.34",
5252
"@types/run-sequence": "0.0.27",
5353
"@types/rx": "^2.5.33",
54-
"axe-core": "^2.0.7",
55-
"axe-webdriverjs": "^0.4.0",
5654
"conventional-changelog": "^1.1.0",
5755
"express": "^4.14.0",
5856
"firebase-tools": "^2.2.1",
@@ -81,6 +79,7 @@
8179
"minimist": "^1.2.0",
8280
"node-sass": "^3.4.2",
8381
"protractor": "^4.0.8",
82+
"protractor-accessibility-plugin": "0.1.1",
8483
"resolve-bin": "^0.4.0",
8584
"rollup": "^0.34.13",
8685
"run-sequence": "^1.2.2",

src/e2e-app/e2e-app/e2e-app.html

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
<md-nav-list>
2-
<a md-list-item [routerLink]="['button']">Button</a>
3-
<a md-list-item [routerLink]="['checkbox']">Checkbox</a>
4-
<a md-list-item [routerLink]="['dialog']">Dialog</a>
5-
<a md-list-item [routerLink]="['grid-list']">Grid list</a>
6-
<a md-list-item [routerLink]="['icon']">Icon</a>
7-
<a md-list-item [routerLink]="['list']">List</a>
8-
<a md-list-item [routerLink]="['menu']">Menu</a>
9-
<a md-list-item [routerLink]="['progress-bar']">Progress bar</a>
10-
<a md-list-item [routerLink]="['progress-circle']">Progress circle</a>
11-
<a md-list-item [routerLink]="['radio']">Radios</a>
12-
<a md-list-item [routerLink]="['tabs']">Tabs</a>
13-
</md-nav-list>
1+
<a md-list-item [routerLink]="['button']">Button</a>
2+
<a md-list-item [routerLink]="['checkbox']">Checkbox</a>
3+
<a md-list-item [routerLink]="['dialog']">Dialog</a>
4+
<a md-list-item [routerLink]="['grid-list']">Grid list</a>
5+
<a md-list-item [routerLink]="['icon']">Icon</a>
6+
<a md-list-item [routerLink]="['list']">List</a>
7+
<a md-list-item [routerLink]="['menu']">Menu</a>
8+
<a md-list-item [routerLink]="['progress-bar']">Progress bar</a>
9+
<a md-list-item [routerLink]="['progress-circle']">Progress circle</a>
10+
<a md-list-item [routerLink]="['radio']">Radios</a>
11+
<a md-list-item [routerLink]="['tabs']">Tabs</a>
1412

15-
<main>
16-
<router-outlet role="main"></router-outlet>
17-
</main>
13+
<router-outlet></router-outlet>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<section>
22
<md-radio-group [disabled]="isGroupDisabled"
33
[(value)]="groupValue"
4-
id="test-group" aria-label="Select a Pokemon">
5-
4+
id="test-group">
65
<md-radio-button value="fire" id="fire">Charmander</md-radio-button>
76
<md-radio-button value="water" id="water">Squirtle</md-radio-button>
87
<md-radio-button value="leaf" id="leaf">Bulbasaur</md-radio-button>
9-
108
</md-radio-group>
119
<button (click)="isGroupDisabled=!isGroupDisabled" id="toggle-disable">Disable/enable group</button>
1210
</section>

src/lib/grid-list/grid-list.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ const MD_FIT_MODE = 'fit';
3434
selector: 'md-grid-list, mat-grid-list',
3535
templateUrl: 'grid-list.html',
3636
styleUrls: ['grid-list.css'],
37-
host: {
38-
'role': 'list'
39-
},
4037
encapsulation: ViewEncapsulation.None,
4138
})
4239
export class MdGridList implements OnInit, AfterContentChecked {

test/protractor.conf.js

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,15 @@ require('ts-node').register({
99

1010
const E2E_BASE_URL = process.env['E2E_BASE_URL'] || 'http://localhost:4200';
1111
const config = {
12+
// TODO(jelbourn): add back plugin for a11y assersions once it supports specifying AXS options.
1213
useAllAngular2AppRoots: true,
1314
specs: [ path.join(__dirname, '../e2e/**/*.e2e.ts') ],
1415
baseUrl: E2E_BASE_URL,
1516
allScriptsTimeout: 120000,
1617
getPageTimeout: 120000,
1718
jasmineNodeOpts: {
1819
defaultTimeoutInterval: 120000,
19-
},
20-
21-
plugins: [
22-
{
23-
// Runs the axe-core accessibility checks each time the e2e page changes and
24-
// Angular is ready.
25-
path: '../tools/axe-protractor/axe-protractor.js',
26-
27-
rules: [
28-
// Exclude md-menu elements because those are empty if not active.
29-
{ id: 'aria-required-children', selector: '*:not(md-menu)' },
30-
]
31-
}
32-
]
20+
}
3321
};
3422

3523
if (process.env['TRAVIS']) {

tools/axe-protractor/axe-protractor.js

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

tools/axe-protractor/build-message.js

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

0 commit comments

Comments
 (0)