diff --git a/angular.io/protractor.conf.js b/angular.io/protractor.conf.js index ffded70180..ce058f34f8 100644 --- a/angular.io/protractor.conf.js +++ b/angular.io/protractor.conf.js @@ -6,6 +6,7 @@ var SpecReporter = require('jasmine-spec-reporter'); exports.config = { allScriptsTimeout: 11000, + getPageTimeout: 30000, specs: [ './e2e/**/*.e2e-spec.ts' ], @@ -14,7 +15,7 @@ exports.config = { }, directConnect: true, baseUrl: 'http://localhost:4200/', - framework: 'jasmine', + framework: 'jasmine2', jasmineNodeOpts: { showColors: true, defaultTimeoutInterval: 30000, @@ -30,3 +31,9 @@ exports.config = { jasmine.getEnv().addReporter(new SpecReporter()); } }; + +if (process.env.TRAVIS) { + exports.config.capabilities.chromeOptions = { + binary: process.env.CHROME_BIN + }; +} diff --git a/scripts/ci-lite/test_aio.sh b/scripts/ci-lite/test_aio.sh index e725f18d76..75efec05fa 100755 --- a/scripts/ci-lite/test_aio.sh +++ b/scripts/ci-lite/test_aio.sh @@ -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'