From f3a07787d603b834d57a362758b60673b843b3dc Mon Sep 17 00:00:00 2001
From: Patrick Thompson <patrickathompson@gmail.com>
Date: Mon, 5 Aug 2024 19:37:03 -0500
Subject: [PATCH] added test and refactored

---
 src/index.js                                 | 20 +++++------
 test/mocha/browserstack-capabilities-test.js | 35 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/index.js b/src/index.js
index 427c847..830b040 100644
--- a/src/index.js
+++ b/src/index.js
@@ -138,27 +138,23 @@ module.exports = {
     },
 
     _getCapabilitiesFromConfig () {
-        const configPath = path.resolve(process.env.BROWSERSTACK_CAPABILITIES_CONFIG_PATH);
+        let relativeConfigPath;
 
-        if (!configPath)
-            return {};
-        const relativeConfigPath = path.relative(__dirname, configPath);
+        if (process.env.BROWSERSTACK_CAPABILITIES_CONFIG_PATH) {
+            const configPath = path.resolve(process.env.BROWSERSTACK_CAPABILITIES_CONFIG_PATH);
 
-        if (!relativeConfigPath)
+            relativeConfigPath = path.relative(__dirname, configPath);
+        }
+        else
             return {};
+
         return require(relativeConfigPath);
     },
 
     _getAdditionalCapabilities () {
         const capabilitiesFromEnvironment = pickBy(this._getCapabilitiesFromEnvironment(), value => value !== void 0);
-        let additionalCapabilities = '';
-
-        if (process.env.BROWSERSTACK_CAPABILITIES_CONFIG_PATH)
-            additionalCapabilities = { ...this._getCapabilitiesFromConfig(), ...capabilitiesFromEnvironment };
-        else
-            additionalCapabilities = { ...capabilitiesFromEnvironment };
 
-        return additionalCapabilities;
+        return { ...this._getCapabilitiesFromConfig(), ...capabilitiesFromEnvironment };
     },
 
     _filterPlatformInfo (query) {
diff --git a/test/mocha/browserstack-capabilities-test.js b/test/mocha/browserstack-capabilities-test.js
index e7b04c1..1229fb9 100644
--- a/test/mocha/browserstack-capabilities-test.js
+++ b/test/mocha/browserstack-capabilities-test.js
@@ -44,6 +44,7 @@ describe('Browserstack capabilities', function () {
     });
 
     it('Should read additional capabilities from a config file', () => {
+
         process.env.BROWSERSTACK_CAPABILITIES_CONFIG_PATH = require.resolve('./data/capabilities-config.json');
 
         const capabilities = browserStackProvider._getAdditionalCapabilities();
@@ -63,4 +64,38 @@ describe('Browserstack capabilities', function () {
             'browserstack.networkProfile': '4g-lte-lossy'
         });
     });
+
+    it('Should add additional capabilities when both config file and environment variables used', () => {
+        process.env['BROWSERSTACK_BUILD_ID'] = 'build-1';
+        process.env['BROWSERSTACK_PROJECT_NAME'] = 'project-1';
+        process.env['BROWSERSTACK_DISPLAY_RESOLUTION'] = '1024x768';
+        process.env['BROWSERSTACK_TEST_RUN_NAME'] = 'Testcafe test run 1';
+        process.env['BROWSERSTACK_DEBUG'] = 'false'; //env var should take precedence
+        process.env['BROWSERSTACK_CONSOLE'] = 'errors';
+        process.env['BROWSERSTACK_NETWORK_LOGS'] = 'true';
+        process.env['BROWSERSTACK_VIDEO'] = 'true';
+        process.env['BROWSERSTACK_TIMEZONE'] = 'Asia/Taipei';
+        process.env['BROWSERSTACK_GEO_LOCATION'] = 'ZA';
+        process.env['BROWSERSTACK_CUSTOM_NETWORK'] = '"1000", "1000", "100", "1"';
+        process.env['BROWSERSTACK_NETWORK_PROFILE'] = '4g-lte-lossy';
+
+        process.env.BROWSERSTACK_CAPABILITIES_CONFIG_PATH = require.resolve('./data/capabilities-config.json');
+
+        const capabilities = browserStackProvider._getAdditionalCapabilities();
+
+        expect(capabilities).to.deep.equal({
+            'build':                       'build-1',
+            'project':                     'project-1',
+            'resolution':                  '1024x768',
+            'name':                        'Testcafe test run 1',
+            'browserstack.debug':          'false', //env var should take precedence
+            'browserstack.console':        'errors',
+            'browserstack.networkLogs':    'true',
+            'browserstack.video':          'true',
+            'browserstack.timezone':       'Asia/Taipei',
+            'browserstack.geoLocation':    'ZA',
+            'browserstack.customNetwork':  '"1000", "1000", "100", "1"',
+            'browserstack.networkProfile': '4g-lte-lossy'
+        });
+    });
 });