cleanup 1

Author: raju-opti

.github/workflows/javascript.yml

@@ -43,12 +43,12 @@ jobs:
   browser_tests:
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         browser: ['chrome', 'firefox', 'edge', 'safari']
     env:
       BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
       BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-      BROWSERSTACK_LOCAL: 'true'
       USE_LOCAL_BROWSER: 'false'
       TEST_BROWSER: ${{ matrix.browser }}
     steps:
@@ -63,7 +63,7 @@ jobs:
       working-directory: .
       run: |
         npm install
-        npm run test-vitest-browser
+        npm run test-browser
 
   # crossbrowser_and_umd_unit_tests:
   #   runs-on: ubuntu-latest

package-lock.json

@@ -61,27 +61,9 @@
     "fix-platform-export": "./scripts/platform-validator.js --fix-export",
     "test-isolation-rules": "./scripts/test-validator.js",
     "test-vitest": "vitest run",
-    "test-vitest-browser": "node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-local": "USE_LOCAL_BROWSER=true node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-chrome": "VITEST_BROWSER=chrome node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-chrome-local": "USE_LOCAL_BROWSER=true VITEST_BROWSER=chrome node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-firefox": "VITEST_BROWSER=firefox node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-firefox-local": "USE_LOCAL_BROWSER=true VITEST_BROWSER=firefox node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-edge": "VITEST_BROWSER=edge node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-edge-local": "USE_LOCAL_BROWSER=true VITEST_BROWSER=edge node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-safari": "VITEST_BROWSER=safari node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-opera": "VITEST_BROWSER=opera node ./scripts/run-browser-tests.js",
-    "test-vitest-browser-playwright": "node ./scripts/run-browser-tests-playwright.js",
-    "test-vitest-browser-playwright-chromium": "node ./scripts/run-browser-tests-playwright.js chromium",
-    "test-vitest-browser-playwright-firefox": "node ./scripts/run-browser-tests-playwright.js firefox",
-    "test-vitest-browser-playwright-webkit": "node ./scripts/run-browser-tests-playwright.js webkit",
-    "test-vitest-browser-playwright-chromium-watch": "vitest --config vitest.browser.playwright.config.mts --browser.name=chromium --watch --ui",
-    "test-vitest-browser-playwright-firefox-watch": "vitest --config vitest.browser.playwright.config.mts --browser.name=firefox --watch --ui",
-    "test-vitest-browser-playwright-webkit-watch": "vitest --config vitest.browser.playwright.config.mts --browser.name=webkit --watch --ui",
-    "test-vitest-browser-webdriverio": "node ./scripts/run-browser-tests-webdriverio.js",
-    "test-vitest-browser-webdriverio-chrome": "node ./scripts/run-browser-tests-webdriverio.js chrome",
-    "test-vitest-browser-webdriverio-firefox": "node ./scripts/run-browser-tests-webdriverio.js firefox",
-    "test-vitest-browser-webdriverio-edge": "node ./scripts/run-browser-tests-webdriverio.js edge",
+    "test-browser": "node ./scripts/run-browser-tests.js",
+    "test-browser-local": "USE_LOCAL_BROWSER=true node ./scripts/run-browser-tests.js",
+    "test-browser-browserstack": "USE_LOCAL_BROWSER=false node ./scripts/run-browser-tests.js",
     "test-mocha": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha -r ts-node/register -r tsconfig-paths/register -r lib/tests/exit_on_unhandled_rejection.js 'lib/**/*.tests.ts' 'lib/**/*.tests.js'",
     "test": "npm run test-mocha && npm run test-vitest",
     "posttest": "npm run lint",
@@ -136,7 +118,6 @@
     "@vitest/browser": "3.2.4",
     "chai": "^4.2.0",
     "coveralls-next": "^4.2.0",
-    "dotenv": "^17.2.3",
     "eslint": "^8.21.0",
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-local-rules": "^3.0.2",

package.json

@@ -15,10 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-// Load environment variables from .env file
-require('dotenv').config();
-
 const { execSync } = require('child_process');
 const browserstack = require('browserstack-local');
 
@@ -68,11 +64,6 @@ const useBrowserStackLocal = process.env.BROWSERSTACK_LOCAL === 'true';
 let bs_local = null;
 
 function startTunnel() {
-  if (!useBrowserStackLocal) {
-    console.log('BrowserStack Local tunnel disabled (tests run without local server access)');
-    return Promise.resolve();
-  }
-
   const username = process.env.BROWSERSTACK_USERNAME || process.env.BROWSER_STACK_USERNAME;
   const accessKey = process.env.BROWSERSTACK_ACCESS_KEY || process.env.BROWSER_STACK_ACCESS_KEY;
 
@@ -133,13 +124,22 @@ async function runTests() {
     // Get browser name from environment variable (default to chrome)
     const browserName = (process.env.TEST_BROWSER || 'chrome').toLowerCase();
 
-    // Get configs for this browser
-    const configs = BROWSER_CONFIGS[browserName];
-    if (!configs || configs.length === 0) {
-      console.error(`Error: No configurations found for browser '${browserName}'`);
-      console.error(`Available browsers: ${Object.keys(BROWSER_CONFIGS).join(', ')}`);
-      exitCode = 1;
-      return;
+    let configs;
+
+    if (useLocalBrowser) {
+      configs = [{
+        name: `${browserName}`,
+      }];
+      console.log('Local browser mode: using local browser installation');
+    } else {
+      // For BrowserStack, use the defined configs
+      configs = BROWSER_CONFIGS[browserName];
+      if (!configs || configs.length === 0) {
+        console.error(`Error: No configurations found for browser '${browserName}'`);
+        console.error(`Available browsers: ${Object.keys(BROWSER_CONFIGS).join(', ')}`);
+        exitCode = 1;
+        return;
+      }
     }
 
     // Only start tunnel if using BrowserStack
@@ -167,9 +167,8 @@ async function runTests() {
       // Set environment variables for this config
       const env = {
         ...process.env,
-        USE_LOCAL_BROWSER: useLocalBrowser ? 'true' : 'false',
         TEST_BROWSER: browserName,
-        TEST_BROWSER_VERSION: config.browserVersion || '',
+        TEST_BROWSER_VERSION: config.browserVersion,
         TEST_OS_NAME: config.os,
         TEST_OS_VERSION: config.osVersion,
       };