Skip to content

Commit a1e64fb

Browse files
committed
Fix BrowserStack config
1 parent 85da056 commit a1e64fb

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

karma.conf.js

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
const webpack = require('webpack')
21
const path = require('path')
2+
const webpack = require('webpack')
3+
const projectName = require('./package').name
34

45
module.exports = config => {
56
if (process.env.RELEASE)
@@ -114,31 +115,22 @@ module.exports = config => {
114115
if (process.env.USE_CLOUD) {
115116
config.browsers = Object.keys(customLaunchers)
116117
config.reporters[0] = 'dots'
118+
config.concurrency = 2
119+
117120
config.browserDisconnectTimeout = 10000
118121
config.browserDisconnectTolerance = 3
119-
config.browserNoActivityTimeout = 30000
120-
config.captureTimeout = 120000
121122

122123
if (process.env.TRAVIS) {
123-
const buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'
124-
125124
config.browserStack = {
126-
username: process.env.BROWSER_STACK_USERNAME,
127-
accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
128-
pollingTimeout: 10000,
129-
startTunnel: true,
130-
project: 'react-router',
131-
build: buildLabel,
125+
project: projectName,
126+
build: process.env.TRAVIS_BUILD_NUMBER,
132127
name: process.env.TRAVIS_JOB_NUMBER
133128
}
134129

135130
config.singleRun = true
136131
} else {
137132
config.browserStack = {
138-
username: process.env.BROWSER_STACK_USERNAME,
139-
accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
140-
pollingTimeout: 10000,
141-
startTunnel: true
133+
project: projectName
142134
}
143135
}
144136
}

0 commit comments

Comments
 (0)