Skip to content

test: use proper typings in e2e app #2051

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Dec 19, 2016
Merged

test: use proper typings in e2e app #2051

merged 3 commits into from
Dec 19, 2016

Conversation

crisbeto
Copy link
Member

@crisbeto crisbeto commented Dec 1, 2016 •
edited
Loading

  • Switches to use the typings from @types for the e2e app.
  • Adds all of the necessary imports and fixes type issues.

Relates to #2025.
Fixes #1531.

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Dec 1, 2016
@devversion
Copy link
Member

I think if we switch to @types then we should also remove the typings/ folder here.

Also this would fix #1531

@crisbeto
Copy link
Member Author

crisbeto commented Dec 1, 2016 •
edited
Loading

Good points. My editor wasn't showing the typings directory at all, for some reason.

@crisbeto
Copy link
Member Author

crisbeto commented Dec 1, 2016

There we go. It ended up being a bit more work than expected.

@jelbourn
Copy link
Member

jelbourn commented Dec 2, 2016

LGTM

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker and removed pr: needs review labels Dec 2, 2016
devversion
devversion requested changes Dec 2, 2016
View reviewed changes
package.json
"@types/run-sequence": "0.0.27",
"@types/rx": "^2.5.33",
"@types/selenium-webdriver": "^2.53.36",
"browserstacktunnel-wrapper": "^2.0.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The browserstacktunnel-wrapper shouldn't be added again. See #1991

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted. There was a merge conflict on that exact line.

@jelbourn jelbourn removed the action: merge The PR is ready for merge by the caretaker label Dec 2, 2016
@jelbourn jelbourn added the action: merge The PR is ready for merge by the caretaker label Dec 2, 2016
@crisbeto crisbeto mentioned this pull request Dec 3, 2016
Merged
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@googlebot googlebot added cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla and removed cla: yes PR author has agreed to Google's Contributor License Agreement labels Dec 15, 2016
@crisbeto
test: use proper typings in e2e app
aeeb188 
* Switches to use the typings from @types for the e2e app.
* Adds all of the necessary imports and fixes type issues.

Relates to angular#2025.
Fixes angular#1531.
@googlebot
Copy link

CLAs look good, thanks!

@googlebot googlebot added cla: yes PR author has agreed to Google's Contributor License Agreement and removed cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla labels Dec 15, 2016
@crisbeto
Copy link
Member Author

@jelbourn could we get this one in since it's getting a little hard to maintain?

@jelbourn
Copy link
Member

Yeah, sorry; doing this one requires a manual sync into google instead of our usual automatic one so we've been procrastinating it

@jelbourn jelbourn merged commit 508703a into angular:master Dec 19, 2016
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@devversion devversion devversion approved these changes

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Change e2e app to use @types
4 participants
@crisbeto @devversion @jelbourn @googlebot