From ec56f6cb596582aa2822a234fa8f133a92c9792f Mon Sep 17 00:00:00 2001 From: diosmosis Date: Wed, 25 Dec 2024 00:48:12 -0800 Subject: [PATCH] fix uninstall e2e test failure --- tests/e2e-uninstall/get-matomo-tables.php | 5 +++++ tests/e2e-uninstall/uninstall.e2e.ts | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/e2e-uninstall/get-matomo-tables.php b/tests/e2e-uninstall/get-matomo-tables.php index 2f5bf5030..c45ccac4a 100644 --- a/tests/e2e-uninstall/get-matomo-tables.php +++ b/tests/e2e-uninstall/get-matomo-tables.php @@ -19,6 +19,11 @@ 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(); diff --git a/tests/e2e-uninstall/uninstall.e2e.ts b/tests/e2e-uninstall/uninstall.e2e.ts index cfd7dff44..f08b71802 100644 --- 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 { - 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