Merge pull request #147 from Varun-garg/fixCompatibilityWithOldEnvNames

Fix compatibility with previous env names
karma-runner · Apr 3, 2019 · 0771236 · 0771236
2 parents ab0fd5f + fdde6e2
commit 0771236
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -11,7 +11,7 @@ var createBrowserStackTunnel = function (logger, config, emitter) {
  return Q()
  }
 
- const bsAccesskey = process.env.BROWSERSTACK_ACCESS_KEY || bsConfig.accessKey
+ const bsAccesskey = process.env.BROWSERSTACK_ACCESS_KEY || process.env.BROWSER_STACK_ACCESS_KEY || bsConfig.accessKey
  const bsLocal = new browserstack.Local()
  const bsLocalArgs = { key: bsAccesskey }
  const deferred = Q.defer()
@@ -39,8 +39,8 @@ var createBrowserStackClient = function (/* config.browserStack */config, /* Bro
  config = config || {}
 
  var options = {
- username: env.BROWSERSTACK_USERNAME || config.username,
- password: env.BROWSERSTACK_ACCESS_KEY || config.accessKey
+ username: env.BROWSERSTACK_USERNAME || env.BROWSER_STACK_USERNAME || config.username,
+ password: env.BROWSERSTACK_ACCESS_KEY || env.BROWSER_STACK_ACCESS_KEY || config.accessKey
  }
 
  if (config.proxyHost && config.proxyPort) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "karma-browserstack-launcher",
- "version": "1.5.0",
+ "version": "1.5.1",
  "description": "A Karma plugin. Launch any browser on BrowserStack!",
  "main": "index.js",
  "repository": {