Update Karma config

microbouji · Jul 27, 2016 · b7152a4 · b7152a4
1 parent 56274b8
commit b7152a4
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,5 +1,5 @@
-const path = require('path')
 const webpack = require('webpack')
+const projectName = require('./package').name
 
 module.exports = (config) => {
   const customLaunchers = {
@@ -91,31 +91,22 @@ module.exports = (config) => {
   if (process.env.USE_CLOUD) {
     config.browsers = Object.keys(customLaunchers)
     config.reporters = [ 'dots' ]
+    config.concurrency = 2
+
     config.browserDisconnectTimeout = 10000
     config.browserDisconnectTolerance = 3
-    config.browserNoActivityTimeout = 30000
-    config.captureTimeout = 120000
 
     if (process.env.TRAVIS) {
-      const buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'
-
       config.browserStack = {
-        username: process.env.BROWSER_STACK_USERNAME,
-        accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
-        pollingTimeout: 10000,
-        startTunnel: true,
-        project: 'history',
-        build: buildLabel,
+        project: projectName,
+        build: process.env.TRAVIS_BUILD_NUMBER,
         name: process.env.TRAVIS_JOB_NUMBER
       }
 
       config.singleRun = true
     } else {
       config.browserStack = {
-        username: process.env.BROWSER_STACK_USERNAME,
-        accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
-        pollingTimeout: 10000,
-        startTunnel: true
+        project: projectName
       }
     }
   }