Skip to content

fix(e2e): remove static typings and use typings manager #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.

13 changes: 8 additions & 5 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 () {
describe('index', () => {

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

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