Merge remote-tracking branch 'origin/fix-flaky-tests' into fix-perfor…

…mance
Kit · Nov 26, 2024 · c651ff3 · c651ff3
2 parents a88902a + 8bec7f7
commit c651ff3
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/tests/_support/Helper/Acceptance/MemberMouse.php b/tests/_support/Helper/Acceptance/MemberMouse.php
@@ -202,7 +202,7 @@ public function memberMouseCancelMemberBundle($I, $emailAddress, $bundleName)
 	{
 		// Cancel the user's bundle.
 		$I->amOnAdminPage('admin.php?page=manage_members');
-		$I->click($emailAddress);
+		$I->click('a[title="' . $emailAddress . '"]');
 		$I->click('Access Rights');
 		$I->click('a[title="Cancel ' . $bundleName . '"]');
 

diff --git a/tests/_support/Helper/Acceptance/ThirdPartyPlugin.php b/tests/_support/Helper/Acceptance/ThirdPartyPlugin.php
@@ -49,14 +49,21 @@ public function activateThirdPartyPlugin($I, $name)
 	public function deactivateThirdPartyPlugin($I, $name)
 	{
 		// Login as the Administrator.
-		$I->loginAsAdmin();
+		$I->amOnPage('wp-login.php');
+		$I->waitForElement('#user_login', 10);
+		$I->fillField('#user_login', $_ENV['TEST_SITE_ADMIN_USERNAME']);
+		$I->waitForElement('#user_pass', 10);
+		$I->fillField('#user_pass', $_ENV['TEST_SITE_ADMIN_PASSWORD']);
+
+		// Wait and complete the password field again, because sometimes it doesn't
+		// get filled the first time.
+		$I->wait(1);
+		$I->fillField('#user_pass', $_ENV['TEST_SITE_ADMIN_PASSWORD']);
+
+		$I->click('#wp-submit');
 
-		// Wait for the MemberMouse dashboard to load.
-		switch ( $name ) {
-			case 'membermouse-platform':
-				$I->waitForElementVisible('#mm-view-container');
-				break;
-		}
+		// Wait for admin interface to load.
+		$I->waitForElementVisible('body.wp-admin');
 
 		// Go to the Plugins screen in the WordPress Administration interface.
 		$I->amOnPluginsPage();

diff --git a/tests/acceptance/bundle/BundleTagCest.php b/tests/acceptance/bundle/BundleTagCest.php
@@ -310,6 +310,7 @@ public function testMemberNotTaggedWhenBundleCancelled(AcceptanceTester $I)
 	 */
 	public function _passed(AcceptanceTester $I)
 	{
+		$I->deactivateThirdPartyPlugin($I, 'membermouse-platform');
 		$I->deactivateConvertKitPlugin($I);
 		$I->resetConvertKitPlugin($I);
 	}

diff --git a/tests/acceptance/general/SettingsCest.php b/tests/acceptance/general/SettingsCest.php
@@ -310,6 +310,7 @@ public function testSaveBundleTagAssignment(AcceptanceTester $I)
 	 */
 	public function _passed(AcceptanceTester $I)
 	{
+		$I->deactivateThirdPartyPlugin($I, 'membermouse-platform');
 		$I->deactivateConvertKitPlugin($I);
 		$I->resetConvertKitPlugin($I);
 	}

diff --git a/tests/acceptance/member-update/MemberSubscribeCest.php b/tests/acceptance/member-update/MemberSubscribeCest.php
@@ -73,6 +73,7 @@ public function testMemberNameAndEmailUpdatedWhenChangedInMemberMouse(Acceptance
 	 */
 	public function _passed(AcceptanceTester $I)
 	{
+		$I->deactivateThirdPartyPlugin($I, 'membermouse-platform');
 		$I->deactivateConvertKitPlugin($I);
 		$I->resetConvertKitPlugin($I);
 	}

diff --git a/tests/acceptance/member/MemberTagCest.php b/tests/acceptance/member/MemberTagCest.php
@@ -497,6 +497,7 @@ public function testMemberNotTaggedWhenDeleted(AcceptanceTester $I)
 	 */
 	public function _passed(AcceptanceTester $I)
 	{
+		$I->deactivateThirdPartyPlugin($I, 'membermouse-platform');
 		$I->deactivateConvertKitPlugin($I);
 		$I->resetConvertKitPlugin($I);
 	}

diff --git a/tests/acceptance/product/ProductTagCest.php b/tests/acceptance/product/ProductTagCest.php
@@ -93,6 +93,9 @@ public function testMemberNotTaggedWhenProductPurchased(AcceptanceTester $I)
 
 		// Check subscriber does not exist.
 		$subscriberID = $I->apiCheckSubscriberDoesNotExist($I, $emailAddress);
+
+		// Logout.
+		$I->memberMouseLogOut($I);
 	}
 
 	/**
@@ -106,6 +109,7 @@ public function testMemberNotTaggedWhenProductPurchased(AcceptanceTester $I)
 	 */
 	public function _passed(AcceptanceTester $I)
 	{
+		$I->deactivateThirdPartyPlugin($I, 'membermouse-platform');
 		$I->deactivateConvertKitPlugin($I);
 		$I->resetConvertKitPlugin($I);
 	}