fix uninstall e2e test failure

matomo-org · Dec 25, 2024 · 5ceae8f · 5ceae8f
1 parent c33402c
commit 5ceae8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/tests/e2e-uninstall/get-matomo-tables.php b/tests/e2e-uninstall/get-matomo-tables.php
@@ -19,13 +19,19 @@
 	exit;
 }
 
+$multi = isset( $_GET['multi'] ) ? ( (int) $_GET['multi'] ) : 0;
+if ( $multi ) {
+	$dbname = preg_replace( '/_multi$/', '', $dbname );
+}
+
 $pdo   = new \PDO( "mysql:host=$host;dbname={$dbname}", 'root', 'pass' );
 $query = $pdo->prepare( 'SHOW TABLES' );
 $query->execute();
 
 $tables = $query->fetchAll( \PDO::FETCH_COLUMN );
 echo json_encode(
 	[
+		'get'    => $_GET,
 		'dbname' => $dbname,
 		'tables' => $tables,
 	]

diff --git a/tests/e2e-uninstall/uninstall.e2e.ts b/tests/e2e-uninstall/uninstall.e2e.ts
@@ -16,8 +16,7 @@ describe('MWP Uninstall', () => {
   });
 
   async function getTablesInstalled(): Promise<any> {
-    console.log('root url: ' + `${await Website.rootUrl()}/matomo-for-wordpress/tests/e2e-uninstall/get-matomo-tables.php`);
-    let result: any = await fetch(`${await Website.rootUrl()}/matomo-for-wordpress/tests/e2e-uninstall/get-matomo-tables.php`);
+    let result: any = await fetch(`${await Website.rootUrl()}/matomo-for-wordpress/tests/e2e-uninstall/get-matomo-tables.php?multi=0`);
     result = await result.text();
     try {
       result = JSON.parse(result);
@@ -67,7 +66,7 @@ describe('MWP Uninstall', () => {
     expect(result.tables).toBeInstanceOf(Array); // sanity check
 
     console.log(`result.dbname is: ${result.dbname}`);
-
+    console.log(`result.get is ${result.get}`);
     let tables = result.tables;
     tables = tables.filter((t: string) => t.includes('matomo'));
     expect(tables).toEqual([]); // check there are no tables with "matomo" in the name