Skip to content

Commit

Permalink
fix(e2e): remove static typings and use typings manager
Browse files Browse the repository at this point in the history
* Removes static typings and uses the typings manager
* Fixes duplicate identifier issue of Typescript temporary

 - See microsoft/TypeScript#8737

Fixes angular#630.
  • Loading branch information
devversion committed Jun 4, 2016
1 parent 7419a12 commit d9f2159
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 10,763 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@
/libpeerconnection.log
npm-debug.log
testem.log

# E2E project
e2e/typings
17 changes: 11 additions & 6 deletions e2e/components/button/button.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
describe('button', function () {
describe('disabling behavior', function () {
beforeEach(function() {
browser.get('/button');
});
it('should prevent click handlers from executing when disabled', function () {
describe('button', () => {

beforeEach(() => {
browser.get('/button');
});

describe('disabling behavior', () => {

it('should prevent click handlers from executing when disabled', () => {
element(by.id('testButton')).click();
expect(element(by.id('clickCounter')).getText()).toEqual('1');

element(by.id('disableToggle')).click();
element(by.id('testButton')).click();
expect(element(by.id('clickCounter')).getText()).toEqual('1');
});

});

});
5 changes: 0 additions & 5 deletions e2e/e2e.d.ts

This file was deleted.

15 changes: 9 additions & 6 deletions e2e/index.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
describe('hello, protractor', function () {
describe('index', function () {
browser.get('/');
it('should have a title', function () {
expect(browser.getTitle()).toBe('Material2');
});
describe('index', () => {

beforeEach(() => {
browser.get('/index.html');
});

it('should have a title', () => {
expect(browser.getTitle()).toBe('Material2');
});

});
2 changes: 1 addition & 1 deletion e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"target": "es5"
},
"files": [
"e2e.d.ts"
"./typings/index.d.ts"
]
}
9 changes: 9 additions & 0 deletions e2e/typings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"dependencies": {},
"globalDependencies": {
"angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
"core-js": "registry:dt/core-js#0.0.0+20160602141332",
"jasmine": "registry:dt/jasmine#2.2.0+20160505161446",
"selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654"
}
}
Loading

0 comments on commit d9f2159

Please sign in to comment.