Skip to content

Commit 850ac67

Browse files
jelbournjelbourn
authored
chore: update ng cli, make e2e run sucessfully
1 parent 7a1bb19 commit 850ac67

File tree

7 files changed

+52
-38
lines changed

7 files changed

+52
-38
lines changed

‎e2e/components/button/button.e2e.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ describe('button', function () {
44
browser.get('/button');
55
});
66
it('should prevent click handlers from executing when disabled', function () {
7-
element(by.id('testButton')).click();
8-
expect(element(by.id('clickCounter')).getText()).toEqual('1');
7+
element(by.id('test-button')).click();
8+
expect(element(by.id('click-counter')).getText()).toEqual('1');
99

10-
element(by.id('disableToggle')).click();
11-
element(by.id('testButton')).click();
12-
expect(element(by.id('clickCounter')).getText()).toEqual('1');
10+
element(by.id('disable-toggle')).click();
11+
element(by.id('test-button')).click();
12+
expect(element(by.id('click-counter')).getText()).toEqual('1');
1313
});
1414
});
1515
});

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"devDependencies": {
4545
"add-stream": "^1.0.0",
46-
"angular-cli": "^1.0.0-beta.5",
46+
"angular-cli": "^1.0.0-beta.6",
4747
"broccoli-autoprefixer": "^4.1.0",
4848
"broccoli-funnel": "^1.0.1",
4949
"broccoli-merge-trees": "^1.1.1",

‎src/demo-app/button/button-demo.html‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</section>
1212

1313
<section>
14-
<a href="http://www.google.com" md-button color="primary">link</a>
15-
<a href="http://www.google.com" md-raised-button>link</a>
14+
<a href="http://www.google.com" md-button color="primary">SEARCH</a>
15+
<a href="http://www.google.com" md-raised-button>SEARCH</a>
1616
<a href="http://www.google.com" md-fab>
1717
<md-icon class="md-24">check</md-icon>
1818
</a>
@@ -61,13 +61,15 @@
6161

6262
<section>
6363
<div>
64-
<p>isDisabled: {{isDisabled}}, clickCounter: <span id="clickCounter">{{clickCounter}}</span></p>
65-
<button md-raised-button (click)="isDisabled=!isDisabled" id="disableToggle">Disable buttons</button>
66-
<button md-raised-button (click)="button1.focus()" id="disableToggle">Focus 1</button>
67-
<button md-raised-button (click)="button2.focus()" id="disableToggle">Focus 2</button>
68-
<button md-raised-button (click)="button3.focus()" id="disableToggle">Focus 3</button>
64+
<p>isDisabled: {{isDisabled}}, clickCounter: <span>{{clickCounter}}</span></p>
65+
<button md-raised-button (click)="isDisabled=!isDisabled">
66+
Disable buttons
67+
</button>
68+
<button md-raised-button (click)="button1.focus()">Focus 1</button>
69+
<button md-raised-button (click)="button2.focus()">Focus 2</button>
70+
<button md-raised-button (click)="button3.focus()">Focus 3</button>
6971
</div>
70-
<button md-button #button1 [disabled]="isDisabled" (click)="clickCounter=clickCounter+1" id="testButton">off</button>
72+
<button md-button #button1 [disabled]="isDisabled" (click)="clickCounter=clickCounter+1">off</button>
7173
<button md-button color="primary" [disabled]="isDisabled">off</button>
7274
<a href="http://www.google.com" #button2 md-button color="accent" [disabled]="isDisabled">off</a>
7375
<button md-raised-button #button3 color="primary" [disabled]="isDisabled">off</button>
@@ -80,15 +82,11 @@
8082
</button>
8183
</section>
8284
<section>
83-
Link
84-
<a href="http://www.google.com" md-button color="primary">link</a>
85-
Button
86-
<button md-button>flat</button>
85+
<a href="http://www.google.com" md-button color="primary">SEARCH</a>
86+
<button md-button>DANCE</button>
8787
</section>
8888
<section>
89-
Link
90-
<a href="http://www.google.com" md-raised-button color="primary">link</a>
91-
Button
92-
<button md-raised-button>button</button>
89+
<a href="http://www.google.com" md-raised-button color="primary">SEARCH</a>
90+
<button md-raised-button>DANCE</button>
9391
</section>
9492
</div>

‎src/demo-app/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!doctype html>
22
{{!-- This file is an handlebar file that gets filled at build time. --}}
3-
<html>
3+
<html lang="en">
44
<head>
55
<meta charset="utf-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">

‎src/e2e-app/button/button-e2e.html‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,31 @@
11
<section>
2+
23
<div>
3-
<p>isDisabled: {{isDisabled}}, clickCounter: <span id="clickCounter">{{clickCounter}}</span></p>
4-
<button md-raised-button (click)="isDisabled=!isDisabled" id="disableToggle">Disable buttons</button>
4+
<p>
5+
isDisabled: {{isDisabled}}, clickCounter:
6+
<span id="click-counter">{{clickCounter}}</span>
7+
</p>
8+
<button md-raised-button (click)="isDisabled=!isDisabled" id="disable-toggle">
9+
Disable buttons
10+
</button>
511
</div>
6-
<button md-button [disabled]="isDisabled" (click)="clickCounter=clickCounter+1" id="testButton">off</button>
7-
<button md-button color="primary" [disabled]="isDisabled">off</button>
8-
<a href="http://www.google.com" md-button color="accent" [disabled]="isDisabled">off</a>
9-
<button md-raised-button color="primary" [disabled]="isDisabled">off</button>
12+
13+
<button md-button [disabled]="isDisabled" (click)="clickCounter=clickCounter+1" id="test-button">
14+
off
15+
</button>
16+
17+
<button md-button color="primary" [disabled]="isDisabled">
18+
off
19+
</button>
20+
21+
<a href="http://www.google.com" md-button color="accent" [disabled]="isDisabled">
22+
off
23+
</a>
24+
25+
<button md-raised-button color="primary" [disabled]="isDisabled">
26+
off
27+
</button>
28+
1029
<button md-mini-fab [disabled]="isDisabled">
1130
<md-icon class="md-24">check</md-icon>
1231
</button>

‎src/e2e-app/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!doctype html>
22
{{!-- This file is an handlebar file that gets filled at build time. --}}
3-
<html>
3+
<html lang="en">
44
<head>
55
<meta charset="utf-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">

‎test/protractor.conf.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,16 @@ 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,
13-
plugins: [{
14-
chromeA11YDevTools: {
15-
treatWarningsAsFailures: true
16-
},
17-
package: 'protractor-accessibility-plugin'
18-
}],
1914
specs: [ path.join(__dirname, '../e2e/**/*.e2e.ts') ],
20-
baseUrl: E2E_BASE_URL
15+
baseUrl: E2E_BASE_URL,
16+
allScriptsTimeout: 22000,
17+
getPageTimeout: 20000,
2118
};
2219

2320

24-
if (process.env['TRAVIS'] !== undefined) {
21+
if (process.env['TRAVIS']) {
2522
const key = require('../scripts/sauce/sauce_config');
2623
config.sauceUser = process.env['SAUCE_USERNAME'];
2724
config.sauceKey = key;

0 commit comments

Comments
 (0)