Remove skip from the unblocked tests and other improvements.

Author: iamdharmesh

tests/cypress/e2e/connect.test.js

@@ -23,8 +23,6 @@ describe('Admin can connect to "Mailchimp" Account', () => {
 
 		// Mailchimp lists exists and has at least one audience
 		cy.get('#mc_list_id').should('exist');
-		cy.get('#mc_list_id')
-		.children()
-		.should('have.length.greaterThan', 1); // The " — Select A List — " default option will always be present
+		cy.get('#mc_list_id').children().should('have.length.greaterThan', 1); // The " — Select A List — " default option will always be present
 	});
 });

tests/cypress/e2e/submission/update-subscribers.test.js

@@ -28,11 +28,12 @@ describe('Update Existing Subscriber?', () => {
 				console.log(`${email} exists`);
 			}
 		});
-
 	});
 
 	function generateRandomString(length = 10) {
-		return Math.random().toString(36).substring(2, 2 + length);
+		return Math.random()
+			.toString(36)
+			.substring(2, 2 + length);
 	}
 
 	it('Update existing subscribers when they resubmit the signup form if option is checked', () => {
@@ -58,7 +59,7 @@ describe('Update Existing Subscriber?', () => {
 			expect(contact.merge_fields.LNAME).to.equal(lastName);
 		});
 	});
-	
+
 	it('Verify that existing subscriber data is updated accurately without creating duplicate records', () => {
 		// Navigate to the shortcode post
 		cy.visit(blockPostPostURL);
@@ -78,7 +79,9 @@ describe('Update Existing Subscriber?', () => {
 		// Verify a duplicate contact has not been created
 		cy.getListId('10up').then((listId) => {
 			cy.getContactsFromAList(listId).then((contacts) => {
-				const filteredByEmail = contacts.filter((contact) => contact.email_address === email);
+				const filteredByEmail = contacts.filter(
+					(contact) => contact.email_address === email,
+				);
 
 				expect(filteredByEmail.length).to.equal(1); // Only one match found
 				expect(filteredByEmail[0].email_address).to.equal(email); // The one match is our email
@@ -89,7 +92,7 @@ describe('Update Existing Subscriber?', () => {
 	// TODO: This test is correct, but failing to a bug allowing contacts to be updated
 	// regardless of the "Update Existing Subscriber?" option
 	// Fix in issue 113 scheduled for 1.7.0.
-	it.skip('Do not update existing subscribers when they resubmit the signup form if option is unchecked', () => {
+	it('Do not update existing subscribers when they resubmit the signup form if option is unchecked', () => {
 		// Not sure why we have to log in here, but we do
 		cy.login(); // WP
 
@@ -106,6 +109,8 @@ describe('Update Existing Subscriber?', () => {
 
 		// Verify error
 		cy.submitFormAndVerifyError();
-		cy.get('.mc_error_msg').contains(/This email address is already subscribed to the list./i);
+		cy.get('.mc_error_msg').contains(
+			/This email address has already been subscribed to this list./i,
+		);
 	});
 });

tests/cypress/e2e/validation/email.test.js

@@ -16,7 +16,7 @@ describe('General merge field validation', () => {
 	before(() => {
 		// Load the post URLs from the JSON file
 		cy.fixture('postUrls').then((urls) => {
-			blockPostPostURL = urls.blockPostPostURL;
+			({ blockPostPostURL } = urls);
 		});
 
 		cy.login(); // WP
@@ -93,4 +93,4 @@ describe('General merge field validation', () => {
 		cy.submitFormAndVerifyError();
 		cy.get('.mc_error_msg').contains(invalidEmailErrorRegex);
 	});
-});
+});

tests/cypress/e2e/validation/us-phone.test.js

@@ -14,32 +14,34 @@ describe.skip('US Multi-Input Phone Number Validation', () => {
 
 	const validPhones = [
 		{ area: '123', detail1: '456', detail2: '7890' },
-		{ area: '987', detail1: '654', detail2: '3210' }
+		{ area: '987', detail1: '654', detail2: '3210' },
 	];
 	const invalidPhones = [
 		{ area: '123', detail1: '456', detail2: '78a0' },
-		{ area: '123', detail1: '45!', detail2: '7890' }
+		{ area: '123', detail1: '45!', detail2: '7890' },
 	];
 	const tooShortPhones = [
 		{ area: '12', detail1: '456', detail2: '789' },
-		{ area: '', detail1: '45', detail2: '7890' }
+		{ area: '', detail1: '45', detail2: '7890' },
 	];
 	const tooLongPhones = [
 		{ area: '1234', detail1: '567', detail2: '890' },
-		{ area: '123', detail1: '4567', detail2: '8901' }
+		{ area: '123', detail1: '4567', detail2: '8901' },
 	];
 
 	before(() => {
 		cy.login();
 		cy.mailchimpLoginIfNotAlreadyLoggedIn();
 
 		cy.fixture('postUrls').then((urls) => {
-			shortcodePostURL = urls.shortcodePostURL;
-			blockPostPostURL = urls.blockPostPostURL;
+			({ blockPostPostURL } = urls);
 		});
 
 		cy.getListId('10up').then((listId) => {
-			cy.updateMergeFieldByTag(listId, 'PHONE', { required: true, options: { phone_format: 'US' } }).then(() => {
+			cy.updateMergeFieldByTag(listId, 'PHONE', {
+				required: true,
+				options: { phone_format: 'US' },
+			}).then(() => {
 				cy.selectList('10up');
 			});
 		});
@@ -50,7 +52,10 @@ describe.skip('US Multi-Input Phone Number Validation', () => {
 
 	after(() => {
 		cy.getListId('10up').then((listId) => {
-			cy.updateMergeFieldByTag(listId, 'PHONE', { required: false, options: { phone_format: 'none' } });
+			cy.updateMergeFieldByTag(listId, 'PHONE', {
+				required: false,
+				options: { phone_format: 'none' },
+			});
 		});
 		cy.selectList('10up');
 		cy.setJavaScriptOption(true);

tests/cypress/e2e/validation/validate-required-fields.test.js

@@ -19,7 +19,11 @@ describe('Validate required fields', () => {
 		{ selector: '#mc_mv_MMERGE8', errorMessage: 'Date:', input: '01/01/2030' },
 		{ selector: '#mc_mv_MMERGE9', errorMessage: 'Zip Code:', input: '12345' },
 		{ selector: '#mc_mv_MMERGE10', errorMessage: 'Website:', input: 'https://10up.com' },
-		{ selector: '#mc_mv_MMERGE11', errorMessage: 'Image:', input: 'https://10up.com/wp-content/themes/10up-sept2016/assets/img/icon-strategy.png' },
+		{
+			selector: '#mc_mv_MMERGE11',
+			errorMessage: 'Image:',
+			input: 'https://10up.com/wp-content/themes/10up-sept2016/assets/img/icon-strategy.png',
+		},
 	];
 
 	const requiredSelectFields = [
@@ -34,8 +38,8 @@ describe('Validate required fields', () => {
 
 	before(() => {
 		// Load the post URLs from the JSON file
-		cy.fixture('postUrls').then((urls) => {
-			blockPostPostURL = urls.blockPostPostURL;
+		cy.fixture('postUrls').then(({ blockPostPostURL: url }) => {
+			blockPostPostURL = url;
 		});
 
 		cy.login(); // WordPress login
@@ -108,4 +112,4 @@ describe('Validate required fields', () => {
 			cy.get(field.selector).type(field.input);
 		});
 	});
-});
+});

tests/cypress/e2e/validation/validate-unrequired-fields.test.js

@@ -8,8 +8,7 @@ describe('Validate unrequired fields', () => {
 	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
@@ -37,7 +36,7 @@ describe('Validate unrequired fields', () => {
 		cy.setJavaScriptOption(true);
 	});
 
-    it('Unrequired fields can be submitted while blank', () => {
+	it('Unrequired fields can be submitted while blank', () => {
 		[shortcodePostURL, blockPostPostURL].forEach((url) => {
 			cy.visit(url);
 
@@ -64,15 +63,14 @@ describe('Validate unrequired fields', () => {
 			const email = generateRandomEmail('unrequired-validation-test');
 			cy.get('#mc_mv_EMAIL').type(email);
 
-			// // TODO: This is failing because of a bug causing single opt-in to malfunction. Fix is ready for 1.7.0.
 			// Step 6: Verify that the form was submitted successfully
-			// cy.submitFormAndVerifyWPSuccess();
+			cy.submitFormAndVerifyWPSuccess();
 
-			// // Step 7: Verify that the contact was added to the Mailchimp account via the Mailchimp API
-			// cy.verifyContactInMailchimp(email);
+			// Step 7: Verify that the contact was added to the Mailchimp account via the Mailchimp API
+			cy.verifyContactInMailchimp(email);
 
-			// // Step 8: Cleanup and delete contact
-			// cy.deleteContactFromList(email);
+			// Step 8: Cleanup and delete contact
+			cy.deleteContactFromList(email);
 
 			/**
 			 * Phone Number - Handled in /validation/us-phone.test.js
@@ -91,4 +89,4 @@ describe('Validate unrequired fields', () => {
 			// Test last name - no validation
 		});
 	});
-});
+});