Merge pull request #562 from 10up/fix/e2e-tests

Fix failing E2E tests and add back testing on `trunk`
10up · Aug 11, 2023 · 4f099b8 · 4f099b8
2 parents b95ac50 + f1ade7a
commit 4f099b8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -17,6 +17,7 @@ jobs:
         core:
           - {name: 'WP latest', version: 'latest'}
           - {name: 'WP minimum', version: 'WordPress/WordPress#5.7'}
+          - {name: 'WP trunk', version: 'WordPress/WordPress#master'}
     steps:
     - name: Checkout
       uses: actions/checkout@v3

diff --git a/tests/test-plugin/e2e-test-plugin.php b/tests/test-plugin/e2e-test-plugin.php
@@ -95,3 +95,14 @@ function classifai_test_prepare_response( $response ) {
 if ( ! defined( 'FS_METHOD' ) ) {
 	define( 'FS_METHOD', 'direct' );
 }
+
+// Load our recommended content block to force the non-iframe editor.
+// Cypress fails to run correctly when the editor is iframed.
+add_action(
+	'admin_init',
+	function() {
+		if ( function_exists( 'Classifai\Blocks\setup' ) ) {
+			Classifai\Blocks\setup();
+		}
+	}
+);