Merge pull request #309 from KevinBatdorf/fix-6-5-compat

Add 6-5 compat updates
KevinBatdorf · Apr 4, 2024 · 28f5dc7 · 28f5dc7
2 parents ae69ee5 + f1e1aed
commit 28f5dc7
Show file tree

Hide file tree

Showing 12 changed files with 3,834 additions and 24,791 deletions.
diff --git a/.github/workflows/build-production-zip.yml b/.github/workflows/build-production-zip.yml
@@ -11,7 +11,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Check out code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: npm install and build
               run: |
                   npm ci
@@ -21,7 +21,7 @@ jobs:
                   CI: true
 
             - name: Package
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: code-block-pro
                   retention-days: 5

diff --git a/.github/workflows/cypress-main.yml b/.github/workflows/cypress-main.yml
@@ -15,7 +15,7 @@ jobs:
             spec: ${{ steps.list_files.outputs.spec }}
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: List Files
               id: list_files
               run: |
@@ -29,9 +29,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: Cache node modules
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               id: cache-node-modules
               with:
                   path: node_modules
@@ -54,11 +54,11 @@ jobs:
                 wp-version: [null, 'Next']
         steps:
             - name: Clone repo
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: Set up node
               uses: actions/setup-node@v3
             - name: Node modules cache
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               id: cache-node-modules
               with:
                   path: node_modules
@@ -79,7 +79,7 @@ jobs:
               if: ${{ matrix.wp-version }}
               run: rm .wp-env.json
             - name: Maybe change WP version
-              uses: jsdaniell/[email protected].1
+              uses: jsdaniell/[email protected].3
               if: ${{ matrix.wp-version }}
               with:
                   name: '.wp-env.json'
@@ -89,17 +89,17 @@ jobs:
                   npx wp-env start
                   echo "WordPress version: `npx wp-env run cli core version`"
             - name: Cypress run
-              uses: cypress-io/github-action@v5
+              uses: cypress-io/github-action@v6
               with:
                   spec: cypress/e2e/${{ matrix.spec }}.cy.js
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               if: failure()
               with:
                   name: cypress-screenshots
                   path: cypress/screenshots
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               if: failure()
               with:
                   name: cypress-videos

diff --git a/.github/workflows/cypress-push.yml b/.github/workflows/cypress-push.yml
@@ -12,7 +12,7 @@ jobs:
             spec: ${{ steps.list_files.outputs.spec }}
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: List Files
               id: list_files
               run: |
@@ -25,9 +25,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: Cache node modules
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               id: cache-node-modules
               with:
                   path: node_modules
@@ -49,9 +49,9 @@ jobs:
                 spec: ${{ fromJson(needs.generate_file_list.outputs.spec) }}
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: Restore node modules cache
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: node_modules
                   key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
@@ -65,17 +65,17 @@ jobs:
                   npx wp-env start
                   echo "WordPress version: `npx wp-env run cli core version`"
             - name: Cypress run
-              uses: cypress-io/github-action@v5
+              uses: cypress-io/github-action@v6
               with:
                   spec: cypress/e2e/${{ matrix.spec }}.cy.js
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               if: failure()
               with:
                   name: cypress-screenshots
                   path: cypress/screenshots
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               if: failure()
               with:
                   name: cypress-videos

diff --git a/.github/workflows/release-to-wp-org.yml b/.github/workflows/release-to-wp-org.yml
@@ -8,7 +8,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: npm install and build
               run: |

diff --git a/.github/workflows/update-wordpress-readme.yml b/.github/workflows/update-wordpress-readme.yml
@@ -8,7 +8,7 @@ jobs:
         name: Push to WordPress.org
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - name: npm install and build
               run: |
                   npm ci

diff --git a/.wp-env.json b/.wp-env.json
@@ -1,7 +1,4 @@
 {
     "core": null,
-    "plugins": ["."],
-    "mappings": {
-        "wp-content/plugins/prismatic": "https://downloads.wordpress.org/plugin/prismatic.zip"
-    }
+    "plugins": ["."]
 }
diff --git a/cypress/e2e/compatability.cy.js b/cypress/e2e/compatability.cy.js
@@ -12,6 +12,7 @@ context('Compatability checks', () => {
         cy.installPlugin('prismatic');
         // make sure we don't see thhe word fatal or error
         cy.get('body').should('not.contain', 'fatal error');
+        cy.visitAdminPage('plugins.php');
         // make sure both prismatic and code-block-pro are active
         cy.get('#deactivate-code-block-pro').should('exist');
         cy.get('#deactivate-prismatic').should('exist');

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -59,9 +59,16 @@ Cypress.Commands.add('getPostContent', (addon = '') => {
     return cy.get(`${BLOCK_CONTAINER} ${addon}`);
 });
 Cypress.Commands.add('focusBlock', (blockName, addon = '') => {
-    cy.get(
-        `${BLOCK_CONTAINER} .wp-block[class$="${blockName}"] ${addon}`,
-    ).click();
+    cy.window().then((win) => {
+        cy.get(`${BLOCK_CONTAINER} .wp-block[class$="${blockName}"] ${addon}`)
+            .should('be.visible')
+            .then((el) => {
+                el[0].focus();
+                win.scrollTo(0, 0);
+                // make sure the window is scrolled to the top
+                return win.scrollY === 0;
+            });
+    });
 });
 Cypress.Commands.add('getCurrentPostObject', () => {
     cy.wpDataSelect('core/editor', 'getCurrentPost');