From 4fd53ef03d919a9e61c25a07e91c688bf995e2b5 Mon Sep 17 00:00:00 2001
From: Evan Mullins <evanrm@gmail.com>
Date: Mon, 10 Jun 2024 16:02:09 -0400
Subject: [PATCH 1/4] add testIsolation for plugin tests

simplify tests when possible and add mobile nav test
---
 src/app/components/app-nav/index.js           |   1 +
 tests/cypress/integration/help.cy.js          |  23 +---
 tests/cypress/integration/home.cy.js          |  43 ++++---
 tests/cypress/integration/navigation.cy.js    |  54 ++-------
 .../cypress/integration/pages-and-posts.cy.js | 107 ++++++++----------
 tests/cypress/integration/settings.cy.js      |  59 ++++------
 tests/cypress/integration/version-check.cy.js |   4 +-
 tests/cypress/support/index.js                |   2 +-
 8 files changed, 117 insertions(+), 176 deletions(-)

diff --git a/src/app/components/app-nav/index.js b/src/app/components/app-nav/index.js
index 13af77e95..83180b7e3 100644
--- a/src/app/components/app-nav/index.js
+++ b/src/app/components/app-nav/index.js
@@ -196,6 +196,7 @@ export const MobileNav = () => {
 					<Logo />
 				</div>
 				<button
+					id="nfd-app-mobile-nav"
 					className="nfd-h-16 nfd-px-4 nfd-text-body nfd-flex nfd-items-center focus:nfd-outline-none focus:nfd-ring-2 focus:nfd-ring-inset focus:nfd-ring-primary"
 					onClick={ () => {
 						setIsOpen( true );
diff --git a/tests/cypress/integration/help.cy.js b/tests/cypress/integration/help.cy.js
index 90fb39024..b1704ef46 100644
--- a/tests/cypress/integration/help.cy.js
+++ b/tests/cypress/integration/help.cy.js
@@ -2,8 +2,8 @@
 const pluginNotificationsFixture = require( '../fixtures/plugin-notifications.json' );
 const pluginProductsFixture = require( '../fixtures/plugin-products.json' );
 
-describe( 'Help Page', function () {
-	before( () => {
+describe( 'Help Page', { testIsolation: true }, function () {
+	beforeEach( () => {
 		cy.intercept(
 			{
 				method: 'GET',
@@ -22,63 +22,50 @@ describe( 'Help Page', function () {
 			'/wp-admin/admin.php?page=' + Cypress.env( 'pluginId' ) + '#/help',
 			{ timeout: 30000 }
 		);
-		cy.injectAxe();
 	} );
 
 	it( 'Is Accessible', () => {
+		cy.injectAxe();
+		cy.wait( 500 );
 		cy.checkA11y( '.wppbh-app-body' );
 	} );
 
-	it( 'Phone Card Exists', () => {
+	it( 'Cards Each Exist', () => {
 		cy.get( '.card-help-phone' )
 			.contains( 'h3', 'Phone' )
 			.scrollIntoView()
 			.should( 'be.visible' );
-	} );
 
-	it( 'Chat Card Exists', () => {
 		cy.get( '.card-help-chat' )
 			.contains( 'h3', 'Chat' )
 			.scrollIntoView()
 			.should( 'be.visible' );
-	} );
 
-	it( 'Tweet Card Exists', () => {
 		cy.get( '.card-help-twitter' )
 			.contains( 'h3', 'Tweet' )
 			.scrollIntoView()
 			.should( 'be.visible' );
-	} );
 
-	it( 'Youtube Card Exists', () => {
 		cy.get( '.card-help-youtube' )
 			.contains( 'h3', 'YouTube' )
 			.scrollIntoView()
 			.should( 'be.visible' );
-	} );
 
-	it( 'Online Support Card Exists', () => {
 		cy.get( '.card-help-kb' )
 			.contains( 'h3', 'Knowledge Base' )
 			.scrollIntoView()
 			.should( 'be.visible' );
-	} );
 
-	it( 'Resources Card Exists', () => {
 		cy.get( '.card-help-resources' )
 			.contains( 'h3', 'Resources' )
 			.scrollIntoView()
 			.should( 'be.visible' );
-	} );
 
-	it( 'Events Card Exists', () => {
 		cy.get( '.card-help-events' )
 			.contains( 'h3', 'Events and Webinars' )
 			.scrollIntoView()
 			.should( 'be.visible' );
-	} );
 
-	it( 'Website Card Exists', () => {
 		cy.get( '.card-help-website' )
 			.contains( 'h3', 'Bluehost Website' )
 			.scrollIntoView()
diff --git a/tests/cypress/integration/home.cy.js b/tests/cypress/integration/home.cy.js
index a1a924c9f..a56c909f6 100644
--- a/tests/cypress/integration/home.cy.js
+++ b/tests/cypress/integration/home.cy.js
@@ -1,9 +1,12 @@
 // <reference types="Cypress" />
+const webinarsFixture = require( '../fixtures/webinars.json' );
+const webinarsPastFixture = require( '../fixtures/webinars-past.json' );
+const webinarsInactiveFixture = require( '../fixtures/webinars-inactive.json' );
 
-describe( 'Home Page', function () {
+describe( 'Home Page', { testIsolation: true }, function () {
 	let NewfoldRuntime;
 
-	before( () => {
+	beforeEach( () => {
 		cy.visit(
 			'/wp-admin/admin.php?page=' + Cypress.env( 'pluginId' ) + '#/home'
 		);
@@ -12,7 +15,6 @@ describe( 'Home Page', function () {
 			.then( ( data ) => {
 				NewfoldRuntime = data;
 			} );
-		cy.injectAxe();
 	} );
 
 	it( 'Site Info Exists', () => {
@@ -23,6 +25,7 @@ describe( 'Home Page', function () {
 	} );
 
 	it( 'Is Accessible', () => {
+		cy.injectAxe();
 		cy.wait( 500 );
 		cy.checkA11y( '.wppbh-app-body' );
 	} );
@@ -55,12 +58,16 @@ describe( 'Home Page', function () {
 			.should( 'be.visible' );
 	} );
 
-	it( 'Webinars Section Exists', () => {
+	it( 'Webinars Section Exists and Renders Properly', () => {
 		cy.intercept(
-			'https://cdn.hiive.space/resources/bluehost-webinars.json',
-			{ fixture: 'webinars.json' }
-		);
+			{
+				method: 'GET',
+				url: 'https://cdn.hiive.space/resources/bluehost-webinars.json',
+			},
+			webinarsFixture
+		).as( 'webinarsFixture' );
 		cy.reload();
+		cy.wait( '@webinarsFixture' );
 		cy.get( '.wppbh-webinars-banner-section' )
 			.contains(
 				'h2',
@@ -68,9 +75,7 @@ describe( 'Home Page', function () {
 			)
 			.scrollIntoView()
 			.should( 'be.visible' );
-	} );
 
-	it( 'Webinars Section Renders Correctly', () => {
 		// Title
 		cy.get( '.wppbh-webinars-banner-section' )
 			.contains(
@@ -120,19 +125,27 @@ describe( 'Home Page', function () {
 
 	it( "Webinars Section Doesn't Render When Active Propety is False", () => {
 		cy.intercept(
-			'https://cdn.hiive.space/resources/bluehost-webinars.json',
-			{ fixture: 'webinars-inactive.json' }
-		);
+			{
+				method: 'GET',
+				url: 'https://cdn.hiive.space/resources/bluehost-webinars.json',
+			},
+			webinarsInactiveFixture
+		).as( 'webinarsInactiveFixture' );
 		cy.reload();
+		cy.wait( '@webinarsInactiveFixture' );
 		cy.get( '.wppbh-webinars-banner-section' ).should( 'not.exist' );
 	} );
 
 	it( "Webinars Section Doesn't Render Items Are in the Past", () => {
 		cy.intercept(
-			'https://cdn.hiive.space/resources/bluehost-webinars.json',
-			{ fixture: 'webinars-past.json' }
-		);
+			{
+				method: 'GET',
+				url: 'https://cdn.hiive.space/resources/bluehost-webinars.json',
+			},
+			webinarsPastFixture
+		).as( 'webinarsPastFixture' );
 		cy.reload();
+		cy.wait( '@webinarsPastFixture' );
 		cy.get( '.wppbh-webinars-banner-section' ).should( 'not.exist' );
 	} );
 } );
diff --git a/tests/cypress/integration/navigation.cy.js b/tests/cypress/integration/navigation.cy.js
index 5a689f456..5d2bc1eb9 100644
--- a/tests/cypress/integration/navigation.cy.js
+++ b/tests/cypress/integration/navigation.cy.js
@@ -1,7 +1,7 @@
 // <reference types="Cypress" />
 
-describe( 'Navigation', function () {
-	before( () => {
+describe( 'Navigation', { testIsolation: true }, function () {
+	beforeEach( () => {
 		cy.visit( '/wp-admin/admin.php?page=' + Cypress.env( 'pluginId' ) );
 	} );
 
@@ -118,49 +118,19 @@ describe( 'Navigation', function () {
 		).should( 'exist' );
 	} );
 
-	// utility nav is no more, leaving this in place un case we bring it back anytime soon.
-	it.skip( 'Utility nav links properly navigates', () => {
-		cy.get( '.utility-link-Performance' ).should(
-			'not.have.class',
-			'active'
-		);
-		cy.get( '.utility-link-Performance' ).click();
-		cy.wait( 500 );
-		cy.hash().should( 'eq', '#/performance' );
-		cy.get( '.utility-link-Performance' ).should( 'have.class', 'active' );
-
-		cy.get( '.utility-link-Settings' ).click();
-		cy.wait( 500 );
-		cy.hash().should( 'eq', '#/settings' );
-		cy.get( '.utility-link-Settings' ).should( 'have.class', 'active' );
-		cy.get( '.utility-link-Performance' ).should(
-			'not.have.class',
-			'active'
-		);
-
-		cy.get( '.utility-link-Help' ).click();
-		cy.wait( 500 );
-		cy.hash().should( 'eq', '#/help' );
-		cy.get( '.utility-link-Help' ).should( 'have.class', 'active' );
-		cy.get( '.utility-link-Settings' ).should( 'not.have.class', 'active' );
-	} );
-
-	// no mobile nav, but should probably add
-	it.skip( 'Mobile nav links dispaly for mobile', () => {
-		cy.get( '.mobile-toggle' ).should( 'not.exist' );
+	it( 'Mobile nav links dispaly and link properly on mobile', () => {
+		cy.get( '#nfd-app-mobile-nav' ).should( 'not.exist' );
 
 		cy.viewport( 'iphone-x' );
-		cy.get( '.mobile-toggle' ).should( 'be.visible' );
-	} );
+		cy.get( '#nfd-app-mobile-nav' ).should( 'be.visible' );
 
-	it.skip( 'Mobile nav links properly navigates', () => {
-		cy.get( '.mobile-link-Home' ).should( 'not.exist' );
-		cy.viewport( 'iphone-x' );
-		cy.get( '.mobile-toggle' ).click();
+		cy.get( '.wppbh-app-navitem-Home' ).should( 'not.exist' );
+
+		cy.get( '#nfd-app-mobile-nav' ).click();
 		cy.wait( 500 );
-		cy.get( '.mobile-link-Home' ).should( 'be.visible' );
-		cy.get( 'button[aria-label="Close"]' ).should( 'be.visible' );
-		cy.get( 'button[aria-label="Close"]' ).click();
-		cy.get( '.mobile-link-Home' ).should( 'not.exist' );
+		cy.get( '.wppbh-app-navitem-Home' ).should( 'be.visible' );
+		cy.get( 'button.nfd-modal__close-button' ).should( 'be.visible' );
+		cy.get( 'button.nfd-modal__close-button' ).click();
+		cy.get( '.wppbh-app-navitem-Home' ).should( 'not.exist' );
 	} );
 } );
diff --git a/tests/cypress/integration/pages-and-posts.cy.js b/tests/cypress/integration/pages-and-posts.cy.js
index fe5dd6e05..df256510a 100644
--- a/tests/cypress/integration/pages-and-posts.cy.js
+++ b/tests/cypress/integration/pages-and-posts.cy.js
@@ -1,18 +1,25 @@
-describe( 'Pages & Posts', function () {
-	let NewfoldRuntime;
+describe( 'Pages & Posts', { testIsolation: true }, function () {
 
-	before( () => {
+	beforeEach( () => {
 		cy.visit(
 			'/wp-admin/admin.php?page=' +
 				Cypress.env( 'pluginId' ) +
-				'#/pages-and-posts'
+				'#/pages-and-posts',
+			{
+				onLoad() {
+					cy.window().then( ( win ) => {
+						win.NewfoldRuntime.isYithBookingActive = true;
+						win.NewfoldRuntime.isWoocommerceActive = true;
+					} );
+				},
+			}
 		);
-		cy.window()
-			.its( 'NewfoldRuntime' )
-			.then( ( data ) => {
-				NewfoldRuntime = data;
-			} );
+	} );
+
+	it( 'Is Accessible', () => {
 		cy.injectAxe();
+		cy.wait( 100 );
+		cy.checkA11y( '.wppbh-app-body' );
 	} );
 
 	it( 'Pages & Posts Exists', () => {
@@ -22,7 +29,7 @@ describe( 'Pages & Posts', function () {
 			.should( 'be.visible' );
 	} );
 
-	it( 'site pages Exists', () => {
+	it( 'Site Pages Exists', () => {
 		cy.get( '.wppbh-app-site-page' )
 			.findByText( 'Site Pages' )
 			.should( 'exist' );
@@ -55,59 +62,41 @@ describe( 'Pages & Posts', function () {
 	} );
 
 	it( 'Bookings & Appointments Exists', () => {
-		if (
-			NewfoldRuntime.isYithBookingActive &&
-			NewfoldRuntime.isWoocommerceActive
-		) {
-			cy.get( '.wppbh-app-bookings' )
-				.findByText( 'Bookings & Appointments' )
-				.should( 'exist' );
-			cy.get( '.wppbh-app-bookings' )
-				.find(
-					'a[href="edit.php?post_type=yith_booking&yith-plugin-fw-panel-skip-redirect=1"]'
-				)
-				.first()
-				.click();
-			cy.url().should(
-				'include',
-				'edit.php?post_type=yith_booking&yith-plugin-fw-panel-skip-redirect=1'
-			);
-			cy.go( 'back' );
+		cy.get( '.wppbh-app-bookings' )
+			.findByText( 'Bookings & Appointments' )
+			.should( 'exist' );
+		cy.get( '.wppbh-app-bookings' )
+			.find(
+				'a[href="edit.php?post_type=yith_booking&yith-plugin-fw-panel-skip-redirect=1"]'
+			)
+			.first()
+			.should( 'exist' );
 
-			cy.get( '.wppbh-app-bookings' )
-				.find(
-					'a[href="edit.php?post_type=yith_booking&yith-plugin-fw-panel-skip-redirect=1"] Button'
-				)
-				.last()
-				.click();
-			cy.url().should(
-				'include',
-				'edit.php?post_type=yith_booking&yith-plugin-fw-panel-skip-redirect=1'
-			);
-			cy.go( 'back' );
-		} else {
-			cy.findByText( 'Bookings & Appointments' ).should( 'not.exist' );
-		}
+		cy.get( '.wppbh-app-bookings' )
+			.find(
+				'a[href="edit.php?post_type=yith_booking&yith-plugin-fw-panel-skip-redirect=1"] Button'
+			)
+			.last()
+			.should( 'exist' );
 	} );
 
 	it( 'Products Exists', () => {
-		if ( NewfoldRuntime.isWoocommerceActive ) {
-			cy.get( '.wppbh-app-products' )
-				.findByText( 'Products' )
-				.should( 'exist' );
-			cy.get( '.wppbh-app-products' )
-				.find( 'a[href="edit.php?post_type=product"]' )
-				.click();
-			cy.url().should( 'include', 'edit.php?post_type=product' );
-			cy.go( 'back' );
+		cy.get( '.wppbh-app-products' )
+			.findByText( 'Products' )
+			.should( 'exist' );
+		cy.get( '.wppbh-app-products' )
+			.find( 'a[href="edit.php?post_type=product"]' )
+			.should( 'exist' );
 
-			cy.get( '.wppbh-app-products' )
-				.find( 'a[href="post-new.php?post_type=product"] Button' )
-				.click();
-			cy.url().should( 'include', 'post-new.php?post_type=product' );
-			cy.go( 'back' );
-		} else {
-			cy.findByText( 'Products' ).should( 'not.exist' );
-		}
+		cy.get( '.wppbh-app-products' )
+			.find( 'a[href="post-new.php?post_type=product"] Button' )
+			.should( 'exist' );
 	} );
+
+	it( 'Products and Booking does not load if Yith and Woo are not active', () => {
+		// clears edited NewfoldRuntime values
+		cy.reload();
+		cy.findByText( 'Products' ).should( 'not.exist' );
+		cy.findByText( 'Bookings & Appointments' ).should( 'not.exist' );
+	});
 } );
diff --git a/tests/cypress/integration/settings.cy.js b/tests/cypress/integration/settings.cy.js
index 83174fdfb..d279fd444 100644
--- a/tests/cypress/integration/settings.cy.js
+++ b/tests/cypress/integration/settings.cy.js
@@ -1,7 +1,7 @@
 // <reference types="Cypress" />
 
-describe( 'Settings Page', function () {
-	before( () => {
+describe( 'Settings Page', { testIsolation: true }, function () {
+	beforeEach( () => {
 		cy.visit(
 			'/wp-admin/admin.php?page=' +
 				Cypress.env( 'pluginId' ) +
@@ -15,31 +15,18 @@ describe( 'Settings Page', function () {
 		cy.checkA11y( '.wppbh-app-body' );
 	} );
 
-	it( 'Has Coming Soon', () => {
+	it( 'Has All Settings Sections', () => {
 		cy.get( '.wppbh-app-settings-coming-soon' )
 			.scrollIntoView()
 			.should( 'be.visible' );
+		// further tests exist in coming soon module
 	} );
 
-	it( 'Has Auto Updates Settings', () => {
+	it( 'Autoupdate Toggles function properly', () => {
 		cy.get( '.wppbh-app-settings-update' )
 			.scrollIntoView()
 			.should( 'be.visible' );
-	} );
-
-	it( 'Has Content Settings', () => {
-		cy.get( '.wppbh-app-settings-content' )
-			.scrollIntoView()
-			.should( 'be.visible' );
-	} );
-
-	it( 'Has Comments Settings', () => {
-		cy.get( '.wppbh-app-settings-comments' )
-			.scrollIntoView()
-			.should( 'be.visible' );
-	} );
-
-	it( 'On load update all is checked, which forces other updates to check and disabled state', () => {
+		// On load update all is checked, which forces other updates to check and disabled state
 		cy.get( '[data-id="autoupdate-all-toggle"]' )
 			.should( 'have.attr', 'aria-checked' )
 			.and( 'include', 'true' );
@@ -55,9 +42,7 @@ describe( 'Settings Page', function () {
 			.should( 'be.disabled' )
 			.should( 'have.attr', 'aria-checked' )
 			.and( 'include', 'true' );
-	} );
-
-	it( 'Disable ALL toggle, leaves everything checked, but enables them', () => {
+		//Disable ALL toggle, leaves everything checked, but enables them
 		cy.get( '[data-id="autoupdate-all-toggle"]' ).click();
 		cy.wait( 100 );
 		cy.get( '.nfd-notifications' )
@@ -78,9 +63,8 @@ describe( 'Settings Page', function () {
 			.should( 'not.be.disabled' )
 			.should( 'have.attr', 'aria-checked' )
 			.and( 'include', 'true' );
-	} );
 
-	it( 'Core toggle works', () => {
+		//Core toggle works
 		cy.get( '[data-id="autoupdate-core-toggle"]' )
 			.should( 'not.be.disabled' )
 			.should( 'have.attr', 'aria-checked' )
@@ -96,9 +80,7 @@ describe( 'Settings Page', function () {
 		cy.get( '[data-id="autoupdate-all-toggle"]' )
 			.should( 'have.attr', 'aria-checked' )
 			.and( 'include', 'false' );
-	} );
-
-	it( 'Plugins toggle works', () => {
+		//Plugins toggle works
 		cy.get( '[data-id="autoupdate-plugins-toggle"]' )
 			.should( 'not.be.disabled' )
 			.should( 'have.attr', 'aria-checked' )
@@ -114,9 +96,7 @@ describe( 'Settings Page', function () {
 		cy.get( '[data-id="autoupdate-all-toggle"]' )
 			.should( 'have.attr', 'aria-checked' )
 			.and( 'include', 'false' );
-	} );
-
-	it( 'Themes toggle works', () => {
+		// Themes toggle works
 		cy.get( '[data-id="autoupdate-themes-toggle"]' )
 			.should( 'not.be.disabled' )
 			.should( 'have.attr', 'aria-checked' )
@@ -132,9 +112,7 @@ describe( 'Settings Page', function () {
 		cy.get( '[data-id="autoupdate-all-toggle"]' )
 			.should( 'have.attr', 'aria-checked' )
 			.and( 'include', 'false' );
-	} );
-
-	it( 'All toggle activates all', () => {
+		// All toggle activates all
 		cy.get( '[data-id="autoupdate-all-toggle"]' ).click();
 		cy.wait( 100 );
 		cy.get( '[data-id="autoupdate-all-toggle"]' )
@@ -152,9 +130,7 @@ describe( 'Settings Page', function () {
 			.should( 'be.disabled' )
 			.should( 'have.attr', 'aria-checked' )
 			.and( 'include', 'true' );
-	} );
-
-	it( 'Disabling All toggle returns to previous state', () => {
+		// Disabling All toggle returns to previous state
 		cy.get( '[data-id="autoupdate-all-toggle"]' ).click();
 		cy.wait( 100 );
 		cy.get( '.nfd-notifications' )
@@ -175,9 +151,7 @@ describe( 'Settings Page', function () {
 			.should( 'not.be.disabled' )
 			.should( 'have.attr', 'aria-checked' )
 			.and( 'include', 'false' );
-	} );
-
-	it( 'All Toggle takes over again when all are enabled', () => {
+		// All Toggle takes over again when all are enabled
 		cy.get( '[data-id="autoupdate-core-toggle"]' ).click();
 		cy.get( '[data-id="autoupdate-plugins-toggle"]' ).click();
 		cy.get( '[data-id="autoupdate-themes-toggle"]' ).click();
@@ -200,6 +174,10 @@ describe( 'Settings Page', function () {
 	} );
 
 	it( 'Content Settings Work', () => {
+		cy.get( '.wppbh-app-settings-content' )
+			.scrollIntoView()
+			.should( 'be.visible' );
+
 		cy.get( '[data-id="content-revisions-select"]' ).click();
 		cy.wait( 100 );
 		cy.get( '[data-id="content-revisions-select"]' )
@@ -262,6 +240,9 @@ describe( 'Settings Page', function () {
 	} );
 
 	it( 'Comment Settings Work', () => {
+		cy.get( '.wppbh-app-settings-comments' )
+			.scrollIntoView()
+			.should( 'be.visible' );
 		cy.get( '[data-id="comments-per-page-select"]' ).click();
 		cy.wait( 500 );
 		cy.get( '[data-id="comments-per-page-select"]' )
diff --git a/tests/cypress/integration/version-check.cy.js b/tests/cypress/integration/version-check.cy.js
index 3952716a2..c561ef01e 100644
--- a/tests/cypress/integration/version-check.cy.js
+++ b/tests/cypress/integration/version-check.cy.js
@@ -1,7 +1,7 @@
 // <reference types="Cypress" />
 
-describe( 'Page', () => {
-	before( () => {
+describe( 'Page', { testIsolation: true }, () => {
+	beforeEach( () => {
 		cy.login();
 		cy.visit( '/wp-admin/site-health.php?tab=debug' );
 	} );
diff --git a/tests/cypress/support/index.js b/tests/cypress/support/index.js
index 1615106ce..acfe0e0c8 100644
--- a/tests/cypress/support/index.js
+++ b/tests/cypress/support/index.js
@@ -24,6 +24,6 @@ Cypress.on( 'uncaught:exception', ( err ) => {
 	}
 } );
 
-before( () => {
+beforeEach( () => {
 	cy.login( Cypress.env( 'wpUsername' ), Cypress.env( 'wpPassword' ) );
 } );

From 499ea988a90f5e8c19e8e217d3d82af1fc7e5f1e Mon Sep 17 00:00:00 2001
From: Evan Mullins <evanrm@gmail.com>
Date: Mon, 10 Jun 2024 16:10:42 -0400
Subject: [PATCH 2/4] eslint fix for social media component

---
 src/app/pages/settings/socialMediaAccounts.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/settings/socialMediaAccounts.js b/src/app/pages/settings/socialMediaAccounts.js
index 36369c30c..2404d7f8d 100644
--- a/src/app/pages/settings/socialMediaAccounts.js
+++ b/src/app/pages/settings/socialMediaAccounts.js
@@ -15,8 +15,11 @@ const SocialMediaAccounts = () => {
 	const getFbDetails = () => {
 		getFacebookUserProfileDetails().then( ( res ) => {
 			setFbLogin( res === 'token not found!' ? false : true );
-			if ( Array.isArray( res ) ) setLoginInfo( res[ 0 ] );
-			else setLoginInfo( res );
+			if ( Array.isArray( res ) ) {
+				setLoginInfo( res[ 0 ] );
+			} else { 
+				setLoginInfo( res );
+			}
 		} );
 	};
 

From 191acb407dbe6d9f7afe31adc978c87429cc6f3b Mon Sep 17 00:00:00 2001
From: Evan Mullins <evanrm@gmail.com>
Date: Mon, 10 Jun 2024 16:24:15 -0400
Subject: [PATCH 3/4] yet another lint fix

---
 src/app/pages/settings/socialMediaAccounts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/settings/socialMediaAccounts.js b/src/app/pages/settings/socialMediaAccounts.js
index 2404d7f8d..b4c6f203a 100644
--- a/src/app/pages/settings/socialMediaAccounts.js
+++ b/src/app/pages/settings/socialMediaAccounts.js
@@ -17,7 +17,7 @@ const SocialMediaAccounts = () => {
 			setFbLogin( res === 'token not found!' ? false : true );
 			if ( Array.isArray( res ) ) {
 				setLoginInfo( res[ 0 ] );
-			} else { 
+			} else {
 				setLoginInfo( res );
 			}
 		} );

From ebefd99c7a446a093997c17152b67ac8aa92c94c Mon Sep 17 00:00:00 2001
From: Evan Mullins <evanrm@gmail.com>
Date: Fri, 8 Nov 2024 16:23:33 -0500
Subject: [PATCH 4/4] add wpLogin and add to each tests beforeEach

---
 tests/cypress/integration/help.cy.js          |  1 +
 tests/cypress/integration/home.cy.js          |  1 +
 tests/cypress/integration/navigation.cy.js    |  1 +
 .../cypress/integration/pages-and-posts.cy.js |  3 +-
 tests/cypress/integration/settings.cy.js      |  1 +
 tests/cypress/integration/version-check.cy.js |  2 +-
 tests/cypress/support/commands.js             | 36 +++++++++++--------
 tests/cypress/support/index.js                |  7 ++--
 8 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/tests/cypress/integration/help.cy.js b/tests/cypress/integration/help.cy.js
index b1704ef46..5453ace31 100644
--- a/tests/cypress/integration/help.cy.js
+++ b/tests/cypress/integration/help.cy.js
@@ -4,6 +4,7 @@ const pluginProductsFixture = require( '../fixtures/plugin-products.json' );
 
 describe( 'Help Page', { testIsolation: true }, function () {
 	beforeEach( () => {
+		cy.wpLogin();
 		cy.intercept(
 			{
 				method: 'GET',
diff --git a/tests/cypress/integration/home.cy.js b/tests/cypress/integration/home.cy.js
index d2359929e..df10b1fc9 100644
--- a/tests/cypress/integration/home.cy.js
+++ b/tests/cypress/integration/home.cy.js
@@ -7,6 +7,7 @@ describe( 'Home Page', { testIsolation: true }, function () {
 	let NewfoldRuntime;
 
 	beforeEach( () => {
+		cy.wpLogin();
 		cy.visit(
 			'/wp-admin/admin.php?page=' + Cypress.env( 'pluginId' ) + '#/home'
 		);
diff --git a/tests/cypress/integration/navigation.cy.js b/tests/cypress/integration/navigation.cy.js
index 5d2bc1eb9..84ddf9fef 100644
--- a/tests/cypress/integration/navigation.cy.js
+++ b/tests/cypress/integration/navigation.cy.js
@@ -2,6 +2,7 @@
 
 describe( 'Navigation', { testIsolation: true }, function () {
 	beforeEach( () => {
+		cy.wpLogin();
 		cy.visit( '/wp-admin/admin.php?page=' + Cypress.env( 'pluginId' ) );
 	} );
 
diff --git a/tests/cypress/integration/pages-and-posts.cy.js b/tests/cypress/integration/pages-and-posts.cy.js
index 107f0e44e..bcf8c8ca5 100644
--- a/tests/cypress/integration/pages-and-posts.cy.js
+++ b/tests/cypress/integration/pages-and-posts.cy.js
@@ -1,7 +1,8 @@
 describe( 'Pages & Posts', { testIsolation: true }, function () {
 	let NewfoldRuntime;
 
-	before( () => {
+	beforeEach( () => {
+		cy.wpLogin();
 		cy.visit(
 			'/wp-admin/admin.php?page=' +
 				Cypress.env( 'pluginId' ) +
diff --git a/tests/cypress/integration/settings.cy.js b/tests/cypress/integration/settings.cy.js
index aa9245985..4db4ff37b 100644
--- a/tests/cypress/integration/settings.cy.js
+++ b/tests/cypress/integration/settings.cy.js
@@ -2,6 +2,7 @@
 
 describe( 'Settings Page', { testIsolation: true }, function () {
 	beforeEach( () => {
+		cy.wpLogin();
 		cy.visit(
 			'/wp-admin/admin.php?page=' +
 				Cypress.env( 'pluginId' ) +
diff --git a/tests/cypress/integration/version-check.cy.js b/tests/cypress/integration/version-check.cy.js
index c561ef01e..dadb2b031 100644
--- a/tests/cypress/integration/version-check.cy.js
+++ b/tests/cypress/integration/version-check.cy.js
@@ -2,7 +2,7 @@
 
 describe( 'Page', { testIsolation: true }, () => {
 	beforeEach( () => {
-		cy.login();
+		cy.wpLogin();
 		cy.visit( '/wp-admin/site-health.php?tab=debug' );
 	} );
 
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index cb276606d..d06aad62d 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -47,6 +47,10 @@ Cypress.Commands.add( 'login', ( username, password ) => {
 	} );
 } );
 
+Cypress.Commands.add( 'wpLogin', () => {
+	cy.login( Cypress.env( 'wpUsername' ), Cypress.env( 'wpPassword' ) );
+} );
+
 Cypress.Commands.add( 'logout', () => {
 	cy.getCookies().then( ( cookies ) => {
 		cookies.forEach( ( cookie ) => {
@@ -58,26 +62,28 @@ Cypress.Commands.add( 'logout', () => {
 Cypress.Commands.add(
 	'setPermalinkStructure',
 	( structure = '/%postname%/' ) => {
-		cy.request({
+		cy.request( {
 			method: 'GET',
 			url: '/wp-json/',
 			failOnStatusCode: false,
-		}).then(result => {
-			if(result.isOkStatusCode) {
+		} ).then( ( result ) => {
+			if ( result.isOkStatusCode ) {
 				return;
 			}
-			const permalinkWpCliCommand = `wp rewrite structure "${structure}" --hard;`;
-			const permalinkWpEnvCommand = `npx wp-env run cli ${permalinkWpCliCommand}`;
-			const permalinkWpEnvTestCommand = `npx wp-env run tests-cli ${permalinkWpCliCommand}`;
-			cy.exec( permalinkWpEnvCommand, {failOnNonZeroExit: true})
-				.then((result) => {
-					cy.request('/wp-json/');
-				});
-			cy.exec( permalinkWpEnvTestCommand, {failOnNonZeroExit: true})
-				.then((result) => {
-					cy.request('/wp-json/');
-				});
-		});
+			const permalinkWpCliCommand = `wp rewrite structure "${ structure }" --hard;`;
+			const permalinkWpEnvCommand = `npx wp-env run cli ${ permalinkWpCliCommand }`;
+			const permalinkWpEnvTestCommand = `npx wp-env run tests-cli ${ permalinkWpCliCommand }`;
+			cy.exec( permalinkWpEnvCommand, { failOnNonZeroExit: true } ).then(
+				( result ) => {
+					cy.request( '/wp-json/' );
+				}
+			);
+			cy.exec( permalinkWpEnvTestCommand, {
+				failOnNonZeroExit: true,
+			} ).then( ( result ) => {
+				cy.request( '/wp-json/' );
+			} );
+		} );
 	}
 );
 
diff --git a/tests/cypress/support/index.js b/tests/cypress/support/index.js
index acfe0e0c8..ea1f0c7db 100644
--- a/tests/cypress/support/index.js
+++ b/tests/cypress/support/index.js
@@ -24,6 +24,9 @@ Cypress.on( 'uncaught:exception', ( err ) => {
 	}
 } );
 
-beforeEach( () => {
-	cy.login( Cypress.env( 'wpUsername' ), Cypress.env( 'wpPassword' ) );
+// This needs to remain until all tests have been updated with testIsolation:
+// at that point this can be updated to a beforeEach and testIsolation can be
+// removed from the config as the default is true.
+before( () => {
+	cy.wpLogin();
 } );