diff --git a/src/tests/container/loadSettings.js b/src/tests/container/loadSettings.ts similarity index 80% rename from src/tests/container/loadSettings.js rename to src/tests/container/loadSettings.ts index b59ff0165..e764b911f 100644 --- a/src/tests/container/loadSettings.js +++ b/src/tests/container/loadSettings.ts @@ -12,10 +12,15 @@ * back to a default) */ -const fs = require('fs'); -const jsonminify = require('jsonminify'); +import fs from 'fs'; +import jsonminify from 'jsonminify'; +import { fileURLToPath } from 'node:url'; +import { dirname } from 'node:path'; -function loadSettings() { +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + +export function loadSettings(): any { let settingsStr = fs.readFileSync(`${__dirname}/../../../settings.json.docker`).toString(); // try to parse the settings try { @@ -33,5 +38,3 @@ function loadSettings() { console.error('whoops something is bad with settings'); } } - -exports.loadSettings = loadSettings; diff --git a/src/tests/container/specs/api/pad.js b/src/tests/container/specs/api/pad.ts similarity index 85% rename from src/tests/container/specs/api/pad.js rename to src/tests/container/specs/api/pad.ts index f6ff8ebf5..be8ffb64f 100644 --- a/src/tests/container/specs/api/pad.js +++ b/src/tests/container/specs/api/pad.ts @@ -5,9 +5,11 @@ * TODO: unify those two files, and merge in a single one. */ -const settings = require('../../loadSettings').loadSettings(); -const supertest = require('supertest'); +import { describe, it } from 'vitest'; +import supertest from 'supertest'; +import { loadSettings } from '../../loadSettings.js'; +const settings = loadSettings(); const api = supertest(`http://${settings.ip}:${settings.port}`); const apiVersion = 1;