From dc131a935115ad0c2b1515db3146a2bddb43aaa0 Mon Sep 17 00:00:00 2001
From: Chris Joel <cdata@google.com>
Date: Tue, 10 Mar 2020 14:29:02 -0700
Subject: [PATCH] Fix overlapping test runs

---
 packages/3dom/package.json                 | 3 +--
 packages/model-viewer/karma-legacy.conf.js | 4 ++++
 packages/model-viewer/package.json         | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/3dom/package.json b/packages/3dom/package.json
index 97a7eb9383..b81255aa3c 100644
--- a/packages/3dom/package.json
+++ b/packages/3dom/package.json
@@ -24,7 +24,6 @@
     "build": "tsc",
     "clean": "rm -rf ./lib",
     "test": "karma start --single-run",
-    "test:ci": "npm run test",
     "watch:test": "karma start",
     "watch:tsc": "tsc -w",
     "serve": "./node_modules/.bin/http-server -a 127.0.0.1 -o /demo/ -c-1",
@@ -64,4 +63,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/model-viewer/karma-legacy.conf.js b/packages/model-viewer/karma-legacy.conf.js
index 44f208cf39..e7835e26f8 100644
--- a/packages/model-viewer/karma-legacy.conf.js
+++ b/packages/model-viewer/karma-legacy.conf.js
@@ -17,6 +17,10 @@ module.exports = function(config) {
   // @see http://karma-runner.github.io/4.0/config/configuration-file.html
   config.set({
     basePath: '',
+    // Use special port so that tests can run in parallel
+    // Note that BrowserStack only allows a limited set of ports
+    // @see https://www.browserstack.com/question/664
+    port: 9877,
     plugins: [
       'karma-*',
     ],
diff --git a/packages/model-viewer/package.json b/packages/model-viewer/package.json
index e21cd11273..b6cf5c555d 100644
--- a/packages/model-viewer/package.json
+++ b/packages/model-viewer/package.json
@@ -43,7 +43,6 @@
     "prepublishOnly": "npm run build && npm run create-legacy-bundles",
     "test": "karma start --single-run",
     "test:legacy": "karma start ./karma-legacy.conf.js --single-run",
-    "test:ci": "npm run test",
     "check-fidelity": "node ./test/fidelity/index.js ./test/fidelity/config.json",
     "compare-fidelity": "./scripts/compare-fidelity-to-ref.sh",
     "update:package-lock": "rm ./package-lock.json && npm i --only=production",