try to fix e2e tests

Author: diosmosis

tests/e2e/mwp-admin.marketplace.e2e.ts

@@ -76,13 +76,20 @@ describe('MWP Admin > Marketplace', () => {
 
     // TODO: see if this still applies
     const pathToPlugin = await MwpMarketplacePage.setupWizard.downloadPlugin();
+    console.log('install 1');
     await MwpMarketplacePage.setupWizard.goToPluginsAdmin();
+    console.log('install 2');
     await MwpMarketplacePage.setupWizard.uploadPluginAndActivate(pathToPlugin);
+    console.log('install 3');
     await MwpMarketplacePage.setupWizard.waitForReload();
+    console.log('install 4');
 
     await MwpMarketplacePage.sortPluginsAlphabetically();
+    console.log('install 5');
     await MwpMarketplacePage.removeThirdPartyPlugins();
+    console.log('install 6');
     await MwpMarketplacePage.prepareWpAdminForScreenshot();
+    console.log('install 7');
     await expect(
       await browser.checkFullPageScreen(`mwp-admin.marketplace.setup-wizard-finished.${process.env.PHP_VERSION}${trunkSuffix}`)
     ).toEqual(0);

tests/e2e/pageobjects/mwp-admin/marketplace.page.ts

@@ -59,7 +59,6 @@ class MwpMarketplaceSetupWizard {
       return browser.execute(() => /\/wp-admin\/plugins\.php$/.test(window.location.pathname));
     });
 
-    await browser.closeWindow();
     await browser.switchWindow(/page=matomo-marketplace/);
   }
 

tests/phpunit/framework/test-case.php

@@ -116,17 +116,25 @@ private function delete_extraneous_blogs() {
 	 * @return string
 	 */
 	protected function get_type_attribute() {
-		$type = '';
 		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="text/javascript"';
 		}
-		return $type;
+
+		if (
+			getenv( 'WORDPRESS_VERSION' ) !== 'trunk'
+			&& getenv( 'WORDPRESS_VERSION' ) !== 'latest'
+			&& version_compare( getenv( 'WORDPRESS_VERSION' ), '5.2', '<=' )
+		) {
+			return ' '; // in these versions, there is a space before the end of the tag, ie, '<script >'
+		}
+
+		return '';
 	}
 
 	private function snapshot_db_data() {
@@ -306,9 +314,6 @@ public function execute_scheduled_event( $event_name, $execute_all = false ) {
 
 	protected function is_wordpress_not_using_cdata_tags() {
 		return getenv( 'WORDPRESS_VERSION' )
-			&& (
-				getenv( 'WORDPRESS_VERSION' ) !== 'latest'
-				&& version_compare( getenv( 'WORDPRESS_VERSION' ), '6.4', '<' )
-			);
+			&& version_compare( getenv( 'WORDPRESS_VERSION' ), '6.4', '<' );
 	}
 }