Merge branch 'fix/e2e-tests' of github.com:mailchimp/wordpress into release/1.7.0

Author: iamdharmesh

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;
 		}
 	}

tests/cypress/e2e/mailchimp-block.test.js renamed to 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', () => {

tests/cypress/e2e/settings.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');