Skip to content
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

ci(aio): fix and enable e2e tests on Travis #14174

Merged
merged 1 commit into from Feb 1, 2017

Conversation

gkalpak
Copy link
Member

@gkalpak gkalpak commented Jan 28, 2017

Please check if the PR fulfills these requirements

What kind of change does this PR introduce? (check one with "x")

[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[x] CI related changes
[ ] Other... Please describe:

What is the current behavior? (You can also link to an open issue here)
E2E tests where disabled, because they were failing on Travis.

What is the new behavior?
E2E tests are enabled and pass on Travis.

Does this PR introduce a breaking change? (check one with "x")

[ ] Yes
[x] No

Other information:
Follow-up to #14102.

Copy link
Contributor

@IgorMinar IgorMinar left a comment

Choose a reason for hiding this comment

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

thanks!

@@ -14,7 +15,7 @@ exports.config = {
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
framework: 'jasmine2',
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member Author

@gkalpak gkalpak Feb 2, 2017

Choose a reason for hiding this comment

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

I just found out that since angular/protractor@2bde92b, both jasmine and jasmine2 point to Jasmne 2.x.
So, this change is not necessary for the version of Protractor that the cli is using.
cc @hansl, @IgorMinar, @robwormald

@IgorMinar IgorMinar merged commit 676081f into angular:master Feb 1, 2017
@hansl
Copy link
Contributor

hansl commented Feb 1, 2017

What's to change? Jasmine2?

@gkalpak gkalpak deleted the ci-aio-fix-e2e-tests branch February 1, 2017 09:45
asnowwolf pushed a commit to asnowwolf/angular that referenced this pull request Aug 11, 2017
juleskremer pushed a commit to juleskremer/angular that referenced this pull request Aug 28, 2017
@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 10, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants