From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 28 Mar 2023 10:22:30 +0000 (+0300)
Subject: Fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c3849f2317faddbd7615cea41d7234f948b9c6f;p=thirdparty%2Fbootstrap.git

Fixes
---

diff --git a/.gitignore b/.gitignore
index a58e045472..927672843c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,4 @@ Thumbs.db
 /dist-sass/
 /js/coverage/
 /node_modules/
-.lambdatest
+/.lambdatest/
diff --git a/js/tests/browsers.js b/js/tests/browsers.js
index a3feb531be..f92dc19f76 100644
--- a/js/tests/browsers.js
+++ b/js/tests/browsers.js
@@ -7,50 +7,50 @@ const browsers = {
     safariMac: {
       browserName: 'Safari',
       browserVersion: 'latest',
-      "LT:Options": {
-        "platformName": "MacOS Monterey"
+      'LT:Options': {
+        platformName: 'MacOS Monterey'
       }
     },
     chromeMac: {
       browserName: 'Chrome',
       browserVersion: 'latest',
-      "LT:Options": {
-        "platformName": "MacOS Monterey"
+      'LT:Options': {
+        platformName: 'MacOS Monterey'
       }
     },
     firefoxMac: {
       browserName: 'Firefox',
       browserVersion: 'latest',
-      "LT:Options": {
-        "platformName": "MacOS Monterey"
+      'LT:Options': {
+        platformName: 'MacOS Monterey'
       }
     },
     chromeWin10: {
       browserName: 'Chrome',
       browserVersion: '60',
-      "LT:Options": {
-        "platformName": "Windows 10"
+      'LT:Options': {
+        platformName: 'Windows 10'
       }
     },
     firefoxWin10: {
       browserName: 'Firefox',
       browserVersion: '60',
-      "LT:Options": {
-        "platformName": "Windows 10"
+      'LT:Options': {
+        platformName: 'Windows 10'
       }
     },
     chromeWin10Latest: {
       browserName: 'Chrome',
       browserVersion: 'latest',
-      "LT:Options": {
-        "platformName": "Windows 10"
+      'LT:Options': {
+        platformName: 'Windows 10'
       }
     },
     firefoxWin10Latest: {
       browserName: 'Firefox',
       browserVersion: 'latest',
-      "LT:Options": {
-        "platformName": "Windows 10"
+      'LT:Options': {
+        platformName: 'Windows 10'
       }
     },
     iphone7: {
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index bb0deaa06e..b7632f62dd 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -65,10 +65,10 @@ const config = {
   colors: true,
   autoWatch: false,
   singleRun: true,
-  captureTimeout: 90000,
+  captureTimeout: 90_000,
   browserDisconnectTolerance: 3,
-  browserDisconnectTimeout: 90000,
-  browserNoActivityTimeout: 90000,
+  browserDisconnectTimeout: 90_000,
+  browserNoActivityTimeout: 90_000,
   concurrency: Number.POSITIVE_INFINITY,
   client: {
     clearContext: false
@@ -114,33 +114,34 @@ const config = {
 }
 
 if (LAMBDATEST) {
-  config.hostname = 'localhost.lambdatest.com',
-    Object.keys(browsers['lambdaTest']).map(key => {
-      browsers['lambdaTest'][key].base = 'WebDriver'
-      browsers['lambdaTest'][key].build = `bootstrap-${ENV.GITHUB_SHA ? `${ENV.GITHUB_SHA.slice(0, 7)}-` : ''}${new Date().toISOString()}`
-      browsers['lambdaTest'][key].project = 'Bootstrap'
-      if (browsers['lambdaTest'][key].isRealMobile) {
-        browsers['lambdaTest'][key].config = webdriverConfigMobile
-        browsers['lambdaTest'][key].user = ENV.LT_USERNAME
-        browsers['lambdaTest'][key].accessKey = ENV.LT_ACCESS_KEY
-        browsers['lambdaTest'][key].tunnel = true
-        browsers['lambdaTest'][key].tunnelName = process.env.LT_TUNNEL_NAME || 'jasmine'
-        browsers['lambdaTest'][key].pseudoActivityInterval = 15000 // 5000 ms heartbeat
-      }
-      else {
-        browsers['lambdaTest'][key].config = webdriverConfig
-        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"].tunnelName = process.env.LT_TUNNEL_NAME || 'jasmine'
-        browsers['lambdaTest'][key]["LT:Options"].plugin = 'bootstrap-karma'
-        browsers['lambdaTest'][key]["LT:Options"].pseudoActivityInterval = 15000 // 5000 ms heartbeat
-      }
-      browsers['lambdaTest'][key].retryLimit = 2
-    })
+  config.hostname = 'localhost.lambdatest.com'
+  for (const key of Object.keys(browsers.lambdaTest)) {
+    browsers.lambdaTest[key].base = 'WebDriver'
+    browsers.lambdaTest[key].build = `bootstrap-${ENV.GITHUB_SHA ? `${ENV.GITHUB_SHA.slice(0, 7)}-` : ''}${new Date().toISOString()}`
+    browsers.lambdaTest[key].project = 'Bootstrap'
+    if (browsers.lambdaTest[key].isRealMobile) {
+      browsers.lambdaTest[key].config = webdriverConfigMobile
+      browsers.lambdaTest[key].user = ENV.LT_USERNAME
+      browsers.lambdaTest[key].accessKey = ENV.LT_ACCESS_KEY
+      browsers.lambdaTest[key].tunnel = true
+      browsers.lambdaTest[key].tunnelName = process.env.LT_TUNNEL_NAME || 'jasmine'
+      browsers.lambdaTest[key].pseudoActivityInterval = 15_000 // 5000 ms heartbeat
+    } else {
+      browsers.lambdaTest[key].config = webdriverConfig
+      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'].tunnelName = process.env.LT_TUNNEL_NAME || 'jasmine'
+      browsers.lambdaTest[key]['LT:Options'].plugin = 'bootstrap-karma'
+      browsers.lambdaTest[key]['LT:Options'].pseudoActivityInterval = 15_000 // 5000 ms heartbeat
+    }
+
+    browsers.lambdaTest[key].retryLimit = 2
+  }
+
   plugins.push('karma-webdriver-launcher', 'karma-jasmine', 'karma-jasmine-html-reporter')
-  config.customLaunchers = browsers['lambdaTest']
-  config.browsers = Object.keys(browsers['lambdaTest'])
+  config.customLaunchers = browsers.lambdaTest
+  config.browsers = Object.keys(browsers.lambdaTest)
   reporters.push('kjhtml')
 } else if (BROWSERSTACK) {
   config.hostname = ip.address()
@@ -152,8 +153,8 @@ if (LAMBDATEST) {
     retryLimit: 2
   }
   plugins.push('karma-browserstack-launcher', 'karma-jasmine-html-reporter')
-  config.customLaunchers = browsers['browserStack']
-  config.browsers = Object.keys(browsers['browserStack'])
+  config.customLaunchers = browsers.browserStack
+  config.browsers = Object.keys(browsers.browserStack)
   reporters.push('BrowserStack', 'kjhtml')
 } else if (JQUERY_TEST) {
   frameworks.push('detectBrowsers')
@@ -170,21 +171,6 @@ if (LAMBDATEST) {
       watched: false
     }
   ]
-} else if (JQUERY_TEST) {
-  frameworks.push('detectBrowsers')
-  plugins.push(
-    'karma-chrome-launcher',
-    'karma-firefox-launcher',
-    'karma-detect-browsers'
-  )
-  config.detectBrowsers = detectBrowsers
-  config.files = [
-    'node_modules/jquery/dist/jquery.slim.min.js',
-    {
-      pattern: 'js/tests/unit/jquery.spec.js',
-      watched: false
-    }
-  ]
 } else {
   frameworks.push('detectBrowsers')
   plugins.push(
@@ -221,6 +207,7 @@ if (LAMBDATEST) {
 config.frameworks = frameworks
 config.plugins = plugins
 config.reporters = reporters
+
 module.exports = karmaConfig => {
   config.logLevel = karmaConfig.LOG_ERROR
   karmaConfig.set(config)
diff --git a/js/tests/lt-local.js b/js/tests/lt-local.js
index a1c51684c0..6b3fd35ddd 100644
--- a/js/tests/lt-local.js
+++ b/js/tests/lt-local.js
@@ -1,18 +1,26 @@
-const lambdaTunnel = require("@lambdatest/node-tunnel");
-const tunnelInstance = new lambdaTunnel();
+/* eslint-env node */
+/* eslint-disable no-console */
+
+'use strict'
+
+const process = require('node:process')
+const lambdaTunnel = require('@lambdatest/node-tunnel')
+
+const tunnelInstance = new lambdaTunnel() // eslint-disable-line new-cap
 const tunnelArguments = {
-    user: process.env.LT_USERNAME,
-    key: process.env.LT_ACCESS_KEY,
-    tunnelName: process.env.LT_TUNNEL_NAME || 'jasmine',
-    logFile: "local.log"
-};
+  user: process.env.LT_USERNAME,
+  key: process.env.LT_ACCESS_KEY,
+  tunnelName: process.env.LT_TUNNEL_NAME || 'jasmine',
+  logFile: 'local.log'
+}
 
-if (process.env.LAMBDATEST == 'true') {
-    (async () => {
-        try {
-            await tunnelInstance.start(tunnelArguments)
-        } catch (err) {
-            console.log(err.message)
-        }
-    })()
-}
\ No newline at end of file
+if (process.env.LAMBDATEST === 'true') {
+  // eslint-disable-next-line unicorn/prefer-top-level-await
+  (async () => {
+    try {
+      await tunnelInstance.start(tunnelArguments)
+    } catch (error) {
+      console.log(error.message)
+    }
+  })()
+}