From: XhmikosR <xhmikosr@gmail.com>
Date: Wed, 12 Apr 2023 15:53:25 +0000 (+0300)
Subject: Updates
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f27a9c02d8c40cbfd4a2eaf80f6093f08e0831ae;p=thirdparty%2Fbootstrap.git

Updates
---

diff --git a/js/tests/browsers.js b/js/tests/browsers.js
index bb72f54a8e..0e48e83a73 100644
--- a/js/tests/browsers.js
+++ b/js/tests/browsers.js
@@ -3,78 +3,6 @@
 'use strict'
 
 const browsers = {
-  lambdaTest: {
-    safariMac: {
-      browserName: 'Safari',
-      browserVersion: 'latest',
-      'LT:Options': {
-        platformName: 'MacOS Monterey'
-      }
-    },
-    chromeMac: {
-      browserName: 'Chrome',
-      browserVersion: 'latest',
-      'LT:Options': {
-        platformName: 'MacOS Monterey'
-      }
-    },
-    firefoxMac: {
-      browserName: 'Firefox',
-      browserVersion: 'latest',
-      'LT:Options': {
-        platformName: 'MacOS Monterey'
-      }
-    },
-    chromeWin10: {
-      browserName: 'Chrome',
-      browserVersion: '60',
-      'LT:Options': {
-        platformName: 'Windows 10'
-      }
-    },
-    firefoxWin10: {
-      browserName: 'Firefox',
-      browserVersion: '60',
-      'LT:Options': {
-        platformName: 'Windows 10'
-      }
-    },
-    chromeWin10Latest: {
-      browserName: 'Chrome',
-      browserVersion: 'latest',
-      'LT:Options': {
-        platformName: 'Windows 10'
-      }
-    },
-    firefoxWin10Latest: {
-      browserName: 'Firefox',
-      browserVersion: 'latest',
-      'LT:Options': {
-        platformName: 'Windows 10'
-      }
-    },
-    iphone11: {
-      platformName: 'ios',
-      platformVersion: '15',
-      browserName: 'Safari',
-      deviceName: 'iPhone 13',
-      isRealMobile: true
-    },
-    iphone14: {
-      platformName: 'ios',
-      platformVersion: '16',
-      browserName: 'Safari',
-      deviceName: 'iPhone 14',
-      isRealMobile: true
-    },
-    pixel6: {
-      platformName: 'android',
-      platformVersion: '12',
-      browserName: 'Chrome',
-      deviceName: 'Pixel 6',
-      isRealMobile: true
-    }
-  },
   browserStack: {
     safariMac: {
       base: 'BrowserStack',
@@ -146,6 +74,78 @@ const browsers = {
       device: 'Google Pixel 2',
       real_mobile: true
     }
+  },
+  lambdaTest: {
+    safariMac: {
+      browserName: 'Safari',
+      browserVersion: 'latest',
+      'LT:Options': {
+        platformName: 'MacOS Monterey'
+      }
+    },
+    chromeMac: {
+      browserName: 'Chrome',
+      browserVersion: 'latest',
+      'LT:Options': {
+        platformName: 'MacOS Monterey'
+      }
+    },
+    firefoxMac: {
+      browserName: 'Firefox',
+      browserVersion: 'latest',
+      'LT:Options': {
+        platformName: 'MacOS Monterey'
+      }
+    },
+    chromeWin10: {
+      browserName: 'Chrome',
+      browserVersion: '60',
+      'LT:Options': {
+        platformName: 'Windows 10'
+      }
+    },
+    firefoxWin10: {
+      browserName: 'Firefox',
+      browserVersion: '60',
+      'LT:Options': {
+        platformName: 'Windows 10'
+      }
+    },
+    chromeWin10Latest: {
+      browserName: 'Chrome',
+      browserVersion: 'latest',
+      'LT:Options': {
+        platformName: 'Windows 10'
+      }
+    },
+    firefoxWin10Latest: {
+      browserName: 'Firefox',
+      browserVersion: 'latest',
+      'LT:Options': {
+        platformName: 'Windows 10'
+      }
+    },
+    iphone11: {
+      platformName: 'ios',
+      platformVersion: '15',
+      browserName: 'Safari',
+      deviceName: 'iPhone 13',
+      isRealMobile: true
+    },
+    iphone14: {
+      platformName: 'ios',
+      platformVersion: '16',
+      browserName: 'Safari',
+      deviceName: 'iPhone 14',
+      isRealMobile: true
+    },
+    pixel6: {
+      platformName: 'android',
+      platformVersion: '12',
+      browserName: 'Chrome',
+      deviceName: 'Pixel 6',
+      isRealMobile: true
+    }
   }
 }
 
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index cb41b1e48f..676470e5ad 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -9,19 +9,20 @@ const replace = require('@rollup/plugin-replace')
 const { browsers } = require('./browsers.js')
 
 const ENV = process.env
-const LAMBDATEST = Boolean(ENV.LAMBDATEST)
-const BROWSERSTACK = Boolean(ENV.BROWSERSTACK)
 const DEBUG = Boolean(ENV.DEBUG)
 const JQUERY_TEST = Boolean(ENV.JQUERY)
+const BROWSERSTACK = Boolean(ENV.BROWSERSTACK)
+const LAMBDATEST = Boolean(ENV.LAMBDATEST)
 
-const webdriverConfig = {
-  hostname: 'hub.lambdatest.com',
-  port: 80
-}
-
-const webdriverConfigMobile = {
-  hostname: 'mobile-hub.lambdatest.com',
-  port: 80
+const webDriverConfig = {
+  desktop: {
+    hostname: 'hub.lambdatest.com',
+    port: 80
+  },
+  mobile: {
+    hostname: 'mobile-hub.lambdatest.com',
+    port: 80
+  }
 }
 
 const frameworks = [
@@ -125,22 +126,22 @@ if (LAMBDATEST) {
     browsers.lambdaTest[key].project = 'Bootstrap'
 
     if (browsers.lambdaTest[key].isRealMobile) {
-      browsers.lambdaTest[key].config = webdriverConfigMobile
+      browsers.lambdaTest[key].config = webDriverConfig.mobile
       browsers.lambdaTest[key].user = ENV.LT_USERNAME
       browsers.lambdaTest[key].accessKey = ENV.LT_ACCESS_KEY
       browsers.lambdaTest[key].tunnel = true
       browsers.lambdaTest[key].console = true
       browsers.lambdaTest[key].network = true
-      browsers.lambdaTest[key].tunnelName = process.env.LT_TUNNEL_NAME || 'jasmine'
+      browsers.lambdaTest[key].tunnelName = ENV.LT_TUNNEL_NAME || 'jasmine'
       browsers.lambdaTest[key].pseudoActivityInterval = 5000 // 5000 ms heartbeat
     } else {
-      browsers.lambdaTest[key].config = webdriverConfig
+      browsers.lambdaTest[key].config = webDriverConfig.desktop
       browsers.lambdaTest[key]['LT:Options'].username = ENV.LT_USERNAME
       browsers.lambdaTest[key]['LT:Options'].accessKey = ENV.LT_ACCESS_KEY
       browsers.lambdaTest[key]['LT:Options'].tunnel = true
       browsers.lambdaTest[key]['LT:Options'].console = true
       browsers.lambdaTest[key]['LT:Options'].network = true
-      browsers.lambdaTest[key]['LT:Options'].tunnelName = process.env.LT_TUNNEL_NAME || 'jasmine'
+      browsers.lambdaTest[key]['LT:Options'].tunnelName = ENV.LT_TUNNEL_NAME || 'jasmine'
       browsers.lambdaTest[key]['LT:Options'].pseudoActivityInterval = 5000 // 5000 ms heartbeat
     }
 
diff --git a/js/tests/lt-local.js b/js/tests/lt-local.js
index a315eefd9b..6521b4fe31 100644
--- a/js/tests/lt-local.js
+++ b/js/tests/lt-local.js
@@ -21,12 +21,8 @@ const tunnelArguments = {
 
 // eslint-disable-next-line unicorn/prefer-top-level-await
 (async () => {
-  try {
-    await tunnelInstance.start(tunnelArguments)
-    await new Promise(res => {
-      setTimeout(res, 5000)
-    })
-  } catch (error) {
-    console.log(error.message)
-  }
+  await tunnelInstance.start(tunnelArguments)
+  await new Promise(res => {
+    setTimeout(res, 5000)
+  })
 })()