update expected screenshots and increase timeout

diosmosis · diosmosis · commit 6e18f0c9991e · 2026-05-24T13:37:43.000-07:00
diff --git a/tests/e2e/baseline/desktop_chrome/matomo-lang.profile-lang.mwp-admin.7.4.png b/tests/e2e/baseline/desktop_chrome/matomo-lang.profile-lang.mwp-admin.7.4.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb03712cfcb0f5a6bee5f3fcea6be2332ad80ea2e1455ee69c305bbeb5700892
-size 208551
+oid sha256:abf88025c70bc8894fb2c3bf3a370c6def8e1c880a926dd3a7ea92f109c0536f
+size 214729
diff --git a/tests/e2e/baseline/desktop_chrome/matomo-lang.profile-lang.mwp-admin.8.1.png b/tests/e2e/baseline/desktop_chrome/matomo-lang.profile-lang.mwp-admin.8.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb03712cfcb0f5a6bee5f3fcea6be2332ad80ea2e1455ee69c305bbeb5700892
-size 208551
+oid sha256:abf88025c70bc8894fb2c3bf3a370c6def8e1c880a926dd3a7ea92f109c0536f
+size 214729
diff --git a/tests/e2e/baseline/desktop_chrome/matomo-lang.site-lang.mwp-admin.7.4.png b/tests/e2e/baseline/desktop_chrome/matomo-lang.site-lang.mwp-admin.7.4.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:022907b318c8d106e9ea3f6d8f3d70bfd7909d2548c05a6dea51a1175c8ef54e
-size 214958
+oid sha256:3eccbab8908ee6d35952ee0c3ab5a8b5eb33fad56019c8e4b6e6dad6bf76163a
+size 222843
diff --git a/tests/e2e/baseline/desktop_chrome/matomo-lang.site-lang.mwp-admin.8.1.png b/tests/e2e/baseline/desktop_chrome/matomo-lang.site-lang.mwp-admin.8.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:022907b318c8d106e9ea3f6d8f3d70bfd7909d2548c05a6dea51a1175c8ef54e
-size 214958
+oid sha256:3eccbab8908ee6d35952ee0c3ab5a8b5eb33fad56019c8e4b6e6dad6bf76163a
+size 222843
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.install-plugins.7.4.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.install-plugins.7.4.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4300b15121f8faf90b7f0af4d20d1ac4655ee66c134b9f1bef079015fdb14a3
-size 1254439
+oid sha256:f591207b1c4f0ae291414d6526b16eb7a910490ac5985a2857efee0b169a5b84
+size 1249365
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.install-plugins.7.4.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.install-plugins.7.4.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:237135addf887846df8ed4f0a5b4525d5c49e2fa1c94e64b0f82f1bff6084dc4
-size 1250301
+oid sha256:f591207b1c4f0ae291414d6526b16eb7a910490ac5985a2857efee0b169a5b84
+size 1249365
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.install-plugins.8.1.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.install-plugins.8.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9359d7bd71ec51ad5e0de1a25532aa8a03bb9d4f25b1ec6ce34c18e03ed642db
-size 1280687
+oid sha256:975aea608bb88c05a53cb47abe066d58dca42787022f6322343b6916296ec5aa
+size 1276403
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.install-plugins.8.1.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.install-plugins.8.1.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff63521f04d6b3e7cea9cf1d256c1be7a6ed22eaf0660c8632fafbcd965738fc
-size 1277055
+oid sha256:975aea608bb88c05a53cb47abe066d58dca42787022f6322343b6916296ec5aa
+size 1276403
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.license_set.7.4.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.license_set.7.4.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56cdb4229aeb66d8b0eddcf1a06da9cd1132b450ba612e8e22686aa86d952855
-size 250258
+oid sha256:98cc940b4441b7b905c5851ddc2f414807daa3b2d108e0e402cc766b8c41ce48
+size 249070
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.license_set.8.1.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.license_set.8.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c1b2edf0b50ccc5b4fa08cfac162fb4462b15efa8f10e9967ffc8d2922d1830
-size 252018
+oid sha256:98cc940b4441b7b905c5851ddc2f414807daa3b2d108e0e402cc766b8c41ce48
+size 249070
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.license_set.8.1.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.license_set.8.1.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56cdb4229aeb66d8b0eddcf1a06da9cd1132b450ba612e8e22686aa86d952855
-size 250258
+oid sha256:98cc940b4441b7b905c5851ddc2f414807daa3b2d108e0e402cc766b8c41ce48
+size 249070
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview-after-install.7.4.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview-after-install.7.4.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf7b262a50d836baab9ebc8cf98fbfe21271352a3e7f7879f2d8d0eb78fe21a2
-size 293507
+oid sha256:6603f02902186c25d6bb65f4a7378cca405d3512d019ab8c9a052d20a4e041c1
+size 3624033
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview-after-install.8.1.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview-after-install.8.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0291bdf83dab70c14e814b5e5e10cdd44b0db58ac344f111cb06eed084b1931b
-size 291482
+oid sha256:a254a4cbbea745deb936f7eeb2745e23793295f3ad26c6354ebe4fa143367b6a
+size 3721240
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview-after-install.8.1.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview-after-install.8.1.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf7b262a50d836baab9ebc8cf98fbfe21271352a3e7f7879f2d8d0eb78fe21a2
-size 293507
+oid sha256:a254a4cbbea745deb936f7eeb2745e23793295f3ad26c6354ebe4fa143367b6a
+size 3721240
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview.7.4.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview.7.4.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:945e33f5a62651289d56a397cb55e37c45983d6303b3f152bc79827e6fabc8e6
-size 293481
+oid sha256:e49e5e3291e2242f66215a1a162c79568ef89676c15e7d9c1ae1db87a3812438
+size 406715
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview.8.1.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview.8.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:526ef2aa19146668cf53ef8d44c3b63239cb2ed869e62b05b160b34fc8e67c58
-size 291452
+oid sha256:e49e5e3291e2242f66215a1a162c79568ef89676c15e7d9c1ae1db87a3812438
+size 406715
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview.8.1.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview.8.1.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:945e33f5a62651289d56a397cb55e37c45983d6303b3f152bc79827e6fabc8e6
-size 293481
+oid sha256:e49e5e3291e2242f66215a1a162c79568ef89676c15e7d9c1ae1db87a3812438
+size 406715
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.setup-wizard.7.4.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.setup-wizard.7.4.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77a9376143fea3171c088f09138df531bb1b2fef23662c5e93ccf106997e2e2a
-size 70298
+oid sha256:6666ceaef8f64d83fc5c8c6337941657596c4c3d686609b01718767417693180
+size 69698
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.setup-wizard.7.4.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.setup-wizard.7.4.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:045c17596ac29800f88051a42b586d8e92287702a1ba9416ded2ab4e93c94713
-size 69218
+oid sha256:6666ceaef8f64d83fc5c8c6337941657596c4c3d686609b01718767417693180
+size 69698
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.setup-wizard.8.1.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.setup-wizard.8.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77a9376143fea3171c088f09138df531bb1b2fef23662c5e93ccf106997e2e2a
-size 70298
+oid sha256:6666ceaef8f64d83fc5c8c6337941657596c4c3d686609b01718767417693180
+size 69698
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.setup-wizard.8.1.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.setup-wizard.8.1.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:045c17596ac29800f88051a42b586d8e92287702a1ba9416ded2ab4e93c94713
-size 69218
+oid sha256:6666ceaef8f64d83fc5c8c6337941657596c4c3d686609b01718767417693180
+size 69698
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.subscriptions.7.4.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.subscriptions.7.4.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc0b1e938feb3d8df26c5a5c348f1de34139f5300ec0aaf0311ef124a38162f2
-size 74957
+oid sha256:d44f7992eb1c0e38005da4d4c621972b5cc6f68eea8647fb2d97d49a97f96741
+size 308651
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.subscriptions.8.1.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.subscriptions.8.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:720830e109c6ae467b27696189ced14da6f2eb07b14df56a2be8df84aa0e7932
-size 75990
+oid sha256:d44f7992eb1c0e38005da4d4c621972b5cc6f68eea8647fb2d97d49a97f96741
+size 308651
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.subscriptions.8.1.trunk.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.subscriptions.8.1.trunk.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc0b1e938feb3d8df26c5a5c348f1de34139f5300ec0aaf0311ef124a38162f2
-size 74957
+oid sha256:d44f7992eb1c0e38005da4d4c621972b5cc6f68eea8647fb2d97d49a97f96741
+size 308651
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.whats-new-notifications.8.1.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.whats-new-notifications.8.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e37db857a89e073a7a81d6967c990ee8ee8fdae1600db0fd93932020291c30eb
-size 230823
+oid sha256:889a22add2f7f619b3d8d33d2c9180820d9d1407194bb0a3a9794eb056ceb12c
+size 228304
diff --git a/tests/e2e/pageobjects/mwp-admin/marketplace.page.ts b/tests/e2e/pageobjects/mwp-admin/marketplace.page.ts
@@ -57,7 +57,7 @@ class MwpMarketplaceSetupWizard {
     await $('.button=Activate Plugin').click();
     await browser.waitUntil(() => {
       return browser.execute(() => /\/wp-admin\/plugins\.php$/.test(window.location.pathname));
-    });
+    }, { timeout: 30000 });
 
     await browser.switchWindow(/page=matomo-marketplace/);
   }
diff --git a/tests/phpunit/framework/test-case.php b/tests/phpunit/framework/test-case.php
@@ -314,6 +314,11 @@ public function execute_scheduled_event( $event_name, $execute_all = false ) {
 
 	protected function is_wordpress_not_using_cdata_tags() {
 		return getenv( 'WORDPRESS_VERSION' )
-			&& version_compare( getenv( 'WORDPRESS_VERSION' ), '6.4', '<' );
+			&& (
+				version_compare( getenv( 'WORDPRESS_VERSION' ), '6.4', '<' )
+				|| getenv( 'WORDPRESS_VERSION' ) === 'latest'
+				|| getenv( 'WORDPRESS_VERSION' ) === 'trunk'
+				|| version_compare( getenv( 'WORDPRESS_VERSION' ), '7.0', '>=' )
+			);
 	}
 }
