Added 2 new tests.

iamdharmesh · iamdharmesh · commit 6e0a32fb465e · 2025-02-27T14:02:12.000+05:30
diff --git a/tests/cypress/e2e/settings/list.test.js b/tests/cypress/e2e/settings/list.test.js
@@ -19,7 +19,7 @@ describe('Mailchimp lists ', () => {
 		});
 	});
 
-	it('All lists from user\'s account populate the WP admin dropdown list', () => {
+	it("All lists from user's account populate the WP admin dropdown list", () => {
 		cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
 
 		const $wpLists = cy.get('#mc_list_id > option[value]:not([value=""])'); // Lists from the WP admin dropdown
@@ -42,11 +42,20 @@ describe('Mailchimp lists ', () => {
 		cy.selectList('10up');
 		cy.get('#mc-message .success_msg b').contains('Success!');
 
-        // Verify that the settings are visible if a list is saved
-        cy.get('input[value="Update Subscribe Form Settings"]').should('exist');
+		// Verify that the settings are visible if a list is saved
+		cy.get('input[value="Update Subscribe Form Settings"]').should('exist');
 	});
 
-	// This test has been decided to be skipped and marked as a "doing it wrong" site owner scenario
-	// We are not worried about this testing scenario
-	it.skip('Admin that has never saved a list can not see the form on the front end', () => {});
+	it('Admin that has never saved a list can not see the form on the front end', () => {
+		cy.wpCli('wp option delete mc_list_id').then(() => {
+			cy.visit(shortcodePostURL);
+			cy.get('#mc_signup_form').should('not.exist');
+
+			cy.visit(blockPostPostURL);
+			cy.get('#mc_signup_form').should('not.exist');
+
+			cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
+			cy.selectList('10up');
+		});
+	});
 });
diff --git a/tests/cypress/e2e/settings/settings.test.js b/tests/cypress/e2e/settings/settings.test.js
@@ -6,20 +6,14 @@ describe('Admin can update plugin settings', () => {
 	before(() => {
 		// Load the post URLs from the JSON file
 		cy.fixture('postUrls').then((urls) => {
-			shortcodePostURL = urls.shortcodePostURL;
-			blockPostPostURL = urls.blockPostPostURL;
+			({ shortcodePostURL, blockPostPostURL } = urls);
 		});
 
 		cy.login(); // WP
 		cy.mailchimpLoginIfNotAlreadyLoggedIn();
 		cy.selectList('10up'); // Ensure a list is selected
 	});
 
-	// TODO: Default settings are populated as expected
-	it.skip('The default settings populate as expected', () => {
-		// Test here...
-	});
-
 	it('Admin can set content options for signup form', () => {
 		cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
 
@@ -251,4 +245,65 @@ describe('Admin can update plugin settings', () => {
 		// Step 5: Ensure the original settings persist
 		cy.get('#mc_header_content').should('have.value', customHeader);
 	});
+
+	it('The default settings populate as expected', () => {
+		const options = [
+			'mc_header_content',
+			'mc_subheader_content',
+			'mc_submit_text',
+			'mc_nuke_all_styles',
+			'mc_custom_style',
+			'mc_form_border_width',
+			'mc_form_border_color',
+			'mc_form_background',
+			'mc_form_text_color',
+			'mc_update_existing',
+			'mc_double_optin',
+			'mc_user_id',
+			'mc_use_javascript',
+			'mc_use_datepicker',
+			'mc_use_unsub_link',
+			'mc_list_id',
+			'mc_list_name',
+			'mc_interest_groups',
+			'mc_merge_vars',
+		];
+
+		// Clear all options
+		cy.getListId('10up').then((listId) => {
+			cy.getMergeFields(listId).then((mergeFields) => {
+				const mergeFieldOptions = mergeFields.map((field) => `mc_mv_${field.tag}`);
+				options.push(...mergeFieldOptions);
+				cy.wpCli(`wp option delete ${options.join(' ')}`).then(() => {
+					cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
+					cy.mailchimpLogout();
+					cy.mailchimpLogin();
+					cy.get('.mc-user h3').contains('Logged in as: ');
+					cy.get('input[value="Logout"]').should('exist');
+
+					cy.selectList('10up');
+
+					// Verify default settings
+					cy.get('#mc_header_content').should('have.value', 'Sign up for 10up');
+					cy.get('#mc_subheader_content').should('have.value', '');
+					cy.get('#mc_submit_text').should('have.value', 'Subscribe');
+					cy.get('#mc_nuke_all_styles').should('not.be.checked');
+					cy.get('#mc_custom_style').should('not.be.checked');
+					cy.get('#mc_form_border_width').should('have.value', '1');
+					cy.get('#mc_form_border_color').should('have.value', 'E0E0E0');
+					cy.get('#mc_form_background').should('have.value', 'FFFFFF');
+					cy.get('#mc_form_text_color').should('have.value', '3F3F3f');
+					cy.get('#mc_update_existing').should('not.be.checked');
+					cy.get('#mc_double_optin').should('be.checked');
+					cy.get('#mc_use_unsub_link').should('not.be.checked');
+					cy.get('#mc_mv_FNAME').should('be.checked');
+					cy.get('#mc_mv_LNAME').should('be.checked');
+					cy.get('#mc_mv_ADDRESS').should('be.checked');
+					cy.get('#mc_mv_BIRTHDAY').should('be.checked');
+					cy.get('#mc_mv_COMPANY').should('be.checked');
+					cy.get('#mc_mv_PHONE').should('be.checked');
+				});
+			});
+		});
+	});
 });
diff --git a/tests/cypress/support/commands/mailchimpApi.js b/tests/cypress/support/commands/mailchimpApi.js
@@ -88,11 +88,11 @@ async function getContactsFromAList(listId, status = null) {
  *
  * @param {string} listId - The Mailchimp list ID to search within.
  * @param {string} email - The email address of the contact to retrieve.
- * @returns {Promise<object|null>} - A promise that resolves with the contact's details 
+ * @returns {Promise<object|null>} - A promise that resolves with the contact's details
  *                                   if found, or `null` if the contact does not exist.
- * 
+ *
  * @throws {Error} - Throws an error for unexpected failures (non-404 errors).
- * 
+ *
  * Example:
  * cy.getContact(listId, 'user@example.com').then((contact) => {
  *   if (contact) {
@@ -142,7 +142,7 @@ function getContactFromList(email, listName = '10up') {
  *
  * TODO: Configuration this to use the batch endpoint. Is the /batch endpoint worth the lift?
  * https://mailchimp.com/developer/marketing/guides/run-async-requests-batch-endpoint/#make-a-batch-operations-request
- * 
+ *
  * @param {string} listId - The Mailchimp list ID
  * @param {object} data - The data to update the merge fields with - Docs: https://mailchimp.com/developer/marketing/api/list-merges/update-merge-field/
  * @returns {Promise} - A promise that resolves when all merge fields are updated
@@ -157,35 +157,6 @@ async function updateMergeFieldsByList(listId, data) {
   return await Promise.all(updatedMergeFields);
 }
 
-// TODO: Can we implement batch synchronously?
-// async function updateMergeFieldsByList(listId, data) {
-//   const mergeFields = await getMergeFields(listId);
-
-//   // Prepare batch operations
-//   const operations = mergeFields.map((field) => ({
-//     method: "PATCH", // HTTP method for updating merge fields
-//     path: `/lists/${listId}/merge-fields/${field.merge_id}`, // API path for each merge field
-//     body: JSON.stringify({
-//       ...data,
-//       name: field.name, // Keep existing name
-//     }),
-//   }));
-
-//   try {
-//     // Send the batch request
-//     const response = await mailchimp.batches.start({
-//       operations, // Array of operations
-//     });
-
-//     console.log("Batch operation initiated:", response);
-
-//     return response;
-//   } catch (error) {
-//     console.error("Error starting batch operation:", error);
-//     throw error;
-//   }
-// }
-
 /**
  * Update merge field by tag
  *
@@ -202,10 +173,23 @@ async function updateMergeFieldByTag(listId, tag, data) {
   return response;
 }
 
+
+/**
+ * Get all merge fields for a list
+ *
+ * @param {string} listId - The Mailchimp list ID
+ * @returns {Promise} - A promise that resolves with all merge fields for the list
+ */
+Cypress.Commands.add('getMergeFields', async (listId) => {
+	return getMergeFields(listId);
+});
+
 /**
  * Get all merge fields for a list
- * 
+ *
  * Mailchimp paginates merge fields
+ * @param {string} listId - The Mailchimp list ID
+ * @returns {Promise} - A promise that resolves with all merge fields for the list
  */
 async function getMergeFields(listId) {
   let mergeFields = [];
@@ -250,8 +234,8 @@ async function updateMergeField(listId, mergeId, name, data) {
  * Wrapper function to delete a contact specifically from the "10up" Mailchimp list.
  *
  * This function wraps the generic `deleteContact` function and automatically
- * retrieves the list ID for the "10up" list. It simplifies the process of 
- * deleting contacts from this specific list by removing the need to manually 
+ * retrieves the list ID for the "10up" list. It simplifies the process of
+ * deleting contacts from this specific list by removing the need to manually
  * provide the list ID.
  *
  * @param {string} email - The email address of the contact to delete
@@ -328,4 +312,4 @@ function subscribeToListByName(email, listName = '10up') {
     cy.subscribeToList(listId, email);
     console.log(`Successfully subscribed ${email} to list ${listName}`);
   });
-}
+}
diff --git a/tests/cypress/support/commands/mailchimpLogin.js b/tests/cypress/support/commands/mailchimpLogin.js
@@ -12,14 +12,14 @@ Cypress.Commands.add('mailchimpLogout', () => {
 
 /**
  * Log into Mailchimp account
- * 
+ *
  * Not sure we should put this much logic into one command, but we need
  * the Mailchimp login functionality to test settings.test.js independently
  */
 Cypress.Commands.add('mailchimpLogin', (username = null, password = null) => {
 	username = username ?? Cypress.env('MAILCHIMP_USERNAME');
 	password = password ?? Cypress.env('MAILCHIMP_PASSWORD');
-	
+
 	cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
 
 	// Logout if already connected.
@@ -66,9 +66,9 @@ Cypress.Commands.add('mailchimpLogin', (username = null, password = null) => {
 /**
  * Adds a wrapper over the mailchimpLogin command to check if
  * a user is already logged in.
- * 
+ *
  * This is to increase testing speed
- * 
+ *
  * The name is a mouth full, but is named as such to be explicit
  */
 Cypress.Commands.add('mailchimpLoginIfNotAlreadyLoggedIn', () => {
@@ -78,8 +78,9 @@ Cypress.Commands.add('mailchimpLoginIfNotAlreadyLoggedIn', () => {
 		const hasLogout = $body.find('input[value="Logout"]').length > 0;
 		if (!hasLogout) {
 			cy.mailchimpLogin();
+			cy.get('.mc-user h3').contains('Logged in as: ');
 		} else {
 			cy.log('Already logged into Mailchimp account');
 		}
 	});
-});
+});
diff --git a/tests/cypress/support/index.js b/tests/cypress/support/index.js
@@ -24,7 +24,6 @@ before(() => {
 	// Add global setup logic here
 	cy.checkMailchimpEnv(); // Example: Check environment variables
 	cy.checkMailchimpApi(); // Throw error if we can't connect to the API
-
 	cy.log('Global setup completed!');
 
 	// Default settings for tests
