Skip to content

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

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

Merged
merged 1 commit into from
Feb 1, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion angular.io/protractor.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var SpecReporter = require('jasmine-spec-reporter');

exports.config = {
allScriptsTimeout: 11000,
getPageTimeout: 30000,
specs: [
'./e2e/**/*.e2e-spec.ts'
],
Expand All @@ -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.

@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?

Copy link
Member Author

@gkalpak gkalpak Feb 2, 2017 •
edited
Loading

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

jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
Expand All @@ -30,3 +31,9 @@ exports.config = {
jasmine.getEnv().addReporter(new SpecReporter());
}
};

if (process.env.TRAVIS) {
exports.config.capabilities.chromeOptions = {
binary: process.env.CHROME_BIN
};
}
21 changes: 9 additions & 12 deletions scripts/ci-lite/test_aio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,15 @@ cd -
echo 'travis_fold:end:test.aio.unit'


# TODO: Chrome crashes with the following error:
# E/launcher - unknown error: Chrome failed to start: crashed
# (Driver info: chromedriver=2.26.436382 (70eb799287ce4c2208441fc057053a5b07ceabac),platform=Linux 4.8.12-040812-generic x86_64)
# echo 'travis_fold:start:test.aio.e2e'
#
# # Run e2e tests
# cd "`dirname $0`/../../angular.io"
# yarn start &
# yarn run e2e
# cd -
#
# echo 'travis_fold:end:test.aio.e2e'
echo 'travis_fold:start:test.aio.e2e'

# Run e2e tests
cd "`dirname $0`/../../angular.io"
yarn start &
yarn run e2e
cd -

echo 'travis_fold:end:test.aio.e2e'


echo 'travis_fold:end:test.aio'