From 53cde306d6d7d7d2db8063a298bc69099c127fd1 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sun, 26 Apr 2026 14:06:12 +0200 Subject: [PATCH] Convert test files to ESM (batch 3): export, clientvar_rev_consistency, sanitizePluginsForWire, messages Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../specs/clientvar_rev_consistency.ts | 20 +++++++++++++------ src/tests/backend/specs/export.ts | 11 +++++++--- src/tests/backend/specs/messages.ts | 17 +++++++++++----- .../backend/specs/sanitizePluginsForWire.ts | 7 ++++++- 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/src/tests/backend/specs/clientvar_rev_consistency.ts b/src/tests/backend/specs/clientvar_rev_consistency.ts index 3346af5a9..44671064f 100644 --- a/src/tests/backend/specs/clientvar_rev_consistency.ts +++ b/src/tests/backend/specs/clientvar_rev_consistency.ts @@ -1,5 +1,8 @@ 'use strict'; +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; + /** * Regression test for https://github.com/ether/etherpad-lite/issues/4040 * @@ -13,12 +16,17 @@ * production failures were observed. */ -const assert = require('assert').strict; -const common = require('../common'); -const padManager = require('../../../node/db/PadManager'); -const plugins = require('../../../static/js/pluginfw/plugin_defs'); -const settings = require('../../../node/utils/Settings'); -import {randomString} from '../../../static/js/pad_utils'; +import assert from 'assert'; +import common from '../common.js'; +import padManager from '../../../node/db/PadManager.js'; +import pluginDefs from '../../../static/js/pluginfw/plugin_defs.js'; +import settings from '../../../node/utils/Settings.js'; +import {randomString} from '../../../static/js/pad_utils.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + +const plugins = pluginDefs; describe(__filename, function () { let agent: any; diff --git a/src/tests/backend/specs/export.ts b/src/tests/backend/specs/export.ts index 0abe24cda..20e9586f0 100644 --- a/src/tests/backend/specs/export.ts +++ b/src/tests/backend/specs/export.ts @@ -1,10 +1,15 @@ 'use strict'; +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; import {MapArrayType} from "../../../node/types/MapType"; -const common = require('../common'); -const padManager = require('../../../node/db/PadManager'); -import settings from '../../../node/utils/Settings'; +import common from '../common.js'; +import padManager from '../../../node/db/PadManager.js'; +import settings from '../../../node/utils/Settings.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); describe(__filename, function () { let agent:any; diff --git a/src/tests/backend/specs/messages.ts b/src/tests/backend/specs/messages.ts index c25057569..1f38ac990 100644 --- a/src/tests/backend/specs/messages.ts +++ b/src/tests/backend/specs/messages.ts @@ -1,13 +1,20 @@ 'use strict'; +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; import {PadType} from "../../../node/types/PadType"; import {MapArrayType} from "../../../node/types/MapType"; -const assert = require('assert').strict; -const common = require('../common'); -const padManager = require('../../../node/db/PadManager'); -const plugins = require('../../../static/js/pluginfw/plugin_defs'); -import readOnlyManager from '../../../node/db/ReadOnlyManager'; +import assert from 'assert'; +import common from '../common.js'; +import padManager from '../../../node/db/PadManager.js'; +import pluginDefs from '../../../static/js/pluginfw/plugin_defs.js'; +import readOnlyManager from '../../../node/db/ReadOnlyManager.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + +const plugins = pluginDefs; describe(__filename, function () { let agent:any; diff --git a/src/tests/backend/specs/sanitizePluginsForWire.ts b/src/tests/backend/specs/sanitizePluginsForWire.ts index 052a35be4..1ab48d1f5 100644 --- a/src/tests/backend/specs/sanitizePluginsForWire.ts +++ b/src/tests/backend/specs/sanitizePluginsForWire.ts @@ -1,7 +1,12 @@ 'use strict'; +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; import {strict as assert} from 'assert'; -const {sanitizePluginsForWire} = require('../../../node/handler/PadMessageHandler'); +import {sanitizePluginsForWire} from '../../../node/handler/PadMessageHandler.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); describe(__filename, function () { const makeRegistry = () => ({