Tests: Merge Uncode Theme Tests

.env.example

@@ -4,6 +4,9 @@ WORDPRESS_ROOT_DIR="/Users/tim/Local Sites/convertkit-github/app/public"
 # Local site URL
 WORDPRESS_URL=http://kit.local
 
+# Local site DB SQL dump file
+WORDPRESS_DB_SQL_DUMP_FILE="tests/Support/Data/dump.sql"
+
 # Kit credentials
 CONVERTKIT_OAUTH_ACCESS_TOKEN=
 CONVERTKIT_OAUTH_REFRESH_TOKEN=

.github/workflows/tests.yml

@@ -30,6 +30,7 @@ jobs:
       DB_USER: root
       DB_PASS: root
       DB_HOST: localhost
+      WORDPRESS_DB_SQL_DUMP_FILE: tests/Support/Data/dump.sql # Used to populate the test site database for WordPress 6.2.8
       INSTALL_PLUGINS: "admin-menu-editor autoptimize beaver-builder-lite-version block-visibility contact-form-7 classic-editor custom-post-type-ui debloat elementor forminator jetpack-boost mailchimp-for-wp rocket-lazy-load woocommerce wordpress-seo wpforms-lite litespeed-cache wp-crontrol wp-super-cache w3-total-cache wp-fastest-cache wp-optimize sg-cachepress" # Don't include this repository's Plugin here.
       INSTALL_PLUGINS_URLS: "https://downloads.wordpress.org/plugin/convertkit-for-woocommerce.1.6.4.zip http://cktestplugins.wpengine.com/wp-content/uploads/2024/01/convertkit-action-filter-tests.zip http://cktestplugins.wpengine.com/wp-content/uploads/2024/11/disable-doing-it-wrong-notices.zip http://cktestplugins.wpengine.com/wp-content/uploads/2025/03/uncode-js_composer.7.8.zip http://cktestplugins.wpengine.com/wp-content/uploads/2025/03/uncode-core.zip" # URLs to specific third party Plugins
       INSTALL_THEMES_URLS: "http://cktestplugins.wpengine.com/wp-content/uploads/2025/03/uncode.zip http://cktestplugins.wpengine.com/wp-content/uploads/2025/04/Divi.zip"
@@ -265,6 +266,7 @@ jobs:
         with:
           path: ${{ env.PLUGIN_DIR }}/.env.testing
           contents: |
+            WORDPRESS_DB_SQL_DUMP_FILE=${{ env.WORDPRESS_DB_SQL_DUMP_FILE }}
             CONVERTKIT_API_KEY=${{ env.CONVERTKIT_API_KEY }}
             CONVERTKIT_API_SECRET=${{ env.CONVERTKIT_API_SECRET }}
             CONVERTKIT_API_KEY_NO_DATA=${{ env.CONVERTKIT_API_KEY_NO_DATA }}

includes/blocks/class-convertkit-block-form-builder-field-email.php

@@ -32,6 +32,15 @@ class ConvertKit_Block_Form_Builder_Field_Email extends ConvertKit_Block_Form_Bu
 	 */
 	public $field_id = 'email';
 
+	/**
+	 * The type of field to render.
+	 *
+	 * @since   3.1.4
+	 *
+	 * @var     string
+	 */
+	public $field_type = 'email';
+
 	/**
 	 * Whether the field is required.
 	 *

resources/backend/css/gutenberg.css

@@ -36,9 +36,12 @@
 	top: 20px;
 	right: 20px;
 	line-height: 22px;
+	width: auto;
 }
 
-.wp-block .convertkit-no-content .convertkit-progress-bar {
+.wp-block .convertkit-no-content .convertkit-progress-bar,
+.wp-block .convertkit-no-content .spinner {
+	float: none;
 	margin: 0 auto;
 }
 

resources/backend/js/gutenberg.js

@@ -599,9 +599,18 @@ function convertKitGutenbergRegisterBlock(block) {
 		 * @return {Object}       Progress Bar.
 		 */
 		const loadingIndicator = function (props) {
+			// If the ProgressBar component is not available i.e. WordPress < 6.3, return a spinner.
+			if (typeof ProgressBar === 'undefined') {
+				return el('span', {
+					key: props.clientId + '-spinner',
+					className: 'spinner is-active convertkit-block-refreshing',
+				});
+			}
+
 			return el(ProgressBar, {
 				key: props.clientId + '-progress-bar',
-				className: 'convertkit-progress-bar',
+				className:
+					'convertkit-progress-bar convertkit-block-refreshing',
 			});
 		};
 

