Compatibility with WP 6.4

.dev/tests/cypress/helpers.js

@@ -275,19 +275,29 @@ export function selectBlock( name ) {
 	 * For that reason is difficult to assert against those requests from core code.
 	 * We introduce an arbitrary wait to avoid a race condition by interacting too quickly.
 	 */
-	cy.wait( 1000 );
+	cy.wait( 600 );
+
+	let id = ''; // The block client ID.
+	cy.window().then( ( win ) => {
+		// Prefer selector from data-store.
+		id = win.wp.data.select( 'core/block-editor' ).getBlocks().filter( ( i ) => i?.name === name )[ 0 ]?.clientId;
+
+		// Fallback to selector from DOM.
+		if ( ! id ) {
+			cy.get(	`[data-type*="${ name }"], [data-title*="${ name }"]` )
+				.invoke( 'attr', 'data-block' )
+				.then( ( clientId ) => id = clientId );
+		}
+	} );
 
-	// `data-type` includes lower case name and `data-title` includes upper case name.
-	// Allows for case-insensitive search.
-	cy.get(	`[data-type*="${ name }"], [data-title*="${ name }"]` )
-		.invoke( 'attr', 'data-block' )
-		.then( ( clientId ) => {
-			cy.window().then( ( win ) => {
-				// Open the block sidebar.
-				win.wp.data.dispatch( 'core/edit-post' ).openGeneralSidebar( 'edit-post/block' );
-				win.wp.data.dispatch( 'core/block-editor' ).selectBlock( clientId );
-			} );
-		} );
+	cy.window().then( ( win ) => {
+		win.wp.data.dispatch( 'core/block-editor' ).selectBlock( id );
+	} );
+
+	cy.window().then( ( win ) => {
+		win.wp.data.dispatch( 'core/edit-post' ).openGeneralSidebar( 'edit-post/block' );
+	} );
+	cy.wait( 600 );
 }
 
 /**
@@ -408,6 +418,11 @@ export const upload = {
 	},
 };
 
+const customColorPalatteSelector = ( () => [
+	'.components-color-palette__custom-color-button', // WP 6.3+
+	'.components-color-palette__custom-color', // WP 6.2.
+].join() )();
+
 /**
  * Set a Color Setting value to a custom hex color
  *
@@ -419,11 +434,7 @@ export function setColorSettingsFoldableSetting( settingName, hexColor ) {
 
 	cy.get( '.block-editor-panel-color-gradient-settings__dropdown' ).contains( settingName, { matchCase: false } ).click();
 
-	if ( isWP63AtLeast() ) {
-		cy.get( '.components-color-palette__custom-color-button' ).click();
-	} else {
-		cy.get( '.components-color-palette__custom-color' ).click();
-	}
+	cy.get( customColorPalatteSelector ).click();
 
 	cy.get( '.components-color-picker' ).find( '.components-input-control__input' ).click().clear().type( formattedHex );
 
@@ -437,11 +448,7 @@ export function setColorPanelSetting( settingName, hexColor ) {
 
 	cy.get( '.block-editor-panel-color-gradient-settings__dropdown' ).contains( settingName, { matchCase: false } ).click();
 
-	if ( isWP63AtLeast() ) {
-		cy.get( '.components-color-palette__custom-color-button' ).click();
-	} else {
-		cy.get( '.components-color-palette__custom-color' ).click();
-	}
+	cy.get( customColorPalatteSelector ).click();
 
 	cy.get( '.components-color-picker' ).find( '.components-input-control__input' ).click().clear().type( formattedHex );
 
@@ -580,10 +587,10 @@ export function isNotWPLocalEnv() {
 	return Cypress.env( 'testURL' ) !== 'http://localhost:8889';
 }
 
-// A condition to determine if we are testing on WordPress 6.3+
-// This function should be removed in the process of the work for WP 6.4 compatibility
-export function isWP63AtLeast() {
-	return Cypress.$( "[class*='branch-6-3']" ).length > 0 || Cypress.$( "[class*='branch-6-4']" ).length > 0;
+// A condition to determine if we are testing on WordPress 6.4+
+// This function should be removed in the process of the work for WP 6.5 compatibility
+export function isWP64AtLeast() {
+	return Cypress.$( "[class*='branch-6-4']" ).length > 0 || Cypress.$( "[class*='branch-6-5']" ).length > 0;
 }
 
 function getIframeDocument( containerClass ) {

.dev/tests/jest/assets-transformer.js

@@ -1,7 +1,9 @@
 const path = require( 'path' );
 
 module.exports = {
-	process( src, filename ) {
-		return 'module.exports = ' + JSON.stringify( path.basename( filename ) ) + ';';
+	process( sourceText, sourcePath ) {
+		return {
+			code: `module.exports = ${ JSON.stringify( path.basename( sourcePath ) ) };`,
+		};
 	},
 };

.eslintrc.js

@@ -7,9 +7,12 @@ module.exports = {
 		browser: true,
 		'cypress/globals': true,
 		jest: true,
+		'jest/globals': true,
 	},
 	plugins: [
 		'cypress',
+		'react',
+		'jest',
 	],
 
 	// Specific Globals used in CoBlocks
@@ -30,6 +33,9 @@ module.exports = {
 		'sort-keys': [ 'off' ],
 		'react/jsx-sort-props': [ 'off' ],
 	},
+
+	noInlineConfig: false,
+
 	overrides: [
 		{
 			files: [ 'deprecated.js', 'save.js' ],

.github/workflows/date-checker.yml

@@ -0,0 +1,33 @@
+# .github/workflows/date-checker.yml
+name: Date Checker Workflow
+
+on:
+  workflow_call:
+    inputs:
+      scheduled_release_date:
+        required: true
+        type: string
+    outputs:
+      should_run_workflow:
+        description: "String as `true` or `false` indicating if the workflow should run"
+        value: ${{jobs.check_date.outputs.should_run_workflow}}
+
+jobs:
+  check_date:
+    runs-on: ubuntu-latest
+    outputs:
+      should_run_workflow: ${{ steps.date_check.outputs.should_run_workflow }}
+    steps:
+      - name: Check if workflow should run
+        id: date_check
+        env:
+          # Get release cut off date
+          SCHEDULED_RELEASE_DATE: ${{github.event.inputs.scheduled_release_date}}
+        run: |
+          SCHEDULED_RELEASE_DATE_UNIX=$(date -d "$SCHEDULED_RELEASE_DATE" +%s)
+          current_date=$(date +%s)
+          if [[ $current_date -lt $SCHEDULED_RELEASE_DATE_UNIX ]]; then
+            echo "should_run_workflow=false" >> $GITHUB_OUTPUT
+          else
+            echo "should_run_workflow=true" >> $GITHUB_OUTPUT
+          fi

.github/workflows/test-e2e-cypress.yml

@@ -18,6 +18,10 @@ on:
         required: false
         type: string
         default: "8.2"
+      installPath:
+          required: false
+          type: string
+          default: "tests-WordPress"
     secrets:
       record-key:
         description: 'Record key for Cypress Dashboard'
@@ -92,6 +96,7 @@ jobs:
           plugins: '["."]'
           themes: '["https://downloads.wordpress.org/theme/go.zip"]'
 
+
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
@@ -107,14 +112,14 @@ jobs:
         run: |
           npx grunt build
           # moving the built directory to this location means no dev files in tests-container.
-          mv ./build/coblocks $(wp-env install-path)/tests-WordPress/wp-content/plugins/
+          mv ./build/coblocks $(wp-env install-path)/${{ inputs.installPath }}/wp-content/plugins/
 
       - name: Prepare Theme
         run: |
-          if [ "${{ inputs.theme }}" = "https://downloads.wordpress.org/theme/go.zip" ]; then
+          if [ "$theme_url" = "https://downloads.wordpress.org/theme/go.zip" ]; then
             cd $(wp-env install-path)/go
           else
-            cd $(wp-env install-path)/tests-WordPress/wp-content/themes/twentytwentythree
+            cd $(wp-env install-path)/${{ inputs.installPath }}/wp-content/themes/twentytwentythree
           fi
           mkdir -p coblocks/icons
           echo '<svg height="20" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg"><circle class="inner-circle" cx="20" cy="20" r="8" stroke-width="8" stroke-dasharray="50.2655 50.2655" stroke-dashoffset="0"></circle></svg>' >> coblocks/icons/custom.svg

.github/workflows/test-e2e.yml

@@ -6,51 +6,42 @@ on:
       - master
 
 jobs:
-  # Requires re-working our helpers to be backward compat.
-  # chrome_e2e_major_before_previous_major:
-  #   name: Chrome with major before previous major WP version
-  #   uses: ./.github/workflows/test-e2e-cypress.yml
-  #   with:
-  #     wpVersion: "WordPress/WordPress#6.1"
-  #   concurrency:
-  #     group: chrome-defaults-major-before-previous-major
-  #     cancel-in-progress: true
-
-  chrome_e2e_previous_major:
-    name: Chrome with previous major WP version
+  chrome_e2e_gamut_tests:
+    name: >
+      E2E - ${{
+        format(
+          'WP{0} + PHP{1} + {2} theme',
+          matrix.wp,
+          matrix.php,
+          matrix.theme == '' && 'TwentyTwentyThree' || 'Go'
+        )
+      }}
     uses: ./.github/workflows/test-e2e-cypress.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        wp: # Test against Prev-Prev Major, Prev-Major, and current Major release versions.
+          - "6.2"
+          - "6.3"
+          # - "6.4" Should enable this when 6.4 is released.
+        theme:
+          - "https://downloads.wordpress.org/theme/go.zip"
+          - "" # Default theme is TwentyTwentyThree
+        php: # Test against minimum and latest PHP versions.
+          - "7.4"
+          - "8.2"
     with:
-      wpVersion: "WordPress/WordPress#6.2"
+      wpVersion: "WordPress/WordPress#${{matrix.wp}}"
+      theme: ${{matrix.theme}}
+      phpVersion: ${{matrix.php}}
     concurrency:
-      group: chrome-defaults-previous-major
+      group: >
+        ${{
+          format(
+            'chrome-e2e-WP{0}-PHP{1}-{2}',
+            matrix.wp,
+            matrix.php,
+            matrix.theme == '' && 'twentytwentythree' || 'go'
+          )
+        }}
       cancel-in-progress: true
-
-  chrome_e2e:
-    name: Chrome with defaults
-    uses: ./.github/workflows/test-e2e-cypress.yml
-    with:
-      wpVersion: "WordPress/WordPress#6.3"
-    concurrency:
-      group: chrome-defaults
-      cancel-in-progress: true
-
-  chrome_e2e_go:
-    name: Chrome and Go theme
-    uses: ./.github/workflows/test-e2e-cypress.yml
-    with:
-      wpVersion: "WordPress/WordPress#6.3"
-      theme: "https://downloads.wordpress.org/theme/go.zip"
-    concurrency:
-      group: chrome-go-theme
-      cancel-in-progress: true
-
-  chrome_e2e_php74:
-    name: Chrome on PHP 7.4
-    uses: ./.github/workflows/test-e2e-cypress.yml
-    with:
-      wpVersion: "WordPress/WordPress#6.3"
-      phpVersion: "7.4"
-    concurrency:
-      group: chrome-php74
-      cancel-in-progress: true
-

.github/workflows/test-php.yml

@@ -6,44 +6,17 @@ on:
       - master
 
 jobs:
-  php_unit_74:
-    name: PHP 7.4 Current Major
+  # PHP Unit testing
+  # Unit testing should be run across WP current, previous, and major before previous.
+  # Unit tests should be run across all supported versions of PHP.
+  php_unit_versions_matrix:
+    strategy:
+      matrix:
+        php: ['7.4','8.0','8.1','8.2']
+        wp: ['6.3', '6.2', '6.1']
+    name: PHP Unit ${{ matrix.php }} | WP Version ${{ matrix.wp }}
     uses: ./.github/workflows/test-php-unit.yml
     with:
-      phpVersion: '7.4'
-      wpVersion: 'WordPress/WordPress#6.3'
+      phpVersion: ${{ matrix.php }}
+      wpVersion: 'WordPress/WordPress#${{ matrix.wp }}'
 
-  php_unit_80:
-    name: PHP 8.0 Current Major
-    uses: ./.github/workflows/test-php-unit.yml
-    with:
-      phpVersion: '8.0'
-      wpVersion: 'WordPress/WordPress#6.3'
-
-  php_unit_81:
-    name: PHP 8.1 Current Major
-    uses: ./.github/workflows/test-php-unit.yml
-    with:
-      phpVersion: '8.1'
-      wpVersion: 'WordPress/WordPress#6.3'
-
-  php_unit_82:
-    name: PHP 8.2 Current Major
-    uses: ./.github/workflows/test-php-unit.yml
-    with:
-      phpVersion: '8.2'
-      wpVersion: 'WordPress/WordPress#6.3'
-
-  php_unit_82_wp_last_major:
-    name: PHP 8.2 Last Major
-    uses: ./.github/workflows/test-php-unit.yml
-    with:
-      phpVersion: '8.2'
-      wpVersion: 'WordPress/WordPress#6.2'
-
-  php_unit_82_wp_major_before_last_major:
-    name: PHP 8.2 Major Before Last Major
-    uses: ./.github/workflows/test-php-unit.yml
-    with:
-      phpVersion: '8.2'
-      wpVersion: 'WordPress/WordPress#6.1'

.github/workflows/test-wp-next.yml

@@ -0,0 +1,53 @@
+name: Test / E2E Runner & Jest & PHP Unit runner for WordPress Next version.
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  # Check if WP Next is released
+  check_if_released:
+    name: Check if WP Next is released
+    uses: ./.github/workflows/date-checker.yml
+    with:
+      # WP Next scheduled release date. Should be based on `https://make.wordpress.org/core/6-4/` or later.
+      scheduled_release_date: "2023-11-7"
+
+  # Create WP NEXT Version Constant
+  set_constant:
+    name: Set WP Next Version Constant
+    needs: check_if_released
+    if: needs.check_if_released.outputs.should_run_workflow == 'true'
+    runs-on: ubuntu-latest
+    outputs:
+      # Should be current latest WP Next release on `wordpress.org`. eg: `https://wordpress.org/wordpress-6.4-RC2.zip`
+      wp_next: "https://wordpress.org/wordpress-6.4-RC2.zip"
+    steps:
+      - run: echo "Setting WP Next Constant"
+
+
+  # E2E Testing
+  chrome_e2e_wp_next:
+    name: Chrome E2E WP Next Version
+    needs: set_constant
+    uses: ./.github/workflows/test-e2e-cypress.yml
+    with:
+      wpVersion: ${{ needs.set_constant.outputs.wp_next }}
+      installPath: "tests-wordpress-6.4-RC2"
+      theme: "https://downloads.wordpress.org/theme/go.zip"
+    concurrency:
+      group: chrome-wp-next
+      cancel-in-progress: true
+
+  # PHP Unit testing
+  php_unit_wp_next:
+    needs: set_constant
+    name: PHP ${{ matrix.php }} WP Next Version
+    strategy:
+      matrix:
+        php: ['7.4','8.0','8.1','8.2']
+    uses: ./.github/workflows/test-php-unit.yml
+    with:
+      phpVersion: ${{ matrix.php }}
+      wpVersion: ${{ needs.set_constant.outputs.wp_next }}