From 101d0b8e171600171fee5a2160214bda1684d9e2 Mon Sep 17 00:00:00 2001
From: MaxwellGarceau <maxwellgarceau@gmail.com>
Date: Mon, 23 Dec 2024 16:12:24 -0500
Subject: [PATCH] Ensure user is logged out of mailchimp accounts for admin
 tests

---
 tests/cypress/e2e/admin.test.js   |  6 ++++++
 tests/cypress/support/commands.js | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/tests/cypress/e2e/admin.test.js b/tests/cypress/e2e/admin.test.js
index e7ba13c..a6e3aaa 100644
--- a/tests/cypress/e2e/admin.test.js
+++ b/tests/cypress/e2e/admin.test.js
@@ -23,6 +23,9 @@ describe('Admin can login and make sure plugin is activated', () => {
 	it('Admin can see "Create account" button and Can visit "Create account" settings page.', () => {
 		cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
 
+		// If logged in then log out
+		cy.mailchimpLogout();
+
 		// Check Create account button.
 		cy.get('.button.mailchimp-sf-button.button-secondary').should('be.visible');
 		cy.get('.button.mailchimp-sf-button.button-secondary').contains('Create an account');
@@ -35,6 +38,9 @@ describe('Admin can login and make sure plugin is activated', () => {
 	it("Admin shouldn't able to submit create account form with invalid data", () => {
 		cy.visit('/wp-admin/admin.php?page=mailchimp_sf_create_account');
 
+		// If logged in then log out
+		cy.mailchimpLogout();
+
 		// Submit form without filling any data.
 		cy.get('#mailchimp-sf-create-activate-account').click();
 
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index 7822282..1b9f1b7 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -49,6 +49,15 @@ Cypress.Commands.add('popup', () => {
 	return cy.wrap(popup.contents().find('body'));
 });
 
+Cypress.Commands.add('mailchimpLogout', () => {
+	// Logout if already connected.
+	cy.get('body').then(($body) => {
+		if ($body.find('input[value="Logout"]').length > 0) {
+			cy.get('input[value="Logout"]').click();
+		}
+	});
+});
+
 /**
  * Log into Mailchimp account
  * 
@@ -59,11 +68,7 @@ Cypress.Commands.add('mailchimpLogin', () => {
 	cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
 
 	// Logout if already connected.
-	cy.get('body').then(($body) => {
-		if ($body.find('input[value="Logout"]').length > 0) {
-			cy.get('input[value="Logout"]').click();
-		}
-	});
+	cy.mailchimpLogout();
 
 	// Check Mailchimp login screen for OAuth login.
 	cy.get('#mailchimp_sf_oauth_connect').should('exist');