Skip to content

Commit

Permalink
More debugging.
Browse files Browse the repository at this point in the history
  • Loading branch information
brianreavis committed Jan 29, 2015
1 parent 6760f9a commit beffa3f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ before_script:
- make
script:
- export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
- TRAVIS_CI=1 npm test
- export TRAVIS_CI=1
- npm test
7 changes: 4 additions & 3 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = function(config) {
var customLaunchers = {};
saucelabsBrowsers.forEach(function(browser, i) {
browser.base = 'SauceLabs';
customLaunchers['sl' + i] = browser;
customLaunchers['SL_' + i] = browser;
});

var targets = {
Expand All @@ -44,7 +44,7 @@ module.exports = function(config) {
var reporters = ['mocha'];
if (process.env.TRAVIS_CI) {
reporters = process.env.TARGET === 'saucelabs'
? ['progress', 'saucelabs']
? ['saucelabs', 'mocha']
: ['mocha', 'coverage', 'coveralls']
}

Expand All @@ -67,10 +67,11 @@ module.exports = function(config) {
'src/**/*.js': ['coverage']
},
coverageReporter: {
type: process.env.TRAVIS_CI ? 'lcov' : 'text-summary',
type: process.env.TRAVIS_CI && process.env.TARGET === 'phantomjs' ? 'lcov' : 'text-summary',
dir: 'coverage/'
},
sauceLabs: {
recordVideo: true,
startConnect: true,
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
build: process.env.TRAVIS_BUILD_NUMBER,
Expand Down

0 comments on commit beffa3f

Please sign in to comment.