+
diff --git a/package-lock.json b/package-lock.json
index ceedfbe7..102bd95c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@mailchimp/wordpress",
- "version": "1.6.3",
+ "version": "1.7.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@mailchimp/wordpress",
- "version": "1.6.3",
+ "version": "1.7.0",
"license": "GPL-2.0-or-later",
"dependencies": {
"@wordpress/block-editor": "^13.2.0",
diff --git a/package.json b/package.json
index 92eaaf8a..ebe36650 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@mailchimp/wordpress",
- "version": "1.6.3",
+ "version": "1.7.0",
"description": "Add a Mailchimp signup form widget to your WordPress site.",
"homepage": "https://github.com/mailchimp/wordpress",
"bugs": {
diff --git a/readme.txt b/readme.txt
index 13d03dc4..5e43b2e0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
Contributors: Mailchimp
Tags: mailchimp, email, newsletter, signup, marketing
Tested up to: 6.7
-Stable tag: 1.6.3
+Stable tag: 1.7.0
License: GPL-2.0-or-later
License URI: https://spdx.org/licenses/GPL-2.0-or-later.html
@@ -81,6 +81,20 @@ If you are upgrading to version 1.2.1 and you used the widget in your sidebar pr
== Changelog ==
+= 1.7.0 - 2025-04-08 =
+* **Changed:** Enhance the Mailchimp List Subscribe Form block to allow for selecting an audience list, reorder fields, toggle field and group visibility, and various other improvements (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya) via [#126](https://github.com/mailchimp/wordpress/pull/126)).
+* **Changed:** Plugin settings page success and error messages will now use WP admin notices (props [@MaxwellGarceau](https://github.com/MaxwellGarceau), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@iamdharmesh](https://github.com/iamdharmesh) via [#85](https://github.com/mailchimp/wordpress/pull/85)).
+* **Changed:** Renamed `mailchimp_sf_global_msg` function to `mailchimp_sf_frontend_msg` to differentiate functionality from WP admin notices that are used exclusively in the WP Admin (props [@MaxwellGarceau](https://github.com/MaxwellGarceau), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@iamdharmesh](https://github.com/iamdharmesh) via [#85](https://github.com/mailchimp/wordpress/pull/85)).
+* **Changed:** Make the form field visibility dependent on the WordPress "Include?" settings instead of the Mailchimp settings (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@MaxwellGarceau](https://github.com/MaxwellGarceau) via [#137](https://github.com/mailchimp/wordpress/pull/137)).
+* **Fixed:** Ensure that form data persists when validation fails (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@MaxwellGarceau](https://github.com/MaxwellGarceau) via [#130](https://github.com/mailchimp/wordpress/pull/130)).
+* **Fixed:** Display an error message informing users that they must subscribe through the hosted form if they were previously unsubscribed (props [@iamdharmesh](https://github.com/iamdharmesh), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@MaxwellGarceau](https://github.com/MaxwellGarceau) via [#131](https://github.com/mailchimp/wordpress/pull/131), [#140](https://github.com/mailchimp/wordpress/pull/140)).
+* **Removed:** The "CSS Cheat Sheet" section from the Mailchimp settings page (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya) via [#126](https://github.com/mailchimp/wordpress/pull/126)).
+* **Removed:** The "Use JavaScript Support?" option from the Mailchimp settings page (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya) via [#126](https://github.com/mailchimp/wordpress/pull/126)).
+* **Removed:** The "Use JavaScript Datepicker?" option from the Mailchimp settings page (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya) via [#126](https://github.com/mailchimp/wordpress/pull/126)).
+* **Removed:** The "Custom Styling" settings from the Mailchimp settings page (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya) via [#126](https://github.com/mailchimp/wordpress/pull/126)).
+* **Removed:** The "Remove Mailchimp CSS" settings from the Mailchimp settings page (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya) via [#126](https://github.com/mailchimp/wordpress/pull/126)).
+* **Security:** Bump `express` from 4.21.0 to 4.21.2 (props [@dependabot](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh), [@dkotter](https://github.com/dkotter) via [#125](https://github.com/mailchimp/wordpress/pull/125)).
+
= 1.6.3 - 2025-01-30 =
* **Added:** Transform the `mailchimp_sf_shortcode` shortcode to the Mailchimp List Subscribe Form block (props [@MaxwellGarceau](https://github.com/qasumitbagthariya), [@jeffpaul](https://github.com/vikrampm1), [@dkotter](https://github.com/dkotter), [@qasumitbagthariya](https://github.com/qasumitbagthariya) via [#84](https://github.com/mailchimp/wordpress/pull/84)).
* **Removed:** Deprecated Sopresto code (props [@MaxwellGarceau](https://github.com/qasumitbagthariya), [@jeffpaul](https://github.com/vikrampm1), [@dkotter](https://github.com/dkotter) via [#98](https://github.com/mailchimp/wordpress/pull/98)).
diff --git a/tests/cypress/config.js b/tests/cypress/config.js
index 07b91585..0c7ef460 100644
--- a/tests/cypress/config.js
+++ b/tests/cypress/config.js
@@ -1,9 +1,9 @@
-const { defineConfig } = require( 'cypress' );
-const { loadConfig } = require( '@wordpress/env/lib/config' );
-const getCacheDirectory = require( '@wordpress/env/lib/config/get-cache-directory' );
+const { defineConfig } = require('cypress');
+const { loadConfig } = require('@wordpress/env/lib/config');
+const getCacheDirectory = require('@wordpress/env/lib/config/get-cache-directory');
const dotenvPlugin = require('cypress-dotenv');
-module.exports = defineConfig( {
+module.exports = defineConfig({
chromeWebSecurity: false,
fixturesFolder: 'tests/cypress/fixtures',
screenshotsFolder: 'tests/cypress/screenshots',
@@ -13,21 +13,24 @@ module.exports = defineConfig( {
reporter: 'mochawesome',
reporterOptions: {
mochaFile: 'mochawesome-[name]',
- reportDir: __dirname + '/reports',
+ reportDir: `${__dirname}/reports`,
overwrite: false,
html: false,
json: true,
},
e2e: {
- setupNodeEvents( on, config ) {
+ setupNodeEvents(on, config) {
config = dotenvPlugin(config, { path: '../../.env.test' }); // Load .env variables into Cypress
- return setBaseUrl( on, config );
+ return setBaseUrl(on, config);
},
specPattern: [
- 'tests/cypress/e2e/admin.test.js',
+ 'tests/cypress/e2e/settings/admin.test.js',
'tests/cypress/e2e/connect.test.js',
- 'tests/cypress/e2e/settings.test.js',
- 'tests/cypress/e2e/mailchimp-block.test.js',
+ 'tests/cypress/e2e/settings/list.test.js',
+ 'tests/cypress/e2e/settings/settings.test.js',
+ 'tests/cypress/e2e/submission/**.test.js',
+ 'tests/cypress/e2e/validation/**.test.js',
+ 'tests/cypress/e2e/block.test.js',
'tests/cypress/e2e/logout.test.js',
],
supportFile: 'tests/cypress/support/index.js',
@@ -38,23 +41,23 @@ module.exports = defineConfig( {
runMode: 2,
openMode: 0,
},
-} );
+});
/**
* Set WP URL as baseUrl in Cypress config.
*
* @param {Function} on function that used to register listeners on various events.
- * @param {Object} config Cypress Config object.
- * @return {Object} Updated Cypress Config object.
+ * @param {object} config Cypress Config object.
+ * @returns {object} Updated Cypress Config object.
*/
-const setBaseUrl = async ( on, config ) => {
+const setBaseUrl = async (on, config) => {
const cacheDirectory = await getCacheDirectory();
- const wpEnvConfig = await loadConfig( cacheDirectory );
+ const wpEnvConfig = await loadConfig(cacheDirectory);
- if ( wpEnvConfig ) {
+ if (wpEnvConfig) {
const port = wpEnvConfig.env.tests.port || null;
- if ( port ) {
+ if (port) {
config.baseUrl = wpEnvConfig.env.tests.config.WP_SITEURL;
}
}
diff --git a/tests/cypress/e2e/mailchimp-block.test.js b/tests/cypress/e2e/block.test.js
similarity index 97%
rename from tests/cypress/e2e/mailchimp-block.test.js
rename to tests/cypress/e2e/block.test.js
index ee3638c1..89dd5670 100644
--- a/tests/cypress/e2e/mailchimp-block.test.js
+++ b/tests/cypress/e2e/block.test.js
@@ -4,6 +4,13 @@ describe('Block Tests', () => {
before(() => {
cy.login();
+ cy.mailchimpLoginIfNotAlreadyLoggedIn();
+ cy.toggleMergeFields('check');
+
+ // Hide all interest groups
+ cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
+ cy.get('input[id^="mc_show_interest_groups_"]').uncheck();
+ cy.get('input[value="Update Subscribe Form Settings"]').first().click();
});
it('Admin can create a Signup form using Mailchimp block', () => {
diff --git a/tests/cypress/e2e/settings.test.js b/tests/cypress/e2e/settings.test.js
deleted file mode 100644
index 30acba27..00000000
--- a/tests/cypress/e2e/settings.test.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/* eslint-disable no-undef */
-describe('Admin can update plugin settings', () => {
- let shortcodePostURL = '/mailchimp-signup-form-shortcode';
- let blockPostPostURL = '/mailchimp-signup-form-block';
-
- before(() => {
- cy.login();
- });
-
- it('Admin can see list and save it', () => {
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
-
- cy.get('.mc-h2').contains('Your Lists');
- cy.get('#mc_list_id').select('10up');
- cy.get('input[value="Update List"]').click();
- cy.get('#mailchimp-sf-settings-page .notice.notice-success p').contains('Success!');
- });
-
- it('Admin can create a Signup form using the shortcode', () => {
- const postTitle = 'Mailchimp signup form - shortcode';
- const beforeSave = () => {
- cy.insertBlock('core/shortcode').then((id) => {
- cy.getBlockEditor()
- .find(`#${id} .blocks-shortcode__textarea`)
- .clear()
- .type('[mailchimpsf_form]');
- });
- };
- cy.createPost({ title: postTitle, content: '', beforeSave }).then((post) => {
- if (post) {
- shortcodePostURL = `/?p=${post.id}`;
- cy.visit(shortcodePostURL);
- cy.get('#mc_signup').should('exist');
- cy.get('#mc_mv_EMAIL').should('exist');
- cy.get('#mc_signup_submit').should('exist');
- cy.get('#mc_signup_submit').click();
- cy.get('.mc_error_msg').should('exist');
- cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
- }
- });
- });
-
- it('Admin can create a Signup form using Mailchimp block', () => {
- const postTitle = 'Mailchimp signup form - Block';
- // Creating a post with Mailchimp block using wpCLI to test the backward compatibility of the existing block.
- cy.wpCli(
- `wp post create --post_title='${postTitle}' --post_content='' --post_status='publish' --porcelain`,
- ).then((response) => {
- blockPostPostURL = `/?p=${response.stdout}`;
- cy.visit(blockPostPostURL);
- cy.get('#mc_signup').should('exist');
- cy.get('#mc_mv_EMAIL').should('exist');
- cy.get('#mc_signup_submit').should('exist');
- cy.get('#mc_signup_submit').click();
- cy.get('.mc_error_msg').should('exist');
- cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
- });
- });
-
- it('Admin can set content options for signup form', () => {
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
-
- // Set content options
- const header = 'Subscribe to our newsletter';
- const subHeader =
- 'Join our mailing list to receive the latest news and updates from our team.';
- const button = 'Subscribe Now';
- cy.get('#mc_header_content').clear().type(header);
- cy.get('#mc_subheader_content').clear().type(subHeader);
- cy.get('#mc_submit_text').clear().type(button);
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify content options
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('.mc_custom_border_hdr').contains(header);
- cy.get('#mc_subheader').contains(subHeader);
- cy.get('#mc_signup_submit').contains(button);
- });
- });
-
- it('Admin can set Merge Fields Included settings', () => {
- // Remove mailchimp CSS.
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_mv_FNAME').uncheck();
- cy.get('#mc_mv_LNAME').uncheck();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('#mc_mv_FNAME').should('not.exist');
- cy.get('#mc_mv_LNAME').should('not.exist');
- });
-
- // Reset
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_mv_FNAME').check();
- cy.get('#mc_mv_LNAME').check();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('#mc_mv_FNAME').should('exist');
- cy.get('#mc_mv_LNAME').should('exist');
- });
- });
-
- it('Admin can update groups settings', () => {
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('input[id^="mc_show_interest_groups_"]').check();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('.mc_interests_header').should('exist');
- cy.get('.mc_interest').should('exist');
- });
-
- // Reset
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('input[id^="mc_show_interest_groups_"]').uncheck();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('.mc_interests_header').should('not.exist');
- cy.get('.mc_interest').should('not.exist');
- });
- });
-
- it('Admin can set list options settings', () => {
- // display unsubscribe link.
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_use_unsub_link').check();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('#mc_unsub_link').should('exist');
- });
-
- // Reset
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_use_unsub_link').uncheck();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('#mc_unsub_link').should('not.exist');
- });
- });
-
- it('Proper error message should display if unsubscribed user try to subscribe', () => {
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_double_optin').uncheck();
- cy.get('#mc_update_existing').check();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('#mc_mv_EMAIL').should('exist');
- cy.get('#mc_mv_EMAIL').clear().type('unsubscribed_user@gmail.com');
- cy.get('#mc_signup_submit').should('exist');
- cy.get('#mc_signup_submit').click();
- cy.get('.mc_error_msg').should('exist');
- cy.get('.mc_error_msg').contains(
- 'The email address cannot be subscribed because it was previously unsubscribed, bounced, or is under review. Please sign up here.',
- );
- });
-
- // Reset
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_double_optin').check();
- cy.get('#mc_update_existing').check();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
- });
-
- it('Form data should persist if validation fails', () => {
- // Verify
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- const firstName = 'John';
- const lastName = 'Doe';
- cy.visit(url);
- cy.get('#mc_mv_EMAIL').should('exist');
- cy.get('#mc_mv_FNAME').clear().type(firstName);
- cy.get('#mc_mv_LNAME').clear().type(lastName);
- cy.get('#mc_signup_submit').should('exist');
- cy.get('#mc_signup_submit').click();
- cy.get('.mc_error_msg').should('exist');
- cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
- cy.get('#mc_mv_FNAME').should('have.value', firstName);
- cy.get('#mc_mv_LNAME').should('have.value', lastName);
- });
- });
-});
diff --git a/tests/cypress/e2e/settings/list.test.js b/tests/cypress/e2e/settings/list.test.js
index 311e3c21..2c1d76f6 100644
--- a/tests/cypress/e2e/settings/list.test.js
+++ b/tests/cypress/e2e/settings/list.test.js
@@ -6,8 +6,7 @@ describe('Mailchimp lists ', () => {
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
@@ -40,7 +39,7 @@ describe('Mailchimp lists ', () => {
// Verify that list can be saved
cy.get('.mc-h2').contains('Your Lists');
cy.selectList('10up');
- cy.get('#mc-message .success_msg b').contains('Success!');
+ cy.get('.notice.notice-success.is-dismissible').first().contains('Success!');
// Verify that the settings are visible if a list is saved
cy.get('input[value="Update Subscribe Form Settings"]').should('exist');
diff --git a/tests/cypress/e2e/settings/settings.test.js b/tests/cypress/e2e/settings/settings.test.js
index 40b0e98b..acfcd152 100644
--- a/tests/cypress/e2e/settings/settings.test.js
+++ b/tests/cypress/e2e/settings/settings.test.js
@@ -36,97 +36,6 @@ describe('Admin can update plugin settings', () => {
});
});
- it('Admin can remove mailchimp CSS', () => {
- // Remove mailchimp CSS.
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_nuke_all_styles').check();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('#mc_subheader').should('not.have.css', 'margin-bottom', '18px');
- });
-
- // Enable mailchimp CSS.
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_nuke_all_styles').uncheck();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('#mc_subheader').should('have.css', 'margin-bottom', '18px');
- });
- });
-
- it('Admin can set custom styling on signup form', () => {
- // Enable custom styling and set values.
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_custom_style').check();
- cy.get('#mc_form_border_width').clear().type('10');
- cy.get('#mc_form_border_color').clear().type('000000');
- cy.get('#mc_form_text_color').clear().type('FF0000');
- cy.get('#mc_form_background').clear().type('00FF00');
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('#mc_signup form').should('have.css', 'border-width', '10px');
- cy.get('#mc_signup form').should('have.css', 'border-color', 'rgb(0, 0, 0)');
- cy.get('#mc_signup form').should('have.css', 'color', 'rgb(255, 0, 0)');
- cy.get('#mc_signup form').should('have.css', 'background-color', 'rgb(0, 255, 0)');
-
- // Form is able to be submitted with custom styles
- cy.get('#mc_signup_submit')
- .scrollIntoView({ offset: { top: -100, left: 0 } })
- .should('be.visible') // Check if the button is visible
- .and('not.be.disabled'); // Ensure the button is not disabled
-
- // Ensure that custom CSS does not cover submit button
- cy.get('#mc_signup_submit').then(($el) => {
- const rect = $el[0].getBoundingClientRect();
-
- // Check that the element is within the viewport
- cy.window().then((win) => {
- const windowHeight = win.innerHeight;
- const windowWidth = win.innerWidth;
-
- expect(rect.top).to.be.greaterThan(0);
- expect(rect.left).to.be.greaterThan(0);
- expect(windowHeight).to.be.greaterThan(0);
- expect(windowWidth).to.be.greaterThan(0);
- expect(rect.bottom).to.be.lessThan(windowHeight);
- expect(rect.right).to.be.lessThan(windowWidth);
- });
-
- // Check if the center of the element is not covered by another element
- const centerX = rect.x + $el[0].offsetWidth / 2;
- const centerY = rect.y + $el[0].offsetHeight / 2;
-
- cy.document().then((doc) => {
- const topElement = doc.elementFromPoint(centerX, centerY);
- expect(topElement).to.equal($el[0]);
- });
- });
- });
-
- // Reset
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_custom_style').uncheck();
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Verify base styles
- [shortcodePostURL, blockPostPostURL].forEach((url) => {
- cy.visit(url);
- cy.get('#mc_signup form').should('not.have.css', 'border-width', '10px');
- cy.get('#mc_signup form').should('not.have.css', 'border-color', 'rgb(0, 0, 0)');
- cy.get('#mc_signup form').should('not.have.css', 'color', 'rgb(255, 0, 0)');
- cy.get('#mc_signup form').should('not.have.css', 'background-color', 'rgb(0, 255, 0)');
- });
- });
-
it('Admin can set Merge Fields Included settings', () => {
// Ensure that all current merge tags are up to date and saved
cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
@@ -140,7 +49,6 @@ describe('Admin can update plugin settings', () => {
cy.get('#mc_mv_ADDRESS').uncheck();
cy.get('#mc_mv_BIRTHDAY').uncheck();
cy.get('#mc_mv_COMPANY').uncheck();
- cy.get('#mc_mv_PHONE').uncheck();
cy.get('input[value="Update Subscribe Form Settings"]').first().click();
// Verify
@@ -151,7 +59,6 @@ describe('Admin can update plugin settings', () => {
cy.get('#mc_mv_ADDRESS-addr1').should('not.exist'); // The address field has several inputs
cy.get('#mc_mv_BIRTHDAY').should('not.exist');
cy.get('#mc_mv_COMPANY').should('not.exist');
- cy.get('#mc_mv_PHONE').should('not.exist');
});
// Reset and recheck all merge fields
@@ -161,7 +68,6 @@ describe('Admin can update plugin settings', () => {
cy.get('#mc_mv_ADDRESS').check();
cy.get('#mc_mv_BIRTHDAY').check();
cy.get('#mc_mv_COMPANY').check();
- cy.get('#mc_mv_PHONE').check();
cy.get('input[value="Update Subscribe Form Settings"]').first().click();
// Verify
@@ -172,7 +78,30 @@ describe('Admin can update plugin settings', () => {
cy.get('#mc_mv_ADDRESS-addr1').should('exist'); // The address field has several inputs
cy.get('#mc_mv_BIRTHDAY').should('exist');
cy.get('#mc_mv_COMPANY').should('exist');
- cy.get('#mc_mv_PHONE').should('exist');
+ });
+ });
+
+ it('Admin can update groups settings', () => {
+ cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
+ cy.get('input[id^="mc_show_interest_groups_"]').check();
+ cy.get('input[value="Update Subscribe Form Settings"]').first().click();
+
+ // Verify
+ [shortcodePostURL, blockPostPostURL].forEach((url) => {
+ cy.visit(url);
+ cy.get('.mc_interests_header').should('exist');
+ cy.get('.mc_interest').should('exist');
+ });
+
+ // Reset
+ cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
+ cy.get('input[id^="mc_show_interest_groups_"]').uncheck();
+ cy.get('input[value="Update Subscribe Form Settings"]').first().click();
+
+ [shortcodePostURL, blockPostPostURL].forEach((url) => {
+ cy.visit(url);
+ cy.get('.mc_interests_header').should('not.exist');
+ cy.get('.mc_interest').should('not.exist');
});
});
@@ -183,38 +112,70 @@ describe('Admin can update plugin settings', () => {
it('Admin can set list options settings', () => {
// Remove mailchimp JavaScript support.
cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_use_javascript').uncheck();
- cy.get('#mc_use_datepicker').uncheck();
cy.get('#mc_use_unsub_link').check();
cy.get('input[value="Update Subscribe Form Settings"]').first().click();
// Verify
[shortcodePostURL, blockPostPostURL].forEach((url) => {
cy.visit(url);
- cy.get('#mc_submit_type').should('have.value', 'html');
- cy.get('#mc_mv_BIRTHDAY').should('not.have.class', 'hasDatepicker');
- cy.get('#mc_mv_BIRTHDAY').click();
- cy.get('#ui-datepicker-div').should('not.exist');
cy.get('#mc_unsub_link').should('exist');
});
// Reset
cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_use_javascript').check();
- cy.get('#mc_use_datepicker').check();
cy.get('#mc_use_unsub_link').uncheck();
cy.get('input[value="Update Subscribe Form Settings"]').first().click();
[shortcodePostURL, blockPostPostURL].forEach((url) => {
cy.visit(url);
- cy.get('#mc_submit_type').should('have.value', 'js');
- cy.get('#mc_mv_BIRTHDAY').should('have.class', 'hasDatepicker');
- cy.get('#mc_mv_BIRTHDAY').click();
- cy.get('#ui-datepicker-div').should('exist');
cy.get('#mc_unsub_link').should('not.exist');
});
});
+ it('Proper error message should display if unsubscribed user try to subscribe', () => {
+ cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
+ cy.get('#mc_double_optin').uncheck();
+ cy.get('#mc_update_existing').check();
+ cy.get('input[value="Update Subscribe Form Settings"]').first().click();
+
+ // Verify
+ [shortcodePostURL, blockPostPostURL].forEach((url) => {
+ cy.visit(url);
+ cy.get('#mc_mv_EMAIL').should('exist');
+ cy.get('#mc_mv_EMAIL').clear().type('unsubscribed_user@gmail.com');
+ cy.get('#mc_signup_submit').should('exist');
+ cy.get('#mc_signup_submit').click();
+ cy.get('.mc_error_msg').should('exist');
+ cy.get('.mc_error_msg').contains(
+ 'The email address cannot be subscribed because it was previously unsubscribed, bounced, or is under review. Please sign up here.',
+ );
+ });
+
+ // Reset
+ cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
+ cy.get('#mc_double_optin').check();
+ cy.get('#mc_update_existing').check();
+ cy.get('input[value="Update Subscribe Form Settings"]').first().click();
+ });
+
+ it('Form data should persist if validation fails', () => {
+ // Verify
+ [shortcodePostURL, blockPostPostURL].forEach((url) => {
+ const firstName = 'John';
+ const lastName = 'Doe';
+ cy.visit(url);
+ cy.get('#mc_mv_EMAIL').should('exist');
+ cy.get('#mc_mv_FNAME').clear().type(firstName);
+ cy.get('#mc_mv_LNAME').clear().type(lastName);
+ cy.get('#mc_signup_submit').should('exist');
+ cy.get('#mc_signup_submit').click();
+ cy.get('.mc_error_msg').should('exist');
+ cy.get('.mc_error_msg').contains('Email Address: This value should not be blank.');
+ cy.get('#mc_mv_FNAME').should('have.value', firstName);
+ cy.get('#mc_mv_LNAME').should('have.value', lastName);
+ });
+ });
+
// TODO: Add case for separate account login and settings get reset.
it('Ensure settings persist between logging out and logging back in of Mailchimp account', () => {
// Step 1: Visit Mailchimp settings page
@@ -227,9 +188,9 @@ describe('Admin can update plugin settings', () => {
cy.get('input[value="Update Subscribe Form Settings"]').first().click();
// Verify the custom header is saved
- cy.get('#mc-message .success_msg').contains(
- 'Successfully Updated your List Subscribe Form Settings!',
- );
+ cy.get('.notice.notice-success.is-dismissible')
+ .last()
+ .contains('Successfully Updated your List Subscribe Form Settings!');
cy.get('#mc_header_content').should('have.value', customHeader);
// Step 3: Log out of the Mailchimp account
@@ -287,12 +248,6 @@ describe('Admin can update plugin 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');
diff --git a/tests/cypress/e2e/submission/double-opt-in-subscribe.test.js b/tests/cypress/e2e/submission/double-opt-in-subscribe.test.js
index f89f011e..fa14de4c 100644
--- a/tests/cypress/e2e/submission/double-opt-in-subscribe.test.js
+++ b/tests/cypress/e2e/submission/double-opt-in-subscribe.test.js
@@ -7,8 +7,7 @@ describe.skip('Double Opt-in Subscriptions', () => {
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
diff --git a/tests/cypress/e2e/submission/js-submission.test.js b/tests/cypress/e2e/submission/js-submission.test.js
index 11fbaeef..5a43d455 100644
--- a/tests/cypress/e2e/submission/js-submission.test.js
+++ b/tests/cypress/e2e/submission/js-submission.test.js
@@ -7,7 +7,7 @@ describe('JavaScript submission', () => {
before(() => {
// Load the post URLs from the JSON file
cy.fixture('postUrls').then((urls) => {
- blockPostPostURL = urls.blockPostPostURL;
+ ({ blockPostPostURL } = urls);
});
cy.login(); // WP
@@ -15,9 +15,6 @@ describe('JavaScript submission', () => {
cy.selectList('10up'); // Ensure list is selected, refreshes Mailchimp data with WP
- // Set JS support to enabled
- cy.setJavaScriptOption(true);
-
// Disable double opt-in
cy.setDoubleOptInOption(false);
@@ -25,12 +22,7 @@ describe('JavaScript submission', () => {
cy.toggleMergeFields('uncheck');
});
- beforeEach(() => {
- cy.visit(blockPostPostURL);
- setUpForm();
- });
-
- function setUpForm() {
+ function setUpForm() {
// Step 1: Assert form contains setup elements
// Email
cy.get('#mc_signup').should('exist');
@@ -49,6 +41,11 @@ describe('JavaScript submission', () => {
cy.get('#mc_signup_submit').click();
}
+ beforeEach(() => {
+ cy.visit(blockPostPostURL);
+ setUpForm();
+ });
+
it('Disables the submit button before attempting submission', () => {
submitEmail('invalidemail@--'); // Submit blank email
@@ -98,10 +95,9 @@ describe('JavaScript submission', () => {
cy.get('.mc_success_msg').should('exist').contains('success', { matchCase: false });
// Step 6: Verify that the contact was added to the Mailchimp account via the Mailchimp API
- cy.wait(5000)
- .verifyContactInMailchimp(email);
+ cy.wait(5000).verifyContactInMailchimp(email);
// Step 7: Cleanup and delete contact
cy.deleteContactFromList(email);
});
-});
\ No newline at end of file
+});
diff --git a/tests/cypress/e2e/submission/resubscribe.test.js b/tests/cypress/e2e/submission/resubscribe.test.js
index a38d0cf8..ababde48 100644
--- a/tests/cypress/e2e/submission/resubscribe.test.js
+++ b/tests/cypress/e2e/submission/resubscribe.test.js
@@ -6,8 +6,7 @@ describe.skip('Resubscribe actions', () => {
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
@@ -23,4 +22,4 @@ describe.skip('Resubscribe actions', () => {
it.skip('Subscribers who have previously unsubscribed should receive a link to the Mailchimp self hosted sign up form', () => {
// Write test...
});
-});
\ No newline at end of file
+});
diff --git a/tests/cypress/e2e/submission/unsubscribe.test.js b/tests/cypress/e2e/submission/unsubscribe.test.js
index 76f79883..acd2b9ba 100644
--- a/tests/cypress/e2e/submission/unsubscribe.test.js
+++ b/tests/cypress/e2e/submission/unsubscribe.test.js
@@ -8,8 +8,7 @@ describe('Unsubscribe form', () => {
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
@@ -40,7 +39,7 @@ describe('Unsubscribe form', () => {
// Assert unsubscribe link exists
cy.get('a[href*="/unsubscribe"]').should('exist');
});
- })
+ });
it('unsubscribes valid emails that were previously subscribed to a list', () => {
const email = generateRandomEmail('previously-subscribed-email');
@@ -58,8 +57,7 @@ describe('Unsubscribe form', () => {
// Extract the base URL
const urlObject = new URL(url);
baseUrl = `${urlObject.protocol}//${urlObject.host}`;
- });
-
+ });
// Assert unsubscribe link exists
cy.get('a[href*="/unsubscribe"]').should('exist');
@@ -75,8 +73,7 @@ describe('Unsubscribe form', () => {
cy.get('body').should('contain', 'Unsubscribe Successful');
// Navigate back to the website button exists
- cy.contains('a', 'return to our website')
- .should('exist');
+ cy.contains('a', 'return to our website').should('exist');
// Verify contact exists in Mailchimp with status 'unsubscribed'
cy.verifyContactInMailchimp(email, '10up', 'unsubscribed').then((contact) => {
@@ -85,7 +82,7 @@ describe('Unsubscribe form', () => {
// Delete contact to clean up
cy.deleteContactFromList(email);
});
-
+
// Navigate to back website
// NOTE: The website URL is site in Mailchimp and it won't accept localhost or our test URL
// TODO: Assert that we're back on our website (we currently have no way to set this)
@@ -132,6 +129,6 @@ describe('Unsubscribe form', () => {
});
// NOTE: We can not set the "return to website" URL from the Mailchimp plugin or through the API.
- // Alternative proposals on issue #91 and #92 to add a user tutorial
+ // Alternative proposals on issue #91 and #92 to add a user tutorial
// it.skip('redirects the user back to the website when the user is finished unsubscribing and clicks the back link', () => {});
-});
\ No newline at end of file
+});
diff --git a/tests/cypress/e2e/submission/update-subscribers.test.js b/tests/cypress/e2e/submission/update-subscribers.test.js
index 59cc9794..b27974c5 100644
--- a/tests/cypress/e2e/submission/update-subscribers.test.js
+++ b/tests/cypress/e2e/submission/update-subscribers.test.js
@@ -6,7 +6,7 @@ describe('Update Existing Subscriber?', () => {
before(() => {
// Load the post URLs from the JSON file
cy.fixture('postUrls').then((urls) => {
- blockPostPostURL = urls.blockPostPostURL;
+ ({ blockPostPostURL } = urls);
});
cy.login(); // WP
diff --git a/tests/cypress/e2e/validation/address.test.js b/tests/cypress/e2e/validation/address.test.js
index 03bc31fd..5ddc2942 100644
--- a/tests/cypress/e2e/validation/address.test.js
+++ b/tests/cypress/e2e/validation/address.test.js
@@ -23,9 +23,9 @@ describe('Address Field Validation', () => {
cy.login(); // Log into WordPress
cy.mailchimpLoginIfNotAlreadyLoggedIn(); // Log into Mailchimp
- // Load post URLs for shortcode and block post tests
+ // Load the post URLs from the JSON file
cy.fixture('postUrls').then((urls) => {
- blockPostPostURL = urls.blockPostPostURL;
+ ({ blockPostPostURL } = urls);
});
// Set address fields (Addr 1 and City) as required
@@ -34,9 +34,6 @@ describe('Address Field Validation', () => {
cy.selectList('10up'); // Refresh list in WordPress
});
});
-
- // Test validation without JS to ensure error handling mechanism for all scenarios
- cy.setJavaScriptOption(false);
});
after(() => {
@@ -46,7 +43,6 @@ describe('Address Field Validation', () => {
cy.selectList('10up'); // Refresh list in WordPress
});
});
- cy.setJavaScriptOption(true);
});
it('Valid addresses submit', () => {
diff --git a/tests/cypress/e2e/validation/email.test.js b/tests/cypress/e2e/validation/email.test.js
index 9a88f32d..7d5246a8 100644
--- a/tests/cypress/e2e/validation/email.test.js
+++ b/tests/cypress/e2e/validation/email.test.js
@@ -28,13 +28,6 @@ describe('General merge field validation', () => {
// Disable all merge fields
cy.toggleMergeFields('uncheck');
cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Test validation without JS to ensure error handling mechanism for all scenarios
- cy.setJavaScriptOption(false);
- });
-
- after(() => {
- cy.setJavaScriptOption(true);
});
it('Invalid email addresses fail validation', () => {
diff --git a/tests/cypress/e2e/validation/us-phone.test.js b/tests/cypress/e2e/validation/us-phone.test.js
index 5cb4290e..a523a7fc 100644
--- a/tests/cypress/e2e/validation/us-phone.test.js
+++ b/tests/cypress/e2e/validation/us-phone.test.js
@@ -37,28 +37,25 @@ describe.skip('US Multi-Input Phone Number Validation', () => {
({ blockPostPostURL } = urls);
});
- cy.getListId('10up').then((listId) => {
- cy.updateMergeFieldByTag(listId, 'PHONE', {
- required: true,
- options: { phone_format: 'US' },
- }).then(() => {
- cy.selectList('10up');
- });
- });
-
- // Test validation without JS to ensure error handling mechanism for all scenarios
- cy.setJavaScriptOption(false);
+ // cy.getListId('10up').then((listId) => {
+ // cy.updateMergeFieldByTag(listId, 'PHONE', {
+ // required: true,
+ // options: { phone_format: 'US' },
+ // }).then(() => {
+ // cy.selectList('10up');
+ // });
+ // });
});
after(() => {
- cy.getListId('10up').then((listId) => {
- cy.updateMergeFieldByTag(listId, 'PHONE', {
- required: false,
- options: { phone_format: 'none' },
- });
- });
- cy.selectList('10up');
- cy.setJavaScriptOption(true);
+ // cy.getListId('10up').then((listId) => {
+ // cy.updateMergeFieldByTag(listId, 'PHONE', {
+ // required: false,
+ // options: { phone_format: 'none' },
+ // }).then(() => {
+ // cy.selectList('10up');
+ // });
+ // });
});
function fillPhoneInputs(phone) {
diff --git a/tests/cypress/e2e/validation/validate-required-fields.test.js b/tests/cypress/e2e/validation/validate-required-fields.test.js
index e42612c0..9bbff306 100644
--- a/tests/cypress/e2e/validation/validate-required-fields.test.js
+++ b/tests/cypress/e2e/validation/validate-required-fields.test.js
@@ -46,10 +46,20 @@ describe('Validate required fields', () => {
cy.mailchimpLoginIfNotAlreadyLoggedIn();
// Set all merge fields to required in the Mailchimp test user account
- cy.setMergeFieldsRequired(true);
-
- // Test validation without JS to ensure error handling mechanism for all scenarios
- cy.setJavaScriptOption(false);
+ cy.setMergeFieldsRequired(true, '10up', [
+ 'FNAME',
+ 'LNAME',
+ 'ADDRESS',
+ 'BIRTHDAY',
+ 'COMPANY',
+ 'MMERGE8',
+ 'MMERGE9',
+ 'MMERGE10',
+ 'MMERGE11',
+ 'MMERGE7',
+ 'MMERGE6',
+ 'PHONE',
+ ]);
});
after(() => {
@@ -57,13 +67,23 @@ describe('Validate required fields', () => {
cy.login(); // WordPress login
// Cleanup: Set all merge fields to not required in the Mailchimp test user account
- cy.setMergeFieldsRequired(false);
+ cy.setMergeFieldsRequired(false, '10up', [
+ 'FNAME',
+ 'LNAME',
+ 'ADDRESS',
+ 'BIRTHDAY',
+ 'COMPANY',
+ 'MMERGE8',
+ 'MMERGE9',
+ 'MMERGE10',
+ 'MMERGE11',
+ 'MMERGE7',
+ 'MMERGE6',
+ 'PHONE',
+ ]);
// Cleanup: Uncheck all optional merge fields
cy.toggleMergeFields('uncheck');
-
- // Cleanup: Re-enable JS support
- cy.setJavaScriptOption(true);
});
// TODO: Validation errors clear the entire form. We should fix this.
@@ -72,7 +92,14 @@ describe('Validate required fields', () => {
cy.get('#mc_mv_EMAIL').clear().type(email); // Email is always required
requiredFields.forEach((field) => {
- cy.get(field.selector).clear().type(field.input);
+ if (field.selector === '#mc_mv_PHONE') {
+ const phone = field.input.split('-');
+ cy.get('#mc_mv_PHONE-area').clear().type(phone[0]);
+ cy.get('#mc_mv_PHONE-detail1').clear().type(phone[1]);
+ cy.get('#mc_mv_PHONE-detail2').clear().type(phone[2]);
+ } else {
+ cy.get(field.selector).clear().type(field.input);
+ }
cy.get('body').click(0, 0); // Click outside the field to clear the datepicker modal
});
@@ -94,13 +121,19 @@ describe('Validate required fields', () => {
// Ensure the form exists
cy.get('#mc_signup').should('exist');
+ // Fill out entire form everytime so we can narrow tests to one input at a time
+ fillOutAllFields();
+
// Test validation for each required field
requiredFields.forEach((field) => {
- // Fill out entire form everytime so we can narrow tests to one input at a time
- fillOutAllFields();
-
// Submit the form without input to trigger validation
- cy.get(field.selector).clear(); // Ensure field is empty
+ if (field.selector === '#mc_mv_PHONE') {
+ cy.get('#mc_mv_PHONE-area').clear();
+ cy.get('#mc_mv_PHONE-detail1').clear();
+ cy.get('#mc_mv_PHONE-detail2').clear();
+ } else {
+ cy.get(field.selector).clear(); // Ensure field is empty
+ }
cy.get('body').click(0, 0); // Click outside the field to clear the datepicker modal
cy.get('#mc_signup_submit').click();
@@ -109,7 +142,15 @@ describe('Validate required fields', () => {
cy.get('.mc_error_msg').should('include.text', field.errorMessage);
// Fill in the field
- cy.get(field.selector).type(field.input);
+ if (field.selector === '#mc_mv_PHONE') {
+ const phone = field.input.split('-');
+ cy.get('#mc_mv_PHONE-area').clear().type(phone[0]);
+ cy.get('#mc_mv_PHONE-detail1').clear().type(phone[1]);
+ cy.get('#mc_mv_PHONE-detail2').clear().type(phone[2]);
+ } else {
+ cy.get(field.selector).type(field.input);
+ }
+ cy.get('body').click(0, 0); // Click outside the field to clear the datepicker modal
});
});
});
diff --git a/tests/cypress/e2e/validation/validate-unrequired-fields.test.js b/tests/cypress/e2e/validation/validate-unrequired-fields.test.js
index 98f3426c..d14bf41b 100644
--- a/tests/cypress/e2e/validation/validate-unrequired-fields.test.js
+++ b/tests/cypress/e2e/validation/validate-unrequired-fields.test.js
@@ -20,9 +20,6 @@ describe('Validate unrequired fields', () => {
// Enable all merge fields
cy.toggleMergeFields('check');
cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-
- // Test validation without JS to ensure error handling mechanism for all scenarios
- cy.setJavaScriptOption(false);
});
after(() => {
@@ -32,8 +29,6 @@ describe('Validate unrequired fields', () => {
// Cleanup
cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
cy.toggleMergeFields('uncheck'); // TODO: Do I need to uncheck all merge fields?
-
- cy.setJavaScriptOption(true);
});
it('Unrequired fields can be submitted while blank', () => {
@@ -55,7 +50,6 @@ describe('Validate unrequired fields', () => {
cy.get('#mc_mv_ADDRESS-country').should('exist'); // Country
cy.get('#mc_mv_BIRTHDAY').should('exist');
cy.get('#mc_mv_COMPANY').should('exist');
- cy.get('#mc_mv_PHONE').should('exist');
// Validation assertions
diff --git a/tests/cypress/support/commands/mailchimpApi.js b/tests/cypress/support/commands/mailchimpApi.js
index c09c009a..8596b31e 100644
--- a/tests/cypress/support/commands/mailchimpApi.js
+++ b/tests/cypress/support/commands/mailchimpApi.js
@@ -148,10 +148,15 @@ function getContactFromList(email, listName = '10up') {
* @returns {Promise} - A promise that resolves when all merge fields are updated
*/
Cypress.Commands.add('updateMergeFieldsByList', updateMergeFieldsByList);
-async function updateMergeFieldsByList(listId, data) {
+async function updateMergeFieldsByList(listId, data, fields = []) {
const mergeFields = await getMergeFields(listId);
const updatedMergeFields = mergeFields.map((field) => {
- return updateMergeField(listId, field.merge_id, field.name, data);
+ // If fields are provided, check if the field is in the list
+ if (fields.length > 0 && !fields.includes(field.tag)) {
+ return Promise.resolve(); // Skip this field
+ } else {
+ return updateMergeField(listId, field.merge_id, field.name, data);
+ }
});
return await Promise.all(updatedMergeFields);
diff --git a/tests/cypress/support/commands/mailchimpLogin.js b/tests/cypress/support/commands/mailchimpLogin.js
index 64c221dc..e439639f 100644
--- a/tests/cypress/support/commands/mailchimpLogin.js
+++ b/tests/cypress/support/commands/mailchimpLogin.js
@@ -16,9 +16,9 @@ Cypress.Commands.add('mailchimpLogout', () => {
* 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');
+Cypress.Commands.add('mailchimpLogin', (user = null, pass = null) => {
+ const username = user ?? Cypress.env('MAILCHIMP_USERNAME');
+ const password = pass ?? Cypress.env('MAILCHIMP_PASSWORD');
cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
@@ -39,21 +39,18 @@ Cypress.Commands.add('mailchimpLogin', (username = null, password = null) => {
const acceptButtonSelector = '#onetrust-accept-btn-handler';
// Check if the accept button is visible and click it
- if ($popup.find(acceptButtonSelector).length > 0 && $popup.find(acceptButtonSelector).is(':visible')) {
+ if (
+ $popup.find(acceptButtonSelector).length > 0 &&
+ $popup.find(acceptButtonSelector).is(':visible')
+ ) {
$popup.find(acceptButtonSelector).click();
} else {
cy.log('Cookie consent popup not found or not visible.');
}
});
- cy.popup()
- .find('input#username')
- .clear()
- .type(username, { force: true });
- cy.popup()
- .find('input#password')
- .clear()
- .type(password, { force: true });
+ cy.popup().find('input#username').clear().type(username, { force: true });
+ cy.popup().find('input#password').clear().type(password, { force: true });
cy.popup().find('button[type="submit"]').click({ force: true });
cy.wait(10000); // Not a best practice, but did not find a better way to handle this.
diff --git a/tests/cypress/support/commands/settings.js b/tests/cypress/support/commands/settings.js
index f235f580..107ae5d9 100644
--- a/tests/cypress/support/commands/settings.js
+++ b/tests/cypress/support/commands/settings.js
@@ -13,39 +13,10 @@
*/
Cypress.Commands.add('selectList', (listName) => {
cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- cy.get('#mc_list_id').select(listName, {force: true});
+ cy.get('#mc_list_id').select(listName, { force: true });
cy.get('input[value="Update List"]').click();
});
-/**
- * Custom Cypress command to enable or disable the JavaScript option in Mailchimp WordPress admin settings.
- *
- * This command visits the Mailchimp plugin settings page in the WordPress admin,
- * toggles the "Use JavaScript" option based on the specified parameter, and
- * updates the settings by submitting the form. It is helpful for testing scenarios
- * that depend on JavaScript behavior in the plugin.
- *
- * @param {boolean} enabled - A flag to enable (`true`) or disable (`false`) the JavaScript option.
- *
- * @example
- * // Enable the JavaScript option
- * cy.setJavaScriptOption(true);
- *
- * @example
- * // Disable the JavaScript option
- * cy.setJavaScriptOption(false);
- */
-Cypress.Commands.add('setJavaScriptOption', setJavaScriptOption);
-function setJavaScriptOption(enabled) {
- cy.visit('/wp-admin/admin.php?page=mailchimp_sf_options');
- if (enabled) {
- cy.get('#mc_use_javascript').check();
- } else {
- cy.get('#mc_use_javascript').uncheck();
- }
- cy.get('input[value="Update Subscribe Form Settings"]').first().click();
-}
-
/**
* Custom Cypress command to enable or disable the Double Opt-In option in Mailchimp WordPress admin settings.
*
@@ -143,11 +114,11 @@ function toggleMergeFields(action) {
* // Set merge fields for a specific list
* cy.setMergeFieldsRequired(true, 'Custom List');
*/
-Cypress.Commands.add('setMergeFieldsRequired', (required, listName = '10up') => {
+Cypress.Commands.add('setMergeFieldsRequired', (required, listName = '10up', fields = []) => {
// Set all merge fields to required in the Mailchimp test user account
cy.getListId(listName).then((listId) => {
- cy.updateMergeFieldsByList(listId, { required: required }).then(() => {
+ cy.updateMergeFieldsByList(listId, { required }, fields).then(() => {
cy.selectList(listName); // Ensure list is selected, refreshes Mailchimp data with WP
});
});
-})
\ No newline at end of file
+});
diff --git a/tests/cypress/support/index.js b/tests/cypress/support/index.js
index a0364cee..76d9fdaf 100644
--- a/tests/cypress/support/index.js
+++ b/tests/cypress/support/index.js
@@ -33,7 +33,6 @@ before(() => {
cy.selectList('10up');
cy.setDoubleOptInOption(false);
- cy.setJavaScriptOption(true);
cy.setSettingsOption('#mc_update_existing', false);
// Merge fields
@@ -43,8 +42,8 @@ before(() => {
cy.log('Default testing options set!');
});
-beforeEach( () => {
- cy.session( 'login', cy.login, {
+beforeEach(() => {
+ cy.session('login', cy.login, {
cacheAcrossSpecs: true,
- } );
-} );
+ });
+});