ep_author_hover 11.0.17 → 11.0.19

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

@@ -15,6 +15,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           repository: ether/etherpad-lite
+          path: etherpad-lite
       - uses: pnpm/action-setup@v6
         name: Install pnpm
         with:
@@ -32,63 +33,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

@@ -6,7 +6,7 @@
   },
   "name": "ep_author_hover",
   "description": "Adds author names to span titles (shows on hover), works as authors change their name.  Hover includes author color and fast switching between author spans.  Hat tip to Martyn York for the initial work on this.",
-  "version": "11.0.17",
+  "version": "11.0.19",
   "repository": {
     "type": "git",
     "url": "https://github.com/ether/ep_author_hover.git"

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

@@ -1,11 +1,28 @@
 import {expect, test} from '@playwright/test';
 import {goToNewPad} from 'ep_etherpad-lite/tests/frontend-new/helper/padHelper';
-import {showSettings} from 'ep_etherpad-lite/tests/frontend-new/helper/settingsHelper';
 
 test.beforeEach(async ({page}) => {
   await goToNewPad(page);
 });
 
+// Inline replacement for the shared `showSettings` helper. The shared helper
+// performs a regular `.click()` on the settings cog, which times out in
+// CI because core's `#toolbar-overlay` div intercepts pointer events while
+// the editor is focused (the same root cause that required `force:true`
+// in `clearAuthorship` / the ep_align fix). The overlay is purely cosmetic,
+// so dispatching the click with `force:true` is the supported workaround.
+const openSettingsPopup = async (page: import('@playwright/test').Page) => {
+  const settings = page.locator('#settings');
+  const isShown = async () =>
+    ((await settings.getAttribute('class')) || '').includes('popup-show');
+  if (await isShown()) return;
+  await page
+    .locator("button[data-l10n-id='pad.toolbar.settings.title']")
+    .click({force: true});
+  await page.waitForFunction(
+    () => document.querySelector('#settings')!.classList.contains('popup-show'));
+};
+
 test.describe('ep_author_hover', () => {
   test('plugin is loaded and exposes itself in clientVars', async ({page}) => {
     const enabled = await page.evaluate(
@@ -14,7 +31,7 @@ test.describe('ep_author_hover', () => {
   });
 
   test('settings popup exposes the author-hover toggle', async ({page}) => {
-    await showSettings(page);
+    await openSettingsPopup(page);
     // The plugin renders into #mySettings via the eejsBlock_mySettings
     // hook; its checkbox is identified by id="options-author-hover".
     await expect(page.locator('#options-author-hover')).toBeAttached();