Tests: Delete, don’t disconnect, accounts

Author: n7studios

tests/EndToEnd/forms/FormCest.php

@@ -812,11 +812,9 @@ private function _wpFormsCompleteAndSubmitForm(EndToEndTester $I, int $pageID, s
 		// Check that a review request was created.
 		$I->reviewRequestExists($I);
 
-		// Disconnect the account.
-		$I->disconnectAccount($I, $this->accountID);
-
-		// Check that the resources are no longer cached under the given account ID.
-		$I->dontSeeCachedResourcesInDatabase($I, $this->accountID);
+		// Remove the provider connection.
+		// We don't disconnect the account, as this would now revoke the tokens and cause later tests to fail.
+		$I->removeProviderConnection($I, $this->accountID);
 	}
 
 	/**

tests/EndToEnd/general/IntegrationsCest.php

@@ -215,10 +215,7 @@ public function testCredentialsAndResourcesAreDeletedOnDisconnect(EndToEndTester
 		$I->assertCount(0, $providers['convertkit']);
 
 		// Check cached resources are removed from the database on disconnection.
-		$I->dontSeeOptionInDatabase('integrate_convertkit_wpforms_custom_fields_' . $accountID);
-		$I->dontSeeOptionInDatabase('integrate_convertkit_wpforms_forms_' . $accountID);
-		$I->dontSeeOptionInDatabase('integrate_convertkit_wpforms_sequences_' . $accountID);
-		$I->dontSeeOptionInDatabase('integrate_convertkit_wpforms_tags_' . $accountID);
+		$I->dontSeeCachedResourcesInDatabase($I, $this->accountID);
 	}
 
 	/**

tests/Support/Helper/WPForms.php

@@ -565,32 +565,17 @@ public function createPageWithWPFormsShortcode($I, $formID)
 	}
 
 	/**
-	 * Disconnects the given account ID via the UI in WPForms > Settings > Integrations.
+	 * Removes the given account ID from the WPForms provider settings.
 	 *
 	 * @since   1.7.0
 	 *
 	 * @param   EndToEndTester $I         Tester.
 	 * @param   string         $accountID Account ID.
 	 */
-	public function disconnectAccount($I, $accountID)
+	public function removeProviderConnection($I, $accountID)
 	{
-		// Login as the Administrator, if we're not already logged in.
-		if ( ! $I->amLoggedInAsAdmin($I) ) {
-			$I->doLoginAsAdmin($I);
-		}
-
-		// Click Disconnect.
-		$I->amOnAdminPage('admin.php?page=wpforms-settings&view=integrations');
-		$I->click('#wpforms-integration-convertkit');
-		$I->waitForElementVisible('#wpforms-integration-convertkit .wpforms-settings-provider-accounts-list span.remove a[data-key="' . $accountID . '"]');
-		$I->click('#wpforms-integration-convertkit .wpforms-settings-provider-accounts-list span.remove a[data-key="' . $accountID . '"]');
-
-		// Confirm that we want to disconnect.
-		$I->waitForElementVisible('.jconfirm-box');
-		$I->click('.jconfirm-box button.btn-confirm');
-
-		// Confirm connection is no longer listed.
-		$I->wait(5);
-		$I->dontSeeElementInDOM('a[data-key="' . $accountID . '"]');
+		$providers = $I->grabOptionFromDatabase('wpforms_providers');
+		unset($providers['convertkit'][ $accountID ]);
+		$I->haveOptionInDatabase('wpforms_providers', $providers);
 	}
 }