From 59ea98767178c500788ff9d665c2ef6ec2e52645 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sun, 26 Apr 2026 14:05:13 +0200 Subject: [PATCH] Convert test files to ESM (batch 1): apicalls, sessionsAndGroups, restoreRevision, instance, health, fuzzImportTest Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/tests/backend/specs/api/fuzzImportTest.ts | 6 ++++++ src/tests/backend/specs/api/instance.ts | 8 +++++++- src/tests/backend/specs/api/restoreRevision.ts | 13 +++++++++---- src/tests/backend/specs/api/sessionsAndGroups.ts | 11 ++++++++--- src/tests/backend/specs/apicalls.ts | 7 ++++++- src/tests/backend/specs/health.ts | 13 +++++++++---- 6 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/tests/backend/specs/api/fuzzImportTest.ts b/src/tests/backend/specs/api/fuzzImportTest.ts index 3caa185da..196f548ff 100644 --- a/src/tests/backend/specs/api/fuzzImportTest.ts +++ b/src/tests/backend/specs/api/fuzzImportTest.ts @@ -1,3 +1,9 @@ +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + /* * Fuzz testing the import endpoint */ diff --git a/src/tests/backend/specs/api/instance.ts b/src/tests/backend/specs/api/instance.ts index 2bf51bf86..c69d62332 100644 --- a/src/tests/backend/specs/api/instance.ts +++ b/src/tests/backend/specs/api/instance.ts @@ -1,11 +1,17 @@ 'use strict'; +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; + /* * Tests for the instance-level APIs * * Section "GLOBAL FUNCTIONS" in src/node/db/API.js */ -const common = require('../../common'); +import common from '../../common.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); let agent:any; const apiVersion = '1.2.14'; diff --git a/src/tests/backend/specs/api/restoreRevision.ts b/src/tests/backend/specs/api/restoreRevision.ts index e30c8aa25..a6f8c58f2 100644 --- a/src/tests/backend/specs/api/restoreRevision.ts +++ b/src/tests/backend/specs/api/restoreRevision.ts @@ -1,11 +1,16 @@ 'use strict'; +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; import {PadType} from "../../../../node/types/PadType"; -const assert = require('assert').strict; -const authorManager = require('../../../../node/db/AuthorManager'); -const common = require('../../common'); -const padManager = require('../../../../node/db/PadManager'); +import assert from 'assert'; +import authorManager from '../../../../node/db/AuthorManager.js'; +import common from '../../common.js'; +import padManager from '../../../../node/db/PadManager.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); describe(__filename, function () { let agent:any; diff --git a/src/tests/backend/specs/api/sessionsAndGroups.ts b/src/tests/backend/specs/api/sessionsAndGroups.ts index d65083aad..12c26359d 100644 --- a/src/tests/backend/specs/api/sessionsAndGroups.ts +++ b/src/tests/backend/specs/api/sessionsAndGroups.ts @@ -1,11 +1,16 @@ 'use strict'; -import {agent, generateJWTToken, init, logger} from "../../common"; +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; +import {agent, generateJWTToken, init, logger} from "../../common.js"; import TestAgent from "supertest/lib/agent"; import supertest from "supertest"; -const assert = require('assert').strict; -const db = require('../../../../node/db/DB'); +import assert from 'assert'; +import db from '../../../../node/db/DB.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); let apiVersion = 1; let groupID = ''; diff --git a/src/tests/backend/specs/apicalls.ts b/src/tests/backend/specs/apicalls.ts index 5b4060ccb..0b4c302bc 100644 --- a/src/tests/backend/specs/apicalls.ts +++ b/src/tests/backend/specs/apicalls.ts @@ -1,6 +1,11 @@ 'use strict'; -const common = require('../common'); +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; +import common from '../common.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); describe(__filename, function () { this.timeout(30000); diff --git a/src/tests/backend/specs/health.ts b/src/tests/backend/specs/health.ts index 89ee3aad5..d36927d4f 100644 --- a/src/tests/backend/specs/health.ts +++ b/src/tests/backend/specs/health.ts @@ -1,13 +1,18 @@ 'use strict'; +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; import {MapArrayType} from "../../../node/types/MapType"; -const assert = require('assert').strict; -const common = require('../common'); +import assert from 'assert'; +import common from '../common.js'; import settings, { getEpVersion -} from '../../../node/utils/Settings'; -const superagent = require('superagent'); +} from '../../../node/utils/Settings.js'; +import superagent from 'superagent'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); describe(__filename, function () { let agent:any;