tests/EndToEnd.suite.yml

@@ -67,7 +67,7 @@ modules:
                   download.default_directory: '%WORDPRESS_ROOT_DIR%'
         lucatume\WPBrowser\Module\WPDb:
             dbUrl: '%WORDPRESS_DB_URL%'
-            dump: 'tests/Support/Data/dump.sql'
+            dump: '%WORDPRESS_DB_SQL_DUMP_FILE%'
             #import the dump before the tests; this means the test site database will be repopulated before the tests.
             populate: true
             # re-import the dump between tests; this means the test site database will be repopulated between the tests.

tests/EndToEnd/broadcasts/blocks-shortcodes/PageBlockBroadcastsCest.php

@@ -783,7 +783,18 @@ public function testBroadcastsBlockWithThemeColorParameters(EndToEndTester $I)
 		$I->seeInSource('<link rel="stylesheet" id="convertkit-broadcasts-css" href="' . $_ENV['WORDPRESS_URL'] . '/wp-content/plugins/convertkit/resources/frontend/css/broadcasts.css');
 
 		// Confirm that the chosen colors are applied as CSS styles.
-		$I->seeInSource('<div class="convertkit-broadcasts wp-block-convertkit-broadcasts has-text-color has-' . $textColor . '-color has-background has-' . $backgroundColor . '-background-color"');
+		$I->seeElementHasClasses(
+			$I,
+			'.convertkit-broadcasts',
+			[
+				'convertkit-broadcasts',
+				'wp-block-convertkit-broadcasts',
+				'has-text-color',
+				'has-' . $textColor . '-color',
+				'has-background',
+				'has-' . $backgroundColor . '-background-color',
+			]
+		);
 	}
 
 	/**
@@ -835,7 +846,16 @@ public function testBroadcastsBlockWithHexColorParameters(EndToEndTester $I)
 		$I->seeInSource('<link rel="stylesheet" id="convertkit-broadcasts-css" href="' . $_ENV['WORDPRESS_URL'] . '/wp-content/plugins/convertkit/resources/frontend/css/broadcasts.css');
 
 		// Confirm that the chosen colors are applied as CSS styles.
-		$I->seeInSource('<div class="convertkit-broadcasts wp-block-convertkit-broadcasts has-text-color has-background"');
+		$I->seeElementHasClasses(
+			$I,
+			'.convertkit-broadcasts',
+			[
+				'convertkit-broadcasts',
+				'wp-block-convertkit-broadcasts',
+				'has-text-color',
+				'has-background',
+			]
+		);
 	}
 
 	/**

tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormBuilderCest.php

@@ -1283,10 +1283,10 @@ private function seeFormBuilderField(EndToEndTester $I, $fieldType, $fieldName,
 		// Check field exists with correct attributes.
 		switch ( $fieldType ) {
 			case 'textarea':
-				$I->seeElementInDOM($container . ' textarea[name="convertkit[' . $fieldName . ']"][id="' . $fieldID . '"]' . $required ? '[required]' : '');
+				$I->seeElementInDOM($container . ' textarea[name="convertkit[' . $fieldName . ']"][id="' . $fieldID . '"]' . ( $required ? '[required]' : '' ) );
 				break;
 			default:
-				$I->seeElementInDOM($container . ' input[name="convertkit[' . $fieldName . ']"][type="' . $fieldType . '"][id="' . $fieldID . '"]' . $required ? '[required]' : '');
+				$I->seeElementInDOM($container . ' input[name="convertkit[' . $fieldName . ']"][type="' . $fieldType . '"][id="' . $fieldID . '"]' . ( $required ? '[required]' : '' ) );
 		}
 
 		// Check label exists with correct text.

tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormCest.php

@@ -1214,7 +1214,16 @@ public function testFormBlockWithThemeColorParameters(EndToEndTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 
 		// Confirm that the chosen colors are applied as CSS styles.
-		$I->seeInSource('<div class="convertkit-form wp-block-convertkit-form has-background" style="background-color:' . $backgroundColor . '"');
+		$I->seeInSource('style="background-color:' . $backgroundColor . '"');
+		$I->seeElementHasClasses(
+			$I,
+			'.convertkit-form',
+			[
+				'convertkit-form',
+				'wp-block-convertkit-form',
+				'has-background',
+			]
+		);
 	}
 
 	/**
@@ -1265,7 +1274,16 @@ public function testFormBlockWithHexColorParameters(EndToEndTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 
 		// Confirm that the chosen colors are applied as CSS styles.
-		$I->seeInSource('<div class="convertkit-form wp-block-convertkit-form has-background" style="background-color:' . $backgroundColor . '"');
+		$I->seeInSource('style="background-color:' . $backgroundColor . '"');
+		$I->seeElementHasClasses(
+			$I,
+			'.convertkit-form',
+			[
+				'convertkit-form',
+				'wp-block-convertkit-form',
+				'has-background',
+			]
+		);
 	}
 
 	/**
@@ -1315,7 +1333,15 @@ public function testFormBlockWithMarginAndPaddingParameters(EndToEndTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 
 		// Confirm that the chosen margin and padding are applied as CSS styles.
-		$I->seeInSource('<div class="convertkit-form wp-block-convertkit-form" style="padding-top:var(--wp--preset--spacing--30);margin-top:var(--wp--preset--spacing--30)"');
+		$I->seeInSource('style="padding-top:var(--wp--preset--spacing--30);margin-top:var(--wp--preset--spacing--30)"');
+		$I->seeElementHasClasses(
+			$I,
+			'.convertkit-form',
+			[
+				'convertkit-form',
+				'wp-block-convertkit-form',
+			]
+		);
 	}
 
 	/**
@@ -1365,7 +1391,15 @@ public function testFormBlockWithAlignmentParameter(EndToEndTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 
 		// Confirm that the chosen alignment is applied as a CSS class.
-		$I->seeInSource('<div class="convertkit-form alignright wp-block-convertkit-form"');
+		$I->seeElementHasClasses(
+			$I,
+			'.convertkit-form',
+			[
+				'convertkit-form',
+				'wp-block-convertkit-form',
+				'alignright',
+			]
+		);
 	}
 
 	/**

tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormTriggerCest.php

@@ -311,7 +311,20 @@ public function testFormTriggerBlockWithThemeColorParameters(EndToEndTester $I)
 		);
 
 		// Confirm that the chosen colors are applied as CSS styles.
-		$I->seeInSource('class="convertkit-formtrigger wp-block-button__link wp-element-button wp-block-convertkit-formtrigger has-text-color has-' . $textColor . '-color has-background has-' . $backgroundColor . '-background-color');
+		$I->seeElementHasClasses(
+			$I,
+			'a.convertkit-formtrigger',
+			[
+				'convertkit-formtrigger',
+				'wp-block-button__link',
+				'wp-element-button',
+				'wp-block-convertkit-formtrigger',
+				'has-text-color',
+				'has-' . $textColor . '-color',
+				'has-background',
+				'has-' . $backgroundColor . '-background-color',
+			]
+		);
 	}
 
 	/**
@@ -352,16 +365,17 @@ public function testFormTriggerBlockWithHexColorParameters(EndToEndTester $I)
 		$I->checkNoWarningsAndNoticesOnScreen($I);
 
 		// Confirm that the chosen colors are applied as CSS styles.
-		$I->seeInSource('class="convertkit-formtrigger wp-block-button__link wp-element-button wp-block-convertkit-formtrigger has-text-color has-background"');
-
-		// Confirm that the block displays.
-		$I->seeFormTriggerOutput(
+		$I->seeElementHasClasses(
 			$I,
-			formURL: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_URL'],
-			text: 'Subscribe',
-			textColor: $textColor,
-			backgroundColor: $backgroundColor,
-			isBlock: true
+			'a.convertkit-formtrigger',
+			[
+				'convertkit-formtrigger',
+				'wp-block-button__link',
+				'wp-element-button',
+				'wp-block-convertkit-formtrigger',
+				'has-text-color',
+				'has-background',
+			]
 		);
 	}
 

tests/EndToEnd/products/PageBlockProductCest.php

@@ -486,7 +486,20 @@ public function testProductBlockWithThemeColorParameters(EndToEndTester $I)
 		);
 
 		// Confirm that the chosen colors are applied as CSS styles.
-		$I->seeInSource('class="convertkit-product wp-block-button__link wp-element-button wp-block-convertkit-product has-text-color has-' . $textColor . '-color has-background has-' . $backgroundColor . '-background-color');
+		$I->seeElementHasClasses(
+			$I,
+			'a.convertkit-product',
+			[
+				'convertkit-product',
+				'wp-block-button__link',
+				'wp-element-button',
+				'wp-block-convertkit-product',
+				'has-text-color',
+				'has-' . $textColor . '-color',
+				'has-background',
+				'has-' . $backgroundColor . '-background-color',
+			]
+		);
 	}
 
 	/**

tests/EndToEnd/restrict-content/post-types/RestrictContentProductThirdPartyThemeOrPageBuilderCest.php

@@ -33,14 +33,14 @@ public function _before(EndToEndTester $I)
 
 	/**
 	 * Test that restricting content by a Product specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page using the Uncode theme with
-	 * the Visual Composer Page Builder.
+	 * creating and viewing a new WordPress Page using the Uncode theme both using
+	 * the Visual Composer Page Builder and not using it.
 	 *
 	 * @since   2.7.7
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testRestrictContentByProductWithUncodeThemeAndVisualComposer(EndToEndTester $I)
+	public function testRestrictContentByProductWithUncodeTheme(EndToEndTester $I)
 	{
 		// Activate theme and third party Plugins.
 		$I->useTheme('uncode');
@@ -81,28 +81,7 @@ public function testRestrictContentByProductWithUncodeThemeAndVisualComposer(End
 			checkNoWarningsAndNotices: false
 		);
 
-		// Deactivate theme and third party Plugins.
-		$I->deactivateThirdPartyPlugin($I, 'uncode-wpbakery-page-builder');
-		$I->deactivateThirdPartyPlugin($I, 'uncode-core');
-		$I->useTheme('twentytwentyfive');
-	}
-
-	/**
-	 * Test that restricting content by a Product specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page using the Uncode theme without
-	 * the Visual Composer Page Builder.
-	 *
-	 * @since   2.7.7
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testRestrictContentByProductWithUncodeTheme(EndToEndTester $I)
-	{
-		// Activate theme and third party Plugins.
-		$I->useTheme('uncode');
-		$I->activateThirdPartyPlugin($I, 'uncode-core');
-
-		// Programmatically create a Page using the Visual Composer Page Builder.
+		// Programmatically create a Page without using the Visual Composer Page Builder.
 		$pageID = $I->havePostInDatabase(
 			[
 				'post_type'    => 'page',
@@ -134,10 +113,6 @@ public function testRestrictContentByProductWithUncodeTheme(EndToEndTester $I)
 			// Don't check for warnings and notices, as Uncode uses deprecated functions which WordPress 6.9 warn about.
 			checkNoWarningsAndNotices: false
 		);
-
-		// Deactivate theme and third party Plugins.
-		$I->deactivateThirdPartyPlugin($I, 'uncode-core');
-		$I->useTheme('twentytwentyfive');
 	}
 
 	/**