ci: move pte e2e collaborationtests out in own workflow

test(portable-text-editor): adjust timings

ci: remove playwright from unit tests

test(portable-text-editor): prefix ignore path with rootDir

test(portable-text-editor): only include server setup when in e2e mode

test(portable-text-editor): move e2e tests to other folder

.github/workflows/e2e-pte.yml

@@ -0,0 +1,63 @@
+name: End-to-End PTE collaboration tests
+on:
+  # Build on pushes branches that have a PR (including drafts)
+  pull_request:
+  # Build on commits pushed to branches without a PR if it's in the allowlist
+  push:
+    branches: [next]
+jobs:
+  playwright-test:
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ vars.TURBO_TEAM }}
+    strategy:
+      fail-fast: false
+      matrix:
+        project: [chromium]
+        # Add more shards here if needed
+        shardIndex: [1, 2]
+        shardTotal: [2]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - name: Cache node modules
+        id: cache-node-modules
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: '**/node_modules'
+          key: ${{ runner.os }}-modules-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-modules-${{ env.cache-name }}-
+            ${{ runner.os }}-modules-
+            ${{ runner.os }}-
+
+      - name: Install project dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: yarn install --frozen-lockfile
+
+      - name: Store Playwright's Version
+        run: |
+          PLAYWRIGHT_VERSION=$(npx playwright --version | sed 's/Version //')
+          echo "Playwright's Version: $PLAYWRIGHT_VERSION"
+          echo "PLAYWRIGHT_VERSION=$PLAYWRIGHT_VERSION" >> $GITHUB_ENV
+
+      - name: Cache Playwright Browsers for Playwright's Version
+        id: cache-playwright-browsers
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/ms-playwright
+          key: playwright-browsers-${{ env.PLAYWRIGHT_VERSION }}
+
+      - name: Install Playwright Browsers
+        if: steps.cache-playwright-browsers.outputs.cache-hit != 'true'
+        run: npx playwright install --with-deps
+
+      - name: Run end-to-end tests
+        run: cd packages/@sanity/portable-text-editor && yarn test:e2e --silent --shard=${{ matrix.shardIndex}}/${{ matrix.shardTotal }}

.github/workflows/test.yml

@@ -63,27 +63,6 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
-      - name: Install project dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: yarn install --frozen-lockfile
-
-      - name: Store Playwright's Version
-        run: |
-          PLAYWRIGHT_VERSION=$(npx playwright --version | sed 's/Version //')
-          echo "Playwright's Version: $PLAYWRIGHT_VERSION"
-          echo "PLAYWRIGHT_VERSION=$PLAYWRIGHT_VERSION" >> $GITHUB_ENV
-
-      - name: Cache Playwright Browsers for Playwright's Version
-        id: cache-playwright-browsers
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ env.PLAYWRIGHT_VERSION }}
-
-      - name: Install Playwright Browsers
-        if: steps.cache-playwright-browsers.outputs.cache-hit != 'true'
-        run: npx playwright install --with-deps
-
       - name: Build CLI
         run: yarn build:cli # Needed for CLI tests
 
@@ -140,23 +119,6 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: yarn install --frozen-lockfile
 
-      - name: Store Playwright's Version
-        run: |
-          PLAYWRIGHT_VERSION=$(npx playwright --version | sed 's/Version //')
-          echo "Playwright's Version: $PLAYWRIGHT_VERSION"
-          echo "PLAYWRIGHT_VERSION=$PLAYWRIGHT_VERSION" >> $GITHUB_ENV
-
-      - name: Cache Playwright Browsers for Playwright's Version
-        id: cache-playwright-browsers
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/ms-playwright
-          key: playwright-browsers-${{ env.PLAYWRIGHT_VERSION }}
-
-      - name: Install Playwright Browsers
-        if: steps.cache-playwright-browsers.outputs.cache-hit != 'true'
-        run: npx playwright install --with-deps
-
       - name: Test
         id: test
         run: |

package.json

@@ -150,5 +150,8 @@
     "node-notifier": "^10.0.0"
   },
   "packageManager": "[email protected]",
-  "isSanityMonorepo": true
+  "isSanityMonorepo": true,
+  "dependencies": {
+    "yarn": "^1.22.19"
+  }
 }

