another test fix attempt

Author: diosmosis

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

@@ -55,14 +55,9 @@ class MwpMarketplaceSetupWizard {
     await $('.button=Activate Plugin').waitForDisplayed({ timeout: 30000 });
 
     await $('.button=Activate Plugin').click();
-    try {
-      await browser.waitUntil(() => {
-        return browser.execute(() => /page=matomo-marketplace/.test(window.location.pathname));
-      }, {timeout: 30000});
-    } catch (e) {
-      console.log(await browser.execute(() => window.location.pathname));
-      throw e;
-    }
+    await browser.waitUntil(() => {
+      return browser.execute(() => /page=matomo-marketplace/.test(window.location.href));
+    }, {timeout: 30000});
 
     await browser.switchWindow(/page=matomo-marketplace/);
   }

tests/phpunit/wpmatomo/ecommerce/test-woocommerce.php

@@ -147,7 +147,7 @@ public function test_order_tracking_when_expected_user_flow() {
 		$script_type = $this->get_type_attribute();
 
 		$expected_code = <<<EOF
-<script $script_type>$cdata_start
+<script$script_type>$cdata_start
 window._paq = window._paq || []; window._paq.push(["addEcommerceItem","10","a tiny hat",["Uncategorized"],12,2]);window._paq = window._paq || []; window._paq.push(["trackEcommerceCartUpdate","24.00"]);
 $cdata_end</script>
 EOF;
@@ -184,10 +184,10 @@ public function test_order_tracking_when_order_processed_before_order_received()
 		$script_type = $this->get_type_attribute();
 
 		$expected_code = <<<EOF
-<script $script_type>$cdata_start
+<script$script_type>$cdata_start
 window._paq = window._paq || []; window._paq.push(["addEcommerceItem","10","a tiny hat",["Uncategorized"],12,2]);window._paq = window._paq || []; window._paq.push(["trackEcommerceCartUpdate","24.00"]);
 $cdata_end</script>
-<script $script_type>$cdata_start
+<script$script_type>$cdata_start
 window._paq = window._paq || []; window._paq.push(["addEcommerceItem","10","a tiny hat",["Uncategorized"],12,2]);window._paq = window._paq || []; window._paq.push(["trackEcommerceOrder","11","24.00",24,"0","0",0]);
 $cdata_end</script>
 EOF;
@@ -441,15 +441,4 @@ private function set_visitor_id_cookie( $visitor_id ) {
 		$this->test_instance->setTracker( $this->tracker );
 		$this->assertEquals( $visitor_id, $this->test_instance->getTracker()->forcedVisitorId );
 	}
-
-	/**
-	 * @return string
-	 */
-	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"';
-		}
-		return $type;
-	}
 }