Merge branch 'main' into block-bidi

sitespeedio · Apr 2, 2024 · d224e59 · d224e59
2 parents c593c32 + d94b6a9
commit d224e59
Show file tree

Hide file tree

Showing 12 changed files with 432 additions and 395 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 21.6.1 - 2024-03-22
+### Fixed
+* Fix running Safari TP. Thank you [KS](https://github.com/92kns) for PR [#2115](https://github.com/sitespeedio/browsertime/pull/2115).
+
+## 21.6.0 - 2024-03-20
+### Added
+* Chrome 123, Firefox 124 and Edge 122 in the Docker container [#2110](https://github.com/sitespeedio/browsertime/pull/2110).
+* Chromedriver 123 and Edgedriver 122 [#2111](https://github.com/sitespeedio/browsertime/pull/2111).
+
+### Fixed
+* Fix a bug in stopAsError so that you can continue to measure other pages after the stop. Also follow the documentation and mark the run as a failure [#2107](https://github.com/sitespeedio/browsertime/pull/2107).
+* Use bidi for Firefox when using `--basicAuth` [#2093](https://github.com/sitespeedio/browsertime/pull/2093) (needs Firefox 124).
+* Use bidi for Firefox when using `--cookie` [#2090](https://github.com/sitespeedio/browsertime/pull/2090) (needs Firefox 124).
+
 ## 21.5.4 - 2024-03-13
 ### Fixed
 * Fix for `--injectJs` for Firefox [#2103](https://github.com/sitespeedio/browsertime/pull/2103).
@@ -46,7 +60,7 @@
 
 ## 21.2.1 - 2024-02-11
 ### Fixed
-* Fix correct JavaScript signaure for stopAsError in types.
+* Fix correct JavaScript signature for stopAsError in types.
 
 ## 21.2.0 - 2024-02-11
 ### Added

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM sitespeedio/webbrowsers:chrome-123.0-firefox-124.0-edge-122.0
+FROM sitespeedio/webbrowsers:chrome-123.0-firefox-124.0-edge-123.0
 
 ARG TARGETPLATFORM=linux/amd64
 

diff --git a/lib/chrome/webdriver/setupChromiumOptions.js b/lib/chrome/webdriver/setupChromiumOptions.js
@@ -27,7 +27,13 @@ const CHROME_FEATURES_THAT_WE_DISABLES = [
   'MediaRouter',
   'OfflinePagesPrefetching',
   'OptimizationHints',
-  'Translate'
+  'Translate',
+  'msAutofillEdgeCoupons',
+  'msShoppingTrigger',
+  'msEdgeShoppingUI',
+  'msEntityExtraction',
+  'msEntityExtractionProactive',
+  'msWebAssist'
 ];
 
 export function setupChromiumOptions(

diff --git a/lib/safari/webdriver/builder.js b/lib/safari/webdriver/builder.js
@@ -44,6 +44,7 @@ export async function configureBuilder(builder, baseDir, options) {
   if (safariOptions.useTechnologyPreview) {
     let o = new Options();
     o = o.setTechnologyPreview(true);
+    o.setBrowserName('Safari Technology Preview');
     builder.setSafariOptions(o);
   }
 }