packages/@sanity/portable-text-editor/test/__tests__/pasting.collaborative.test.ts → packages/@sanity/portable-text-editor/e2e-tests/__tests__/pasting.collaborative.test.ts

@@ -1,4 +1,4 @@
-/** @jest-environment ./test/setup/collaborative.jest.env.ts */
+/** @jest-environment ./e2e-tests/setup/collaborative.jest.env.ts */
 import os from 'os'
 import '../setup/globals.jest'
 import {noop} from 'lodash'

packages/@sanity/portable-text-editor/test/__tests__/selectionAdjustment.collaborative.test.ts → packages/@sanity/portable-text-editor/e2e-tests/__tests__/selectionAdjustment.collaborative.test.ts

@@ -1,4 +1,4 @@
-/** @jest-environment ./test/setup/collaborative.jest.env.ts */
+/** @jest-environment ./e2e-tests/setup/collaborative.jest.env.ts */
 
 import '../setup/globals.jest'
 

packages/@sanity/portable-text-editor/test/__tests__/undoRedo.collborative.test.ts → packages/@sanity/portable-text-editor/e2e-tests/__tests__/undoRedo.collborative.test.ts

@@ -1,4 +1,4 @@
-/** @jest-environment ./test/setup/collaborative.jest.env.ts */
+/** @jest-environment ./e2e-tests/setup/collaborative.jest.env.ts */
 import {toPlainText} from '@portabletext/toolkit'
 import '../setup/globals.jest'
 import type {PortableTextBlock} from '@sanity/types'

packages/@sanity/portable-text-editor/test/__tests__/writingTogether.collaborative.test.ts → packages/@sanity/portable-text-editor/e2e-tests/__tests__/writingTogether.collaborative.test.ts

@@ -1,4 +1,4 @@
-/** @jest-environment ./test/setup/collaborative.jest.env.ts */
+/** @jest-environment ./e2e-tests/setup/collaborative.jest.env.ts */
 
 import '../setup/globals.jest'
 import type {PortableTextBlock} from '@sanity/types'

packages/@sanity/portable-text-editor/jest.config.cjs

@@ -2,9 +2,22 @@
 
 const {createJestConfig} = require('../../../test/config.cjs')
 
+const PTE_E2E = process.env.PTE_E2E
+
+if (!PTE_E2E) {
+  module.exports = createJestConfig({
+    displayName: require('./package.json').name,
+    modulePathIgnorePatterns: ['<rootDir>/e2e-tests'],
+  })
+  return
+}
+
+// eslint-disable-next-line no-console
+console.info('Running collaborate editing tests for the Portable Text Editor')
+
 module.exports = createJestConfig({
   displayName: require('./package.json').name,
-  globalSetup: '<rootDir>/test/setup/globalSetup.ts',
-  globalTeardown: '<rootDir>/test/setup/globalTeardown.ts',
-  setupFilesAfterEnv: ['<rootDir>/test/setup/afterEnv.ts'],
+  globalSetup: '<rootDir>/e2e-tests/setup/globalSetup.ts',
+  globalTeardown: '<rootDir>/e2e-tests/setup/globalTeardown.ts',
+  setupFilesAfterEnv: ['<rootDir>/e2e-tests/setup/afterEnv.ts'],
 })

packages/@sanity/portable-text-editor/package.json

@@ -59,6 +59,7 @@
     "prettier": "prettier --write './**/*.{ts,tsx,js,css,html}'",
     "dev": "cd ./test/ && ts-node serve",
     "test": "jest",
+    "test:e2e": "PTE_E2E=true jest e2e-tests/__tests__",
     "test:watch": "jest --watch",
     "watch": "pkg-utils watch --tsconfig tsconfig.lib.json"
   },

packages/@sanity/portable-text-editor/src/editor/components/Synchronizer.tsx

@@ -28,7 +28,7 @@ const debugVerbose = debug.enabled && false
 
 // The editor will commit changes in a throttled fashion in order
 // not to overload the network and degrade performance while typing.
-const FLUSH_PATCHES_THROTTLED_MS = process.env.NODE_ENV === 'test' ? 100 : 1000
+const FLUSH_PATCHES_THROTTLED_MS = process.env.NODE_ENV === 'test' ? 500 : 1000
 
 /**
  * @internal