package(e2e-test-utils): update fixtures (#54128)

* Update `activatePlugin` to redirect to `plugins.php` after plugin activation

* Update `activateTheme` to redirect to `themes.php` after theme activation

* Update promises order in `loginUser`

* Fix `isCurrentURL` import

* Add changelog for latest enhancements in `e2e-test-utils`

packages/e2e-test-utils/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+### Enhancement
+
+-    Update promise order in `loginUser` to avoid any flakiness in the tests.
+-    Update `activateTheme` to redirect to `themes.php` after theme activation, if theme redirects to some other page.
+-    Update `activatePlugin` to redirect to `plugins.php` after plugin activation, if plugin redirects to some other page.
+
 ## 10.12.0 (2023-08-31)
 
 ## 10.11.0 (2023-08-16)

packages/e2e-test-utils/src/activate-plugin.js

@@ -4,6 +4,7 @@
 import { switchUserToAdmin } from './switch-user-to-admin';
 import { switchUserToTest } from './switch-user-to-test';
 import { visitAdminPage } from './visit-admin-page';
+import { isCurrentURL } from './is-current-url';
 
 /**
  * Activates an installed plugin.
@@ -21,6 +22,10 @@ export async function activatePlugin( slug ) {
 		return;
 	}
 	await page.click( `tr[data-slug="${ slug }"] .activate a` );
+
+	if ( ! isCurrentURL( 'plugins.php' ) ) {
+		await visitAdminPage( 'plugins.php' );
+	}
 	await page.waitForSelector( `tr[data-slug="${ slug }"] .deactivate a` );
 	await switchUserToTest();
 }

packages/e2e-test-utils/src/activate-theme.js

@@ -4,6 +4,7 @@
 import { switchUserToAdmin } from './switch-user-to-admin';
 import { switchUserToTest } from './switch-user-to-test';
 import { visitAdminPage } from './visit-admin-page';
+import { isCurrentURL } from './is-current-url';
 
 /**
  * Activates an installed theme.
@@ -23,6 +24,10 @@ export async function activateTheme( slug ) {
 	}
 
 	await page.click( `div[data-slug="${ slug }"] .button.activate` );
+
+	if ( ! isCurrentURL( 'themes.php' ) ) {
+		await visitAdminPage( 'themes.php' );
+	}
 	await page.waitForSelector( `div[data-slug="${ slug }"].active` );
 	await switchUserToTest();
 }

packages/e2e-test-utils/src/login-user.js

@@ -29,6 +29,8 @@ export async function loginUser(
 	await pressKeyWithModifier( 'primary', 'a' );
 	await page.type( '#user_pass', password );
 
-	const waitForLoginNavigation = page.waitForNavigation();
-	await Promise.all( [ waitForLoginNavigation, page.click( '#wp-submit' ) ] );
+	await Promise.all( [
+		page.click( '#wp-submit' ),
+		page.waitForNavigation( { waitUntil: 'networkidle0' } ),
+	] );
 }