ci: Clean up Browserstack test files, remove unused files

.gitignore

@@ -4,7 +4,10 @@ node_modules/
 test-bundle.js
 out/
 test/reports
+test/cross-browser-testing/reports
 test/test-bundle.js.map
 test/stub/test-stub-bundle.js
 **/dist
-test/cross-browser-testing/browserstack/reports
+test/cross-browser-testing/browserstack/reports
+browserstack.err
+local.log

package.json

@@ -36,8 +36,8 @@
         "build:webpack:module": "webpack --config test/integrations/module/webpack/webpack.config.js",
         "build:ts": "tsc -p .",
         "test": "npm run build && npm run build:test-bundle && cross-env DEBUG=false karma start test/karma.config.js",
-        "test:browserstack": "karma start test/cross-browser-testing/browserstack/browserstack.karma.config.js",
-        "test:browserstack:debug": "cross-env DEBUG=true karma start test/cross-browser-testing/browserstack/browserstack.karma.config.js",
+        "test:browserstack": "karma start test/cross-browser-testing/browserstack.karma.config.js",
+        "test:browserstack:debug": "cross-env DEBUG=true karma start test/cross-browser-testing/browserstack.karma.config.js",
         "test:debug": "cross-env DEBUG=true karma start test/karma.config.js",
         "test:stub": "cross-env TESTTYPE=stub ENVIRONMENT=prod rollup --config rollup.test.config.js && karma start test/stub/karma.stub.config.js",
         "test:integrations": "npm run test:requirejs && npm run test:integrations:cjs && npm run test:integrations:module",

test/cross-browser-testing/browserstack.karma.config.js

@@ -0,0 +1,97 @@
+const { DEBUG } = process.env;
+
+const files = [
+  '../lib/geomock.js',
+  '../../node_modules/fetch-mock/dist/es5/client-bundle.js',
+  '../../dist/mparticle.js',
+  // TODO: the current test suite includes modern syntax which run successfully
+  // on newer browsers.  We will need to transpile tests to work with older
+  // browsers - go.mparticle.com/work/SQDSDKS-5834
+  '../test-bundle.js',
+];
+
+let captureConsole = false;
+let browserConsoleLogOptions = {};
+
+// Allows console logs to appear when doing npm run test:debug
+if (DEBUG === 'true') {
+    browserConsoleLogOptions = {
+        level: 'log',
+        format: '%b %T: %m',
+        terminal: true,
+    };
+    captureConsole = true;
+} else {
+    browserConsoleLogOptions = {
+        terminal: false,
+    };
+}
+
+const customLaunchers = {
+    // These 2 browsers pass because they are capable of running ES6 syntax
+    // Our tests currently have ES6 syntax in them.  They need to be transpiled
+    bs_firefox_mac_100: {
+      base: 'BrowserStack',
+      browser: 'firefox',
+      browser_version: '100.0',
+      os: 'OS X',
+      os_version: 'Ventura'
+    },
+    bs_chrome_mac_100: {
+      base: 'BrowserStack',
+      browser: 'chrome',
+      browser_version: '100.0',
+      os: 'OS X',
+      os_version: 'Ventura'
+    },
+    // These two browsers fail because they cannot run ES6 syntax.  
+    // Our tests have some ES6 syntax in them, so we need to transpile the tests
+    // to get them to run properly.
+    // bs_firefox_mac_21: {
+    //   base: 'BrowserStack',
+    //   browser: 'firefox',
+    //   browser_version: '21.0',
+    //   os: 'OS X',
+    //   os_version: 'Snow Leopard'
+    // },
+    // bs_chrome_mac_38: {
+    //   base: 'BrowserStack',
+    //   browser: 'chrome',
+    //   browser_version: '38.0',
+    //   os: 'OS X',
+    //   os_version: 'Mojave'
+    // },
+}
+
+module.exports = function(config) {
+    config.set({
+      browserStack: {
+        username: process.env.BS_USERNAME,
+        accessKey: process.env.BS_ACCESS_KEY
+      },
+      autoWatch: false,
+      customLaunchers,
+      browsers: Object.keys(customLaunchers),
+      frameworks: ['mocha', 'should'],
+      files,
+      reporters: ['progress', 'junit'],
+      colors: true,
+      singleRun: true,
+      debug: true,
+      logLevel: config.LOG_INFO,
+      browserConsoleLogOptions,
+      client: {
+        captureConsole,
+      },
+      junitReporter: {
+        outputDir: 'reports/',
+        outputFile: 'test-karma.xml',
+      },
+      // These settings are added because the connection to Browserstack
+      // can sometimes be unstable, requiring re-connections, or a longer than 
+      // 2000 ms (default) timeout 
+      browserDisconnectTimeout: 50000,
+      browserDisconnectTolerance: 5,
+      concurrency: 5,
+    });
+};

test/karma.config.js

@@ -1,11 +1,8 @@
 const { DEBUG } = process.env;
 
-let files = [
-    'lib/mockhttprequest.js',
+const files = [
     'lib/geomock.js',
     '../node_modules/fetch-mock/dist/es5/client-bundle.js',
-    '../node_modules/sinon-browser-only/sinon.js',
-    'config.js',
     '../dist/mparticle.js',
     'test-bundle.js',
 ];

test/src/tests-main.js

@@ -31,31 +31,30 @@ afterEach(function() {
     window.fetchMock.restore();
 });
 
-import '../cross-browser-testing/test-cross-browser';
 import './tests-core-sdk';
-// import './tests-batchUploader';
-// import './tests-beaconUpload';
-// import './tests-kit-blocking';
-// import './tests-persistence';
-// import './tests-forwarders';
-// import './tests-helpers';
-// import './tests-identity';
-// import './tests-event-logging';
-// import './tests-eCommerce';
-// import './tests-cookie-syncing';
-// import './tests-identities-attributes';
-// import './tests-native-sdk';
-// import './tests-consent';
-// import './tests-serverModel';
-// import './tests-mockBatchCreator.ts';
-// import './tests-mParticleUser';
-// import './tests-self-hosting-specific';
-// import './tests-runtimeToBatchEventsDTO';
-// import './tests-apiClient';
-// import './tests-mparticle-instance-manager';
-// import './tests-queue-public-methods';
-// import './tests-validators';
-// import './tests-utils';
-// import './tests-session-manager';
-// import './tests-store';
-// import './tests-config-api-client';
+import './tests-batchUploader';
+import './tests-beaconUpload';
+import './tests-kit-blocking';
+import './tests-persistence';
+import './tests-forwarders';
+import './tests-helpers';
+import './tests-identity';
+import './tests-event-logging';
+import './tests-eCommerce';
+import './tests-cookie-syncing';
+import './tests-identities-attributes';
+import './tests-native-sdk';
+import './tests-consent';
+import './tests-serverModel';
+import './tests-mockBatchCreator.ts';
+import './tests-mParticleUser';
+import './tests-self-hosting-specific';
+import './tests-runtimeToBatchEventsDTO';
+import './tests-apiClient';
+import './tests-mparticle-instance-manager';
+import './tests-queue-public-methods';
+import './tests-validators';
+import './tests-utils';
+import './tests-session-manager';
+import './tests-store';
+import './tests-config-api-client';