Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
citizensas committed Jul 19, 2017
2 parents 1e44347 + 160b050 commit 44512b6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ matrix:
addons:
sauce_connect: true

after_success: codecov
after_success: codecov
13 changes: 8 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,18 @@ module.exports = function (config) {
config.set({
reporters: ['progress', 'saucelabs'],
sauceLabs: {
testName: 'workfront-api',
recordScreenshots: false,
recordVideo: false,
build: 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')',
connectOptions: {
port: 5757
},
public: 'public'
public: 'public',
recordScreenshots: false,
recordVideo: false,
startConnect: false,
testName: 'workfront-api',
tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER
},
captureTimeout: 120000,
captureTimeout: 0,
customLaunchers: customLaunchers,

// start these browsers
Expand Down

0 comments on commit 44512b6

Please sign in to comment.