Skip to content

Commit

Permalink
fix: coverage issue with saucelabs
Browse files Browse the repository at this point in the history
* Saucelabs seems to have issues with Edge and the `karma-coverage` plugin.

* Running on Browserstack seems to be work without any flakiness and also makes the build faster (runs less browsers than on saucelabs)
  • Loading branch information
devversion committed Mar 9, 2017
1 parent ce0e933 commit 7cbc9d1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions scripts/ci/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ else
$(npm bin)/gulp ci:test
fi

# Don't upload coverage for both test modes (browserstack and saucelabs) and inside of PRs.
if [[ "$MODE" == "saucelabs_required" ]] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
# Upload coverage results if those are present.
if [ -f dist/coverage/coverage-summary.json ]; then
$(npm bin)/gulp ci:coverage
fi

Expand Down
4 changes: 3 additions & 1 deletion test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ module.exports = (config) => {
if (process.env['TRAVIS']) {
let buildId = `TRAVIS #${process.env.TRAVIS_BUILD_NUMBER} (${process.env.TRAVIS_BUILD_ID})`;

if (process.env['TRAVIS_PULL_REQUEST'] === 'false') {
if (process.env['TRAVIS_PULL_REQUEST'] === 'false' &&
process.env['MODE'] === "browserstack_required") {

config.preprocessors['dist/@angular/material/**/!(*+(.|-)spec).js'] = ['coverage'];
config.reporters.push('coverage');
}
Expand Down
2 changes: 1 addition & 1 deletion tools/gulp/tasks/coverage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ task('coverage:upload', () => {
throw new Error('No coverage file has been found!');
}

if (!isTravisPushBuild()) {
if (isTravisPushBuild()) {
throw new Error('Coverage results will be only uploaded inside of Travis Push builds.');
}

Expand Down

0 comments on commit 7cbc9d1

Please sign in to comment.