honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
George Kalpakas 2017-02-01 07:59:37 +02:00 committed by Igor Minar
parent e0e5e78835
commit 676081fe66
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
angular.io/protractor.conf.js
View File

@ -6,6 +6,7 @@ var SpecReporter = require('jasmine-spec-reporter');
exports.config = { exports.config = {
allScriptsTimeout: 11000, allScriptsTimeout: 11000,
getPageTimeout: 30000,
specs: [ specs: [
'./e2e/**/*.e2e-spec.ts' './e2e/**/*.e2e-spec.ts'
], ],
@ -14,7 +15,7 @@ exports.config = {
}, },
directConnect: true, directConnect: true,
baseUrl: 'http://localhost:4200/', baseUrl: 'http://localhost:4200/',
framework: 'jasmine', framework: 'jasmine2',
jasmineNodeOpts: { jasmineNodeOpts: {
showColors: true, showColors: true,
defaultTimeoutInterval: 30000, defaultTimeoutInterval: 30000,
@ -30,3 +31,9 @@ exports.config = {
jasmine.getEnv().addReporter(new SpecReporter()); jasmine.getEnv().addReporter(new SpecReporter());
} }
}; };
if (process.env.TRAVIS) {
exports.config.capabilities.chromeOptions = {
binary: process.env.CHROME_BIN
};
}

21
scripts/ci-lite/test_aio.sh
View File

@ -45,18 +45,15 @@ cd -
echo 'travis_fold:end:test.aio.unit' echo 'travis_fold:end:test.aio.unit'
# TODO: Chrome crashes with the following error: echo 'travis_fold:start:test.aio.e2e'
# 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) # Run e2e tests
# echo 'travis_fold:start:test.aio.e2e' cd "`dirname $0`/../../angular.io"
# yarn start &
# # Run e2e tests yarn run e2e
# cd "`dirname $0`/../../angular.io" cd -
# yarn start &
# yarn run e2e echo 'travis_fold:end:test.aio.e2e'
# cd -
#
# echo 'travis_fold:end:test.aio.e2e'
echo 'travis_fold:end:test.aio' echo 'travis_fold:end:test.aio'