ep_spellcheck 0.0.91 → 0.0.93

package/.github/workflows/backend-tests.yml

@@ -26,6 +26,10 @@ jobs:
         with:
           repository: ether/etherpad-lite
           path: etherpad-lite
+      - uses: actions/setup-node@v4
+        name: Install Node.js
+        with:
+          node-version: 22
       - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:

package/.github/workflows/frontend-tests.yml

@@ -15,6 +15,11 @@ jobs:
         uses: actions/checkout@v6
         with:
           repository: ether/etherpad-lite
+          path: etherpad-lite
+      - uses: actions/setup-node@v4
+        name: Install Node.js
+        with:
+          node-version: 22
       - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
@@ -32,63 +37,36 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
       -
-        name: Check out the plugin
+        name: Checkout plugin repository
         uses: actions/checkout@v6
         with:
-          path: ./node_modules/__tmp
-      -
-        name: export GIT_HASH to env
-        id: environment
-        run: |
-          cd ./node_modules/__tmp
-          echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
-      -
-        name: Determine plugin name
-        id: plugin_name
-        run: |
-          cd ./node_modules/__tmp
-          npx -c 'printf %s\\n "::set-output name=plugin_name::${npm_package_name}"'
-      -
-        name: Rename plugin directory
-        env:
-          PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-        run: |
-          mv ./node_modules/__tmp ./node_modules/"${PLUGIN_NAME}"
-      -
-        name: Install plugin dependencies
-        env:
-          PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-        run: |
-          cd ./node_modules/"${PLUGIN_NAME}"
-          pnpm i
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, otherwise npm will try to hoist common
-      # dependencies by removing them from src/node_modules and installing them
-      # in the top-level node_modules. As of v6.14.10, npm's hoist logic appears
-      # to be buggy, because it sometimes removes dependencies from
-      # src/node_modules but fails to add them to the top-level node_modules.
-      # Even if npm correctly hoists the dependencies, the hoisting seems to
-      # confuse tools such as `npm outdated`, `npm update`, and some ESLint
-      # rules.
+          path: plugin
       -
         name: Install Etherpad core dependencies
+        working-directory: ./etherpad-lite
         run: bin/installDeps.sh
+      - name: Install plugin
+        working-directory: ./etherpad-lite
+        run: |
+          pnpm run plugins i --path ../../plugin
       - name: Create settings.json
+        working-directory: ./etherpad-lite
         run: cp ./src/tests/settings.json settings.json
       - name: Run the frontend tests
+        working-directory: ./etherpad-lite
         shell: bash
         run: |
           pnpm run dev &
           connected=false
           can_connect() {
-          curl -sSfo /dev/null http://localhost:9001/ || return 1
-          connected=true
+            curl -sSfo /dev/null http://localhost:9001/ || return 1
+            connected=true
           }
           now() { date +%s; }
           start=$(now)
-          while [ $(($(now) - $start)) -le 15 ] && ! can_connect; do
-          sleep 1
+          while [ $(($(now) - $start)) -le 30 ] && ! can_connect; do
+            sleep 1
           done
           cd src
-          pnpm exec playwright install chromium  --with-deps
+          pnpm exec playwright install chromium --with-deps
           pnpm run test-ui --project=chromium

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ep_spellcheck",
-  "version": "0.0.91",
+  "version": "0.0.93",
   "keywords": [
     "spell",
     "check",

package/static/tests/frontend-new/specs/spellcheck.spec.ts

@@ -8,11 +8,22 @@ test.beforeEach(async ({page}) => {
 test.describe('ep_spellcheck', () => {
   test('Spellcheck is on by default when not disabled', async ({page}) => {
     // ep_spellcheck flips the spellcheck attribute on the inner editor
-    // body. Wait up to 5s in case it's set asynchronously after pad init.
+    // body. Under Firefox the nested ace_inner iframe can be late to
+    // attach; wait for it before dereferencing, and read the attribute
+    // through the iframe element directly so a delayed body element
+    // doesn't keep us in a 90s test timeout.
+    await expect.poll(
+        async () => page.frame('ace_inner') != null,
+        {timeout: 10_000})
+        .toBe(true);
     const innerFrame = page.frame('ace_inner')!;
     await expect.poll(
-        async () => innerFrame.locator('body').getAttribute('spellcheck'),
-        {timeout: 5_000})
+        async () => {
+          const body = innerFrame.locator('body');
+          if (await body.count() === 0) return null;
+          return body.getAttribute('spellcheck');
+        },
+        {timeout: 10_000})
         .toBe('true');
   });
 });