Merge branch 'develop' into add/users-last-seen

Automattic · Jan 3, 2024 · bebe719 · bebe719
2 parents 53c9bbb + d0af967
commit bebe719
Show file tree

Hide file tree

Showing 93 changed files with 4,419 additions and 2,677 deletions.
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Request to build Docker image
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}
           script: |

diff --git a/.github/workflows/changelog-summary-prod.yml b/.github/workflows/changelog-summary-prod.yml
@@ -64,7 +64,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.26.0
+        uses: shivammathur/setup-php@2.28.0
         with:
           php-version: '7.4'
 

diff --git a/.github/workflows/changelog-summary-staging.yml b/.github/workflows/changelog-summary-staging.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.26.0
+        uses: shivammathur/setup-php@2.28.0
         with:
           php-version: '7.4'
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,29 +27,22 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        # Jetpack, Single-Site, PHP 7.4
-          - { wp: 5.8.x,   ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: 5.9.x,   ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: 6.0.x,   ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: 6.1.x,   ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: latest,  ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: nightly, ms: 'no',  jp: 'yes', php: '7.4', phpunit: 7 }
-        # Jetpack, Multi-Site, PHP 7.4
-          - { wp: latest,  ms: 'yes', jp: 'yes', php: '7.4', phpunit: 7 }
-          - { wp: nightly, ms: 'yes', jp: 'yes', php: '7.4', phpunit: 7 }
-        # No Jetpack, WP latest, PHP 7.4
-          - { wp: latest,  ms: 'no',  jp: 'no',  php: '7.4', phpunit: 7 }
-          - { wp: latest,  ms: 'yes', jp: 'no',  php: '7.4', phpunit: 7 }
-        # PHP 8.0, Jetpack
-          - { wp: 6.2.x,   ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: 6.2.x,   ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: latest,  ms: 'no',  jp: 'yes', php: '8.0', phpunit: '', coverage: 'yes' }
-          - { wp: latest,  ms: 'yes', jp: 'yes', php: '8.0', phpunit: '', coverage: 'yes' }
-          - { wp: nightly, ms: 'no',  jp: 'yes', php: '8.0', phpunit: '' }
-          - { wp: nightly, ms: 'yes', jp: 'yes', php: '8.0', phpunit: '' }
         # PHP 8.1, Jetpack
-          - { wp: latest,  ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
-          - { wp: latest,  ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.0.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.0.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.1.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.1.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.2.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.2.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.3.x,   ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: 6.3.x,   ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: latest,  ms: 'no',  jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
+          - { wp: latest,  ms: 'yes', jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
+          - { wp: nightly, ms: 'no',  jp: 'yes', php: '8.1', phpunit: '' }
+          - { wp: nightly, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
+        # No Jetpack, WP latest, PHP 8.1
+          - { wp: latest,  ms: 'no',  jp: 'no',  php: '8.1', phpunit: '' }
+          - { wp: latest,  ms: 'yes', jp: 'no',  php: '8.1', phpunit: '' }
         # PHP 8.2, Jetpack
           - { wp: nightly, ms: 'no',  jp: 'yes', php: '8.2', phpunit: '' }
           - { wp: nightly, ms: 'yes', jp: 'yes', php: '8.2', phpunit: '' }

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -32,10 +32,10 @@ jobs:
         uses: actions/[email protected]
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/core-tests.yml b/.github/workflows/core-tests.yml
@@ -60,14 +60,14 @@ jobs:
           echo "GITHUB_EVENT_NAME=pull_request" >> "wordpress/.env"
 
       - name: Set up Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
         with:
           node-version-file: 'wordpress/.nvmrc'
           cache: npm
           cache-dependency-path: 'wordpress/package-lock.json'
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.26.0
+        uses: shivammathur/setup-php@2.28.0
         with:
           php-version: 8.0
           coverage: none

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -76,7 +76,7 @@ jobs:
         uses: ./.github/actions/prepare-source
 
       - name: Setup Node
-        uses: actions/setup-node@v3.8.1
+        uses: actions/setup-node@v4.0.1
         with:
           node-version: 'lts/*'
           cache: npm
@@ -113,7 +113,7 @@ jobs:
         working-directory: __tests__/e2e
 
       - name: Archive test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-results

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -28,15 +28,15 @@ jobs:
         uses: actions/[email protected]
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.26.0
+        uses: shivammathur/setup-php@2.28.0
         with:
           coverage: none
           php-version: "8.0"
         env:
           fail-fast: 'true'
 
       - name: Setup Node
-        uses: actions/setup-node@v3.8.1
+        uses: actions/setup-node@v4.0.1
         with:
           node-version: 'lts/*'
           cache: npm
@@ -55,7 +55,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup Node
-        uses: actions/setup-node@v3.8.1
+        uses: actions/setup-node@v4.0.1
         with:
           node-version: 'lts/*'
           cache: npm

diff --git a/.github/workflows/search-dev-tools.yml b/.github/workflows/search-dev-tools.yml
@@ -27,7 +27,7 @@ jobs:
           token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}
 
       - name: Setup Node
-        uses: actions/setup-node@v3.8.1
+        uses: actions/setup-node@v4.0.1
         with:
           node-version: 'lts/*'
           cache: npm

diff --git a/.github/workflows/search-e2e.yml b/.github/workflows/search-e2e.yml
@@ -38,7 +38,7 @@ jobs:
       uses: ./.github/actions/prepare-source
 
     - name: "Install node v${{ env.NODE_VERSION }}"
-      uses: actions/setup-node@v3.8.1
+      uses: actions/setup-node@v4.0.1
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: npm
@@ -59,7 +59,7 @@ jobs:
       run: npm run cypress:run
 
     - name: Make artifacts available
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: cypress-artifact

diff --git a/__tests__/e2e/lib/pages/wp-editor-page.ts b/__tests__/e2e/lib/pages/wp-editor-page.ts
@@ -48,6 +48,9 @@ const selectors = {
     desktopEditorSidebarButton: 'button[aria-label="Block editor sidebar"]:visible',
     desktopDashboardLink: 'a[aria-description="Returns to the dashboard"]:visible',
     mobileDashboardLink: 'a[aria-current="page"]:visible',
+
+    // Choose a pattern
+    choosePatternCloseButton: '.components-modal__screen-overlay .components-modal__header button',
 };
 
 export class EditorPage {
@@ -81,6 +84,22 @@ export class EditorPage {
         } );
     }
 
+    async dismissPatternSelector(): Promise<void> {
+        try {
+            await this.page.waitForSelector( selectors.choosePatternCloseButton, {
+                state: 'visible',
+                timeout: 5000,
+            } );
+        } catch ( err ) {
+            return;
+        }
+
+        const closeButton = this.page.locator( selectors.choosePatternCloseButton );
+        return closeButton.click( {
+            delay: 20,
+        } );
+    }
+
     /**
      * Enter Title of page or post
      *