Skip to content

Commit d9f2159

Browse files
committed
fix(e2e): remove static typings and use typings manager
* Removes static typings and uses the typings manager * Fixes duplicate identifier issue of Typescript temporary - See microsoft/TypeScript#8737 Fixes #630.
1 parent 7419a12 commit d9f2159

File tree

12 files changed

+34
-10763
lines changed

12 files changed

+34
-10763
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@
3232
/libpeerconnection.log
3333
npm-debug.log
3434
testem.log
35+
36+
# E2E project
37+
e2e/typings

e2e/components/button/button.e2e.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
describe('button', function () {
2-
describe('disabling behavior', function () {
3-
beforeEach(function() {
4-
browser.get('/button');
5-
});
6-
it('should prevent click handlers from executing when disabled', function () {
1+
describe('button', () => {
2+
3+
beforeEach(() => {
4+
browser.get('/button');
5+
});
6+
7+
describe('disabling behavior', () => {
8+
9+
it('should prevent click handlers from executing when disabled', () => {
710
element(by.id('testButton')).click();
811
expect(element(by.id('clickCounter')).getText()).toEqual('1');
912

1013
element(by.id('disableToggle')).click();
1114
element(by.id('testButton')).click();
1215
expect(element(by.id('clickCounter')).getText()).toEqual('1');
1316
});
17+
1418
});
19+
1520
});

e2e/e2e.d.ts

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

e2e/index.e2e.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
describe('hello, protractor', function () {
2-
describe('index', function () {
3-
browser.get('/');
4-
it('should have a title', function () {
5-
expect(browser.getTitle()).toBe('Material2');
6-
});
1+
describe('index', () => {
2+
3+
beforeEach(() => {
4+
browser.get('/index.html');
75
});
6+
7+
it('should have a title', () => {
8+
expect(browser.getTitle()).toBe('Material2');
9+
});
10+
811
});

e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
"target": "es5"
1515
},
1616
"files": [
17-
"e2e.d.ts"
17+
"./typings/index.d.ts"
1818
]
1919
}

e2e/typings.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"dependencies": {},
3+
"globalDependencies": {
4+
"angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
5+
"core-js": "registry:dt/core-js#0.0.0+20160602141332",
6+
"jasmine": "registry:dt/jasmine#2.2.0+20160505161446",
7+
"selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
8+
}
9+
}

0 commit comments

Comments
 (0)