Update browserstack integration (#718)

Author: MarcusLongmuir

.travis.yml

@@ -13,6 +13,9 @@ env:
     - GLOBAL_TESTSERVER=true
     - SEPARATE_TEST_SUITES=true
     - PROTOTOOL_VER=1.7.0
+    # BROWSERSTACK environment variables
+    - secure: sDMaJtQCte+9xTWKORX2IQYV7DPkuNBUK7Debk6q8jb6vvc1AiyNqN9SNaZm1V2VgnagoShYAzRyL2QhNeST/UFuO+2JsxjPlu2Elku4cJTYmDhuERlS3SS8llRoqRGSxK003ZRPyx5GGD0fS7eESaNCmS+4S+LA2KQrOZ9dGbn+wKjNueMDkCtRudyEqQzHRc8vBNxF3V3nkXckAuATjvnSim7odJEED+DW5aXMYZIrYTvM2ZmqmLlerP/wJJCxws0kKSssJhWEfcxEMTAmdC180EC0cBZ2ap4V3YnFYeEOnZ5lMR5mLHxyPQvjbYqGG693na6nBsim1abJqXzCF+H+7MBeXzM+hejkZd/1BNjS1+C5orkFx/Af7/9zTTKV9o3rAaYPm3zCikmhm5kRSkbjRGirTNN4Ogki66w1HCCxVEtp77Uiylj3KMQk1iqDeL/m0jLjYnWvzHPZBc1h6I856AgO9WpOnfVBsIAK9dqbwqH+cy+zzxL+IXvOLZlhRqyd5MeasMoLzZQC4vA8Fbp6o6G0vFkuxCXR/uF34vDaHYI98Qq2NmfWP3jD/+ytgswfB9K75v5hNZ9OGEVBQJI4UYDzQmm6fkTXRFGjR44XbClmtTI2E4Se32JvkLIMQVJ1NLWo5fMsz4S6yJjqtMdkblNhWjHhCqhxI+exRXQ=
+    - secure: D6hsSagcqeGXevwP1bWBQCyFov4OkMLFdyXpzosmndMCg9O+K5+N7ojkBIXbb7FIh++phuCWCX5L5Ak7MU+FkzUKNrSnHX7E40UNcClrUBSWzmz2SkYqEsGBgSfqm5cNPnVy97lg1Qp9NfcahjQ67YW0qzVipWb2NiXhpWDICCNvD3EL6p5O1H+h7FEyW8xr83b6x3u1gzNL0dDM+zZ13nlYtVdIZKX1b+zJJXoeVwLK9aTi2VZYJLQa2H8pyEKVYnR4xMu7005MOxohvMYQEntAkqiKcwR653XCyPQ9QCMv5rpEzMK3Fh1uzdqJ4ZsDuJHlyDuLTIoxH2WRAVLvdOck2muwgyV5O2+Rp5N1BKTw06Bgo4RaWQ8AR4jrlXJ7lQoFKsauXYTLL/qG1RkcC5Fz0sogg1Xz2mnp3TjyDnPgx97n96+1VqIhQfKSdn0vc93AEQj3DX6vjdE7IOKav73GYYoacsIccfUGmCYQfd4Uoo6FMt79Gmo+Tq/dfI+d1Gvv9Q7NZl33gS5nmunUxPksERRfAwPS9O95hhEYrpOcdVShpvKoP2ZZ/bbE5oW4ZWV28i+kH9dRMVFqckSSmC8N0Px+J7lUaxifwQceZV+v3LcDINjgQ+MIt2dEjUwR2Qbc0nJ74zDi51u3OFGaNUVHjvDqKj/Y9kdSnMJOP8Q=
   matrix:
     - BROWSER=nodejs
     - BROWSER=firefox53_osx
@@ -40,8 +43,6 @@ branches:
   - master
 before_install:
   - sudo apt-get install unzip
-  - true && `base64 --decode <<< ZXhwb3J0IEJST1dTRVJfU1RBQ0tfVVNFUk5BTUU9aW1wcm9iYWJsZWVuZ2JvdDEK`
-  - true && `base64 --decode <<< ZXhwb3J0IEJST1dTRVJfU1RBQ0tfQUNDRVNTX0tFWT1SRG1Cc2pwQUJ4RlljcEVkeVp5bwo=`
 install:
   - . ./install-prototool.sh
   - go get -u golang.org/x/tools/cmd/goimports
@@ -68,4 +69,4 @@ jobs:
       script: ./lint-all.sh
 
     - stage: unit-test
-      script: ./test-all.sh
+      script: ./test-all.sh

integration_test/custom-karma-driver.ts

@@ -2,8 +2,8 @@ const wd = require('wd');
 const browserstack = require('browserstack-local');
 import * as _ from "lodash";
 import {testHost, corsHost} from "./hosts-config";
-const username = process.env.BROWSER_STACK_USERNAME;
-const accessKey = process.env.BROWSER_STACK_ACCESS_KEY;
+const username = process.env.BROWSERSTACK_USERNAME;
+const accessKey = process.env.BROWSERSTACK_ACCESS_KEY;
 const seleniumHost = 'hub-cloud.browserstack.com';
 const seleniumPort = 80;
 const buildName = process.env.TRAVIS_BUILD_NUMBER ? `travis_${process.env.TRAVIS_BUILD_NUMBER}` : `local_${new Date().getTime()}`;

integration_test/karma.conf.ts

@@ -6,7 +6,7 @@ import {testHost} from './hosts-config';
 export default (config) => {
   const customLaunchers = customLaunchersGenerator();
   const DEBUG = process.env.DEBUG !== undefined;
-  const useBrowserStack = process.env.BROWSER_STACK_USERNAME !== undefined;
+  const useBrowserStack = process.env.BROWSERSTACK_USERNAME !== undefined;
   const browsers = useBrowserStack ? Object.keys(customLaunchers) : [];
 
   config.set({