fix uninstall e2e test failure

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

Hide file tree

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

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,6 @@ describe('MWP Uninstall', () => {
     expect(result.tables).toBeInstanceOf(Array); // sanity check
 
     console.log(`result.dbname is: ${result.dbname}`);
-
     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

diff --git a/wdio.conf.ts b/wdio.conf.ts
@@ -46,7 +46,11 @@ function checkWpDebugLogsForError() {
       throw new Error(`Found Matomo related errors/warnings in debug.log:\n- ${matomoErrors.join("\n- ")}`);
     }
   } finally {
-    fs.unlinkSync(wpDebugLogPath); // reset the wp-debug log file
+    try {
+      fs.unlinkSync(wpDebugLogPath); // reset the wp-debug log file
+    } catch (e) {
+      // ignore
+    }
   }
 }