Bail early in deactivatePlugin if plugin is already inactive (#16816)

WordPress · Aug 1, 2019 · 173af26 · 173af26
1 parent 4a2c1f4
commit 173af26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/packages/e2e-test-utils/src/activate-plugin.js b/packages/e2e-test-utils/src/activate-plugin.js
@@ -15,6 +15,7 @@ export async function activatePlugin( slug ) {
 	await visitAdminPage( 'plugins.php' );
 	const disableLink = await page.$( `tr[data-slug="${ slug }"] .deactivate a` );
 	if ( disableLink ) {
+		await switchUserToTest();
 		return;
 	}
 	await page.click( `tr[data-slug="${ slug }"] .activate a` );

diff --git a/packages/e2e-test-utils/src/deactivate-plugin.js b/packages/e2e-test-utils/src/deactivate-plugin.js
@@ -13,6 +13,11 @@ import { visitAdminPage } from './visit-admin-page';
 export async function deactivatePlugin( slug ) {
 	await switchUserToAdmin();
 	await visitAdminPage( 'plugins.php' );
+	const deleteLink = await page.$( `tr[data-slug="${ slug }"] .delete a` );
+	if ( deleteLink ) {
+		await switchUserToTest();
+		return;
+	}
 	await page.click( `tr[data-slug="${ slug }"] .deactivate a` );
 	await page.waitForSelector( `tr[data-slug="${ slug }"] .delete a` );
 	await switchUserToTest();