forked from angular/components
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 angular#630.
- Loading branch information
1 parent
7419a12
commit d9f2159
Showing
12 changed files
with
34 additions
and
10,763 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,3 +32,6 @@ | |
/libpeerconnection.log | ||
npm-debug.log | ||
testem.log | ||
|
||
# E2E project | ||
e2e/typings |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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'); | ||
}); | ||
|
||
}); | ||
|
||
}); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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'); | ||
}); | ||
|
||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,6 @@ | |
"target": "es5" | ||
}, | ||
"files": [ | ||
"e2e.d.ts" | ||
"./typings/index.d.ts" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
} | ||
} |
Oops, something went wrong.