Don't setup load promises before navigation; Playwright doesn't work …

…that way
Automattic · Dec 15, 2021 · edea4ec · edea4ec
1 parent 36fc009
commit edea4ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/tools/e2e-commons/pages/wp-admin/login.js b/tools/e2e-commons/pages/wp-admin/login.js
@@ -20,9 +20,8 @@ export default class WPLoginPage extends WpPage {
 		await this.fill( '#user_login', credentials.username );
 		await this.fill( '#user_pass', credentials.password );
 
-		const navigationPromise = this.waitForDomContentLoaded();
 		await this.click( '#wp-submit' );
-		await navigationPromise;
+		await this.waitForDomContentLoaded();
 
 		try {
 			await this.waitForElementToBeHidden( this.selectors[ 0 ] );

diff --git a/tools/e2e-commons/pages/wp-admin/plugins.js b/tools/e2e-commons/pages/wp-admin/plugins.js
@@ -7,16 +7,14 @@ export default class PluginsPage extends WpPage {
 
 	async deactivatePlugin( pluginSlug ) {
 		const selector = `tr[data-slug='${ pluginSlug }'] a[href*='=deactivate']`;
-		const navigationPromise = this.waitForLoad();
 		await this.click( selector );
-		await navigationPromise;
+		await this.waitForLoad();
 	}
 
 	async activatePlugin( pluginSlug ) {
 		const selector = `tr[data-slug='${ pluginSlug }'] a[href*='=activate']`;
-		const navigationPromise = this.waitForLoad();
 		await this.click( selector );
-		await navigationPromise;
+		await this.waitForLoad();
 	}
 
 	async isFullScreenPopupShown() {

diff --git a/tools/e2e-commons/pages/wp-admin/themes.js b/tools/e2e-commons/pages/wp-admin/themes.js
@@ -7,8 +7,7 @@ export default class ThemesPage extends WpPage {
 
 	async activateTheme( themeSlug ) {
 		const selector = `div[data-slug='${ themeSlug }'] a[href*='=activate']`;
-		const navigationPromise = this.waitForLoad();
 		await this.click( selector );
-		await navigationPromise;
+		await this.waitForLoad();
 	}
 }