ep_markdown 11.0.15 → 11.0.17

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

@@ -1,7 +1,7 @@
 {
   "name": "ep_markdown",
   "description": "Edit and Export as Markdown in Etherpad",
-  "version": "11.0.15",
+  "version": "11.0.17",
   "author": {
     "name": "John McLear",
     "email": "john@mclear.co.uk",

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

@@ -0,0 +1,35 @@
+import {expect, test} from '@playwright/test';
+import {clearPadContent, getPadBody, goToNewPad, selectAllText, writeToPad}
+    from 'ep_etherpad-lite/tests/frontend-new/helper/padHelper';
+
+test.beforeEach(async ({page}) => {
+  await goToNewPad(page);
+});
+
+test.describe('ep_markdown', () => {
+  test('Bold section renders the markdown class on body when "Show Markdown" is enabled',
+      async ({page}) => {
+        const padBody = await getPadBody(page);
+        await padBody.click();
+        await clearPadContent(page);
+        await writeToPad(page, 'bold');
+        await selectAllText(page);
+
+        // Apply bold via the toolbar button.
+        await page.locator('.buttonicon-bold').click();
+
+        // Toggle "Show Markdown" in pad settings.
+        // Settings popup must be open for #options-markdown to be clickable.
+        await page.locator('.buttonicon-settings').click();
+        await page.locator('#options-markdown').click({force: true});
+
+        // The pad body should gain the `markdown` class so its CSS swaps
+        // <b> for visible **bold** rendering.
+        await expect(padBody).toHaveClass(/markdown/);
+
+        // The original text content is unchanged (the rendering is purely
+        // CSS-driven; the underlying text remains "bold" without the
+        // surrounding asterisks in the document model).
+        await expect(padBody.locator('div').first()).toHaveText('bold');
+      });
+});

package/static/tests/frontend/specs/test.js

@@ -1,30 +0,0 @@
-'use strict';
-
-describe('Set formatting attributes and ensure ep_markdown displays properly', function () {
-  // create a new pad before each test run
-  beforeEach(async function () {
-    this.timeout(60000);
-    await helper.aNewPad();
-  });
-
-  it('Bold section is shown as **foo** when clicking Show Markdown', async function () {
-    this.timeout(60000);
-    const chrome$ = helper.padChrome$;
-    const inner$ = helper.padInner$;
-
-    const $editorContents = inner$('div');
-
-    // clear pad
-    $editorContents.sendkeys('{selectall}');
-    inner$('div').first().sendkeys('bold');
-    inner$('div').first().sendkeys('{selectall}');
-    chrome$('.buttonicon-bold').click();
-    chrome$('#options-markdown').click();
-
-    await helper.waitForPromise(() => (inner$('div').first()[0].textContent === 'bold'));
-
-    const hasMarkdown = inner$('body').hasClass('markdown');
-    // TODO: Use a psuedo selector to ensure the value displayed to user is **bold**
-    expect(hasMarkdown).to.be(true);
-  });
-});