Ensure that the insertBlock command works properly in all cases.

package.json

@@ -48,7 +48,7 @@
     "@types/node": "^12.20.11",
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
-    "@wordpress/env": "^5.5.0",
+    "@wordpress/env": "^10.2.0",
     "codecov": "^3.8.1",
     "compare-versions": "^4.1.3",
     "cypress": "^13.6.4",

src/commands/create-post.ts

@@ -70,9 +70,23 @@ export const createPost = ({
   // Close Welcome Guide.
   cy.closeWelcomeGuide();
 
+  // Close Start Page Options.
+  if (postType === 'page') {
+    // eslint-disable-next-line cypress/no-unnecessary-waiting -- Wait for the modal to appear. Didn't find a better way to handle this.
+    cy.wait(500);
+    const modelSelector =
+      '.edit-post-start-page-options__modal button[aria-label="Close"]';
+    cy.get('body').then($body => {
+      if ($body.find('.edit-post-start-page-options__modal').length > 0) {
+        cy.get(modelSelector).click();
+      }
+    });
+  }
+
   // Fill out data.
   if (title.length > 0) {
-    cy.getBlockEditor().find(titleInput).clear().type(title);
+    cy.getBlockEditor().find(titleInput).clear();
+    cy.getBlockEditor().find(titleInput).type(title);
   }
 
   if (content.length > 0) {

src/commands/insert-block.ts

@@ -95,8 +95,7 @@ export const insertBlock = (type: string, name?: string): void => {
                     `.wp-block[data-type="${ns}/${rest}"]`
                   );
                   if (blockInIframe.length > 0) {
-                    expect(blockInIframe.length).to.equal(1);
-                    cy.wrap(blockInIframe.prop('id'));
+                    cy.wrap(blockInIframe.last().prop('id'));
                   }
                 });
               } else if (

src/commands/wp-cli-eval.ts

@@ -23,7 +23,7 @@ export const wpCliEval = (command: string): void => {
 
     // which is read from it's proper location in the plugins directory
     cy.exec(
-      `npm --silent run env run tests-cli "eval-file wp-content/plugins/${pluginName}/${fileName}"` // eslint-disable-line @typescript-eslint/restrict-template-expressions
+      `npm --silent run env run tests-cli -- wp eval-file wp-content/plugins/${pluginName}/${fileName}` // eslint-disable-line @typescript-eslint/restrict-template-expressions
     ).then(result => {
       cy.exec(`rm ${fileName}`);
       cy.wrap(result);

src/commands/wp-cli.ts

@@ -13,12 +13,12 @@
  * ```
  */
 export const wpCli = (command: string, ignoreFailures = false): void => {
-  const escapedCommand = command.replace(/"/g, '\\"').replace(/^wp /, '');
+  const escapedCommand = command.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
   const options = {
     failOnNonZeroExit: !ignoreFailures,
   };
   cy.exec(
-    `npm --silent run env run tests-cli "${escapedCommand}"`,
+    `npm --silent run env run tests-cli -- ${escapedCommand}`,
     options
   ).then(result => {
     cy.wrap(result);

tests/bin/initialize.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-npm run env run tests-wordpress "chmod -c ugo+w /var/www/html"
-npm run env run tests-cli "wp rewrite structure '/%postname%/' --hard"
+wp-env run tests-wordpress chmod -c ugo+w /var/www/html
+wp-env run tests-cli wp rewrite structure '/%postname%/' --hard
 
-npm run env run tests-cli "wp user create user1 user1@example.test --role=author --user_pass=password1"
-npm run env run tests-cli "wp user create user2 user2@example.test --role=author --user_pass=password2"
+wp-env run tests-cli wp user create user1 user1@example.test --role=author --user_pass=password1
+wp-env run tests-cli wp user create user2 user2@example.test --role=author --user_pass=password2

tests/cypress/cypress-config.js

@@ -1,5 +1,6 @@
 const { defineConfig } = require('cypress');
-const { readConfig } = require('@wordpress/env/lib/config');
+const { loadConfig } = require('@wordpress/env/lib/config');
+const getCacheDirectory = require('@wordpress/env/lib/config/get-cache-directory');
 
 module.exports = defineConfig({
   chromeWebSecurity: false,
@@ -33,7 +34,8 @@ module.exports = defineConfig({
  * @returns config Updated Cypress Config object.
  */
 const setBaseUrl = async (on, config) => {
-  const wpEnvConfig = await readConfig('wp-env');
+  const cacheDirectory = await getCacheDirectory();
+  const wpEnvConfig = await loadConfig(cacheDirectory);
 
   if (wpEnvConfig) {
     const port = wpEnvConfig.env.tests.port || null;

tests/cypress/e2e/create-post.test.js

@@ -98,15 +98,26 @@ describe('Command: createPost', () => {
           ) {
             name = 'Summary';
           }
-          cy.openDocumentSettingsPanel(name);
-        });
 
-        cy.get('label')
-          .contains('Stick to the top of the blog')
-          .click()
-          .parent()
-          .find('input[type="checkbox"]')
-          .should('be.checked');
+          // WP 6.6 handling.
+          if ($body.find('.editor-post-summary').length === 0) {
+            cy.openDocumentSettingsPanel(name);
+
+            cy.get('label')
+              .contains('Stick to the top of the blog')
+              .click()
+              .parent()
+              .find('input[type="checkbox"]')
+              .should('be.checked');
+          } else {
+            cy.get(
+              '.editor-post-sticky__toggle-control input[type="checkbox"]'
+            ).check();
+            cy.get(
+              '.editor-post-sticky__toggle-control input[type="checkbox"]'
+            ).should('be.checked');
+          }
+        });
       },
     });
 

tests/cypress/e2e/open-document-settings.test.js

@@ -1,3 +1,4 @@
+import { compare } from 'compare-versions';
 const { randomName } = require('../support/functions');
 import { getIframe } from '../../../lib/functions/get-iframe';
 
@@ -50,15 +51,19 @@ describe('Commands: openDocumentSettings*', () => {
       ) {
         name = 'Summary';
       }
-      cy.openDocumentSettingsPanel(name);
-
-      // Assertion: Stick to the top checkbox should be visible
-      cy.get('.components-panel__body .components-panel__body-title button')
-        .contains(name, { matchCase: false })
-        .then($button => {
-          const $panel = $button.parents('.components-panel__body');
-          cy.wrap($panel).should('contain', 'Stick to the top of the blog');
-        });
+      // WP 6.6 handling.
+      if ($body.find('.editor-post-summary').length === 0) {
+        cy.openDocumentSettingsPanel(name);
+        // Assertion: Stick to the top checkbox should be visible
+        cy.get('.components-panel__body .components-panel__body-title button')
+          .contains(name, { matchCase: false })
+          .then($button => {
+            const $panel = $button.parents('.components-panel__body');
+            cy.wrap($panel).should('contain', 'Stick to the top of the blog');
+          });
+      } else {
+        cy.get('.editor-post-sticky__toggle-control').should('be.visible');
+      }
     });
   });
 
@@ -83,6 +88,11 @@ describe('Commands: openDocumentSettings*', () => {
   });
 
   it('Should be able to open Discussion panel on the existing page', () => {
+    if (compare(Cypress.env('WORDPRESS_CORE').toString(), '6.6', '>=')) {
+      assert(true, 'Skipping test');
+      return;
+    }
+
     cy.createPost({
       title: randomName(),
       postType: 'page',

tests/cypress/e2e/wp-cli.test.js

@@ -1,6 +1,6 @@
 describe('Command: wpCli', () => {
   it('Should run cli command and receive the response', () => {
-    cy.wpCli('cli version')
+    cy.wpCli('wp cli version')
       .its('stdout')
       .should('match', /^WP-CLI \d+\.\d+/);
   });