From: Mukesh Rana <106960543+mukesh-lt@users.noreply.github.com> Date: Tue, 28 Mar 2023 15:56:26 +0000 (+0530) Subject: Some fixes (#38354) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5dac1e50a124bb8959ce564ce1fb8286d9070a7;p=thirdparty%2Fbootstrap.git Some fixes (#38354) --- diff --git a/js/tests/browsers.js b/js/tests/browsers.js index f92dc19f76..1fae52ada1 100644 --- a/js/tests/browsers.js +++ b/js/tests/browsers.js @@ -53,25 +53,25 @@ const browsers = { platformName: 'Windows 10' } }, - iphone7: { + iphone11: { platformName: 'ios', - platformVersion: '12', + platformVersion: '15', browserName: 'Safari', - deviceName: 'iPhone 7', + deviceName: 'iPhone 13', isRealMobile: true }, - iphone12: { + iphone14: { platformName: 'ios', platformVersion: '16', browserName: 'Safari', - deviceName: 'iPhone 12', + deviceName: 'iPhone 14', isRealMobile: true }, - pixel2: { + galaxyS22: { platformName: 'android', platformVersion: '12', browserName: 'Chrome', - deviceName: 'Google Pixel 6', + deviceName: 'Galaxy S22 5G', isRealMobile: true } }, diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js index b7632f62dd..adbc1138ce 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: 90_000, + captureTimeout: 180_000, browserDisconnectTolerance: 3, - browserDisconnectTimeout: 90_000, - browserNoActivityTimeout: 90_000, + browserDisconnectTimeout: 180_000, + browserNoActivityTimeout: 180_000, concurrency: Number.POSITIVE_INFINITY, client: { clearContext: false diff --git a/package.json b/package.json index 4e40ee7a96..ecdcfe2e7c 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,8 @@ "js-test-integration-bundle": "rollup --config js/tests/integration/rollup.bundle.js", "js-test-integration-modularity": "rollup --config js/tests/integration/rollup.bundle-modularity.js", "js-test-cloud": "cross-env BROWSERSTACK=true npm run js-test-karma", - "js-test-ltcloud": "cross-env LAMBDATEST=true npm-run-all --parallel --race js-test-ltTunnel js-test-karma", + "js-test-ltcloud": "cross-env LAMBDATEST=true npm-run-all --parallel --race js-test-ltLocal js-test-karma", + "js-test-ltLocal": "npm-run-all js-test-ltTunnel sleep", "js-test-ltTunnel": "node js/tests/lt-local", "js-test-jquery": "cross-env JQUERY=true npm run js-test-karma", "lint": "npm-run-all --aggregate-output --continue-on-error --parallel js-lint css-lint lockfile-lint", @@ -99,7 +100,8 @@ "watch-css-docs": "nodemon --watch site/assets/scss/ --ext scss --exec \"npm run css-lint\"", "watch-css-test": "nodemon --watch scss/ --ext scss,js --exec \"npm run css-test\"", "watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm-run-all js-lint js-compile\"", - "watch-js-docs": "nodemon --watch site/assets/js/ --ext js --exec \"npm run js-lint\"" + "watch-js-docs": "nodemon --watch site/assets/js/ --ext js --exec \"npm run js-lint\"", + "sleep": "sleep 5" }, "peerDependencies": { "@popperjs/core": "^2.11.8"