update some screenshots and fix some tests

diosmosis · diosmosis · commit 5eae457d4113 · 2026-05-24T12:37:22.000-07:00
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.license_set.7.4.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.license_set.7.4.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.overview-after-install.7.4.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview-after-install.7.4.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0291bdf83dab70c14e814b5e5e10cdd44b0db58ac344f111cb06eed084b1931b
-size 291482
+oid sha256:7768cdd9d6e192a8c3f2b11319c792cdf45afa6d41c785b3003d9935cfa77cf9
+size 3624017
diff --git a/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview.7.4.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.overview.7.4.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.subscriptions.7.4.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.marketplace.subscriptions.7.4.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.whats-new-notifications.7.4.png b/tests/e2e/baseline/desktop_chrome/mwp-admin.whats-new-notifications.7.4.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/mwp-admin.marketplace.e2e.ts b/tests/e2e/mwp-admin.marketplace.e2e.ts
@@ -63,7 +63,7 @@ describe('MWP Admin > Marketplace', () => {
 
   it('should show the marketplace setup wizard when the marketplace plugins is not installed', async () => {
     await browser.refresh();
-    await MwpMarketplacePage.openInstallPluginsTab();
+    await MwpMarketplacePage.openMarketplacePluginsTab();
 
     await MwpMarketplacePage.prepareWpAdminForScreenshot();
     await expect(
@@ -133,7 +133,7 @@ describe('MWP Admin > Marketplace', () => {
 
   it('should load the install plugins tab correctly', async () => {
     await browser.refresh();
-    await MwpMarketplacePage.openInstallPluginsTab();
+    await MwpMarketplacePage.openMarketplacePluginsTab();
 
     await MwpMarketplacePage.prepareWpAdminForScreenshot();
     await expect(
@@ -163,7 +163,7 @@ describe('MWP Admin > Marketplace', () => {
   });
 
   it('should install and activate a premium plugin successfully', async () => {
-    await MwpMarketplacePage.openInstallPluginsTab();
+    await MwpMarketplacePage.openMarketplacePluginsTab();
     await MwpMarketplacePage.installPlugin('SEOWebVitals');
     await MwpMarketplacePage.activateInstalledPlugin();
 
@@ -172,7 +172,7 @@ describe('MWP Admin > Marketplace', () => {
 
   it('should bulk install and activate plugins correctly', async () => {
     await MwpMarketplacePage.open();
-    await MwpMarketplacePage.openInstallPluginsTab();
+    await MwpMarketplacePage.openMarketplacePluginsTab();
     const installedPlugins = await MwpMarketplacePage.bulkInstallMatomoPlugins();
     await MwpMarketplacePage.bulkActivateMatomoPlugins(installedPlugins);
   });
diff --git a/tests/e2e/pageobjects/mwp-admin/marketplace.page.ts b/tests/e2e/pageobjects/mwp-admin/marketplace.page.ts
@@ -75,8 +75,8 @@ class MwpMarketplacePage extends MwpPage {
     return await super.open('/wp-admin/admin.php?page=matomo-marketplace');
   }
 
-  async openInstallPluginsTab() {
-    await $('a.nav-tab=Install Plugins').click();
+  async openMarketplacePluginsTab() {
+    await $('a.nav-tab=Marketplace').click();
 
     await $('.matomo-plugin-card,.matomo-marketplace-wizard').waitForExist({ timeout: 120000 });
 
diff --git a/tests/phpunit/framework/test-case.php b/tests/phpunit/framework/test-case.php
@@ -117,8 +117,14 @@ private function delete_extraneous_blogs() {
 	 */
 	protected function get_type_attribute() {
 		$type = '';
-		if ( function_exists( 'wp_get_inline_script_tag' ) && ! is_admin() && ! current_theme_supports( 'html5', 'script' ) ) {
-			$type = 'type="text/javascript"';
+		if (
+			function_exists( 'wp_get_inline_script_tag' )
+			&& ! is_admin()
+			&& ! current_theme_supports( 'html5', 'script' )
+			&& getenv( 'WORDPRESS_VERSION' ) !== 'trunk'
+			&& version_compare( getenv( 'WORDPRESS_VERSION' ), '6.4', '<' )
+		) {
+			$type = ' type="text/javascript"';
 		}
 		return $type;
 	}
@@ -302,7 +308,6 @@ protected function is_wordpress_not_using_cdata_tags() {
 		return getenv( 'WORDPRESS_VERSION' )
 			&& (
 				getenv( 'WORDPRESS_VERSION' ) !== 'latest'
-				&& getenv( 'WORDPRESS_VERSION' ) !== 'trunk'
 				&& version_compare( getenv( 'WORDPRESS_VERSION' ), '6.4', '<' )
 			);
 	}
diff --git a/tests/phpunit/wpmatomo/admin/test-adminsettings.php b/tests/phpunit/wpmatomo/admin/test-adminsettings.php
@@ -6,9 +6,6 @@
 use WpMatomo\Admin\AdminSettings;
 use WpMatomo\Settings;
 
-/**
- * @group only
- */
 class AdminSettingsTest extends MatomoAnalytics_TestCase {
 
 	/**
diff --git a/tests/phpunit/wpmatomo/ecommerce/test-base.php b/tests/phpunit/wpmatomo/ecommerce/test-base.php
@@ -93,7 +93,7 @@ public function test_wrap_script_on_set_ecommerce_view() {
 		}
 
 		$this->assertSame(
-			'<script ' . $this->get_type_attribute() . ">\n$cdata_start" .
+			'<script' . $this->get_type_attribute() . ">\n$cdata_start" .
 			'window._paq = window._paq || []; window._paq.push(["setEcommerceView","sku","product-title",[],50]);' . PHP_EOL .
 			"$cdata_end</script>" . PHP_EOL,
 			$this->base->wrap_script( $this->base->make_matomo_js_tracker_call( $params ) )
@@ -125,7 +125,7 @@ public function test_wrap_script_on_set_ecommerce_view_if_cookies_disabled() {
 		}
 
 		$this->assertSame(
-			'<script ' . $this->get_type_attribute() . ">\n$cdata_start" .
+			'<script' . $this->get_type_attribute() . ">\n$cdata_start" .
 			'window._paq = window._paq || []; if (!window._paq.find || !window._paq.find(function (m) { return m[0] === "disableCookies"; })) {
 	window._paq.push(["disableCookies"]);
 } window._paq.push(["setEcommerceView","sku","product-title",[],50]);' . PHP_EOL .
@@ -156,7 +156,7 @@ public function test_wrap_script_outputs_code_when_not_tracking_in_background()
 		$script_type = $this->get_type_attribute();
 
 		$expected = <<<EOF
-<script $script_type>$cdata_start
+<script$script_type>$cdata_start
 window._paq = window._paq || []; window._paq.push(["trackEcommerceCartUpdate",400]);window._paq = window._paq || []; window._paq.push(["trackEcommerceOrder","orderid",300,200,40,60,0]);
 $cdata_end</script>
 
@@ -404,7 +404,7 @@ public function test_maybe_do_delayed_tracking_uses_detected_visitor_information
 		$script_type = $this->get_type_attribute();
 
 		$expected_tracking_code = <<<EOF
-<script $script_type>$cdata_start
+<script$script_type>$cdata_start
 window._paq = window._paq || []; window._paq.push(["trackEcommerceCartUpdate",100]);window._paq = window._paq || []; window._paq.push(["trackEcommerceOrder","orderid",300,200,40,60,0]);
 $cdata_end</script>
 
diff --git a/tests/phpunit/wpmatomo/test-trackingcode.php b/tests/phpunit/wpmatomo/test-trackingcode.php
@@ -94,7 +94,7 @@ public function test_tracking_enabled_adds_by_default_to_footer() {
 		$footer = ob_get_clean();
 
 		$this->assertStringNotContainsString( 'idsite', $header );
-		$this->assertStringContainsString( '<!-- Matomo --><script ' . $this->get_type_attribute() . ">\n", $footer );
+		$this->assertStringContainsString( '<!-- Matomo --><script' . $this->get_type_attribute() . ">\n", $footer );
 		$this->assertStringContainsString( 'var _paq = window._paq = window._paq || [];', $footer );
 		$this->assertStringContainsString( '_paq.push([\'setSiteId\', \'23\'])', $footer );
 	}
@@ -117,7 +117,7 @@ public function test_tracking_enabled_can_be_added_to_header() {
 		$footer = ob_get_clean();
 
 		$this->assertStringNotContainsString( 'idsite', $footer );
-		$this->assertStringContainsString( '<!-- Matomo --><script ' . $this->get_type_attribute() . ">\n", $header );
+		$this->assertStringContainsString( '<!-- Matomo --><script' . $this->get_type_attribute() . ">\n", $header );
 		$this->assertStringContainsString( 'var _paq = window._paq = window._paq || [];', $header );
 		$this->assertStringContainsString( '_paq.push([\'setSiteId\', \'23\'])', $header );
 	}
diff --git a/tests/phpunit/wpmatomo/trackingcode/test-trackingcodegenerator.php b/tests/phpunit/wpmatomo/trackingcode/test-trackingcodegenerator.php
@@ -60,7 +60,7 @@ public function test_get_tracking_code_when_using_default_tracking_code() {
 		}
 
 		$this->assertSame(
-			'<!-- Matomo --><script ' . $this->get_type_attribute() . ">\n$cdata_start" . '(function () {
+			'<!-- Matomo --><script' . $this->get_type_attribute() . ">\n$cdata_start" . '(function () {
 function initTracking() {
 var _paq = window._paq = window._paq || [];
 _paq.push([\'trackPageView\']);_paq.push([\'enableLinkTracking\']);_paq.push([\'alwaysUseSendBeacon\']);_paq.push([\'setTrackerUrl\', "\/\/example.org\/wp-content\/plugins\/matomo\/app\/matomo.php"]);_paq.push([\'setSiteId\', \'21\']);var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0];
@@ -100,7 +100,7 @@ public function test_get_tracking_code_when_using_default_tracking_code_using_re
 		}
 
 		$this->assertSame(
-			'<!-- Matomo --><script ' . $this->get_type_attribute() . '>' . "\n$cdata_start" . '(function () {
+			'<!-- Matomo --><script' . $this->get_type_attribute() . '>' . "\n$cdata_start" . '(function () {
 function initTracking() {
 var _paq = window._paq = window._paq || [];
 _paq.push([\'addDownloadExtensions\', "zip|waf"]);
@@ -329,7 +329,7 @@ public function test_prepare_tracking_code_when_using_options_from_request() {
 
 		$this->assertSame(
 			[
-				'script'   => '<!-- Matomo --><script ' . $this->get_type_attribute() . ">\n$cdata_start"
+				'script'   => '<!-- Matomo --><script' . $this->get_type_attribute() . ">\n$cdata_start"
 					. '(function () {
 function initTracking() {
 var _paq = window._paq = window._paq || [];

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ class MwpMarketplacePage extends MwpPage {`
`75`	`75`	`return await super.open('/wp-admin/admin.php?page=matomo-marketplace');`
`76`	`76`	`}`
`77`	`77`
`78`		`- async openInstallPluginsTab() {`
`79`		`- await $('a.nav-tab=Install Plugins').click();`
	`78`	`+ async openMarketplacePluginsTab() {`
	`79`	`+ await $('a.nav-tab=Marketplace').click();`
`80`	`80`
`81`	`81`	`await $('.matomo-plugin-card,.matomo-marketplace-wizard').waitForExist({ timeout: 120000 });`
`82`	`82`