Skip to content

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

Merged
IgorMinar merged 1 commit into
angular:masterfrom
gkalpak:ci-aio-fix-e2e-tests
Feb 1, 2017
Merged

ci(aio): fix and enable e2e tests on Travis#14174
IgorMinar merged 1 commit into
angular:masterfrom
gkalpak:ci-aio-fix-e2e-tests

Conversation

@gkalpak

@gkalpak gkalpak commented Jan 28, 2017

Copy link
Copy Markdown
Member

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.

IgorMinar
IgorMinar approved these changes Feb 1, 2017
View reviewed changes

@IgorMinar IgorMinar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks!

Comment thread angular.io/protractor.conf.js
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
framework: 'jasmine2',

@IgorMinar IgorMinar Feb 1, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@robwormald @hansl - was this scaffolded by the CLI?

looks like it was - https://github.com/angular/angular-cli/blob/916e9bd61773fce94c5867675842b0215e14e267/packages/angular-cli/blueprints/ng2/files/protractor.conf.js#L17

@hansl can we change this?

@gkalpak gkalpak Feb 2, 2017 •
edited
Loading

Copy link
Copy Markdown
Member Author

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

hansl commented Feb 1, 2017

Copy link
Copy Markdown
Contributor

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
@gkalpak
ci(aio): fix and enable e2e tests on Travis (angular#14174)
d7a244d
juleskremer pushed a commit to juleskremer/angular that referenced this pull request Aug 28, 2017
@gkalpak @juleskremer
ci(aio): fix and enable e2e tests on Travis (angular#14174)
df949fa
@angular-automatic-lock-bot

angular-automatic-lock-bot Bot commented Sep 10, 2019

Copy link
Copy Markdown

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.

Reviewers

1 more reviewer
@IgorMinar IgorMinar IgorMinar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla: yes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@gkalpak @hansl @IgorMinar @googlebot