From 6f7c6eec04daaf82b9618aea987f0d37ee247ef8 Mon Sep 17 00:00:00 2001 From: Nerivec <62446222+Nerivec@users.noreply.github.com> Date: Sat, 26 Jul 2025 20:05:13 +0200 Subject: [PATCH] chore: import vitest instead of relying on globals (#28084) --- test/controller.bench.ts | 2 +- test/controller.test.ts | 1 + test/data.test.ts | 3 +-- test/extensions/availability.test.ts | 1 + test/extensions/bind.test.ts | 1 + test/extensions/bridge.test.ts | 1 + test/extensions/configure.test.ts | 1 + test/extensions/externalConverters.test.ts | 1 + test/extensions/externalExtensions.test.ts | 1 + test/extensions/frontend.test.ts | 1 + test/extensions/groups.test.ts | 1 + test/extensions/health.test.ts | 1 + test/extensions/homeassistant.test.ts | 1 + test/extensions/networkMap.test.ts | 1 + test/extensions/onEvent.test.ts | 1 + test/extensions/otaUpdate.test.ts | 1 + test/extensions/publish.test.ts | 1 + test/extensions/receive.test.ts | 1 + test/logger.test.ts | 1 + test/onboarding.test.ts | 1 + test/sd-notify.test.ts | 1 + test/settings.test.ts | 2 +- test/settingsMigration.test.ts | 1 + test/tsconfig.json | 1 - test/utils.test.ts | 2 +- 25 files changed, 24 insertions(+), 6 deletions(-) diff --git a/test/controller.bench.ts b/test/controller.bench.ts index ba48d3066..acfdf7ef2 100644 --- a/test/controller.bench.ts +++ b/test/controller.bench.ts @@ -1,6 +1,6 @@ import {existsSync, mkdirSync} from "node:fs"; import stringify from "json-stable-stringify-without-jsonify"; -import {afterEach, beforeEach, bench, describe} from "vitest"; +import {afterAll, afterEach, beforeAll, beforeEach, bench, describe} from "vitest"; import {Zcl, Zdo, ZSpec} from "zigbee-herdsman"; import type Adapter from "zigbee-herdsman/dist/adapter/adapter"; import type {ZclPayload} from "zigbee-herdsman/dist/adapter/events"; diff --git a/test/controller.test.ts b/test/controller.test.ts index 757e369e2..4c197a44c 100644 --- a/test/controller.test.ts +++ b/test/controller.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "./mocks/data"; import {mockLogger} from "./mocks/logger"; import { diff --git a/test/data.test.ts b/test/data.test.ts index 5a5deb4c9..cd71a2392 100644 --- a/test/data.test.ts +++ b/test/data.test.ts @@ -1,7 +1,6 @@ import path from "node:path"; - import tmp from "tmp"; - +import {describe, expect, it} from "vitest"; import data from "../lib/util/data"; describe("Data", () => { diff --git a/test/extensions/availability.test.ts b/test/extensions/availability.test.ts index 6146a3244..22735214b 100644 --- a/test/extensions/availability.test.ts +++ b/test/extensions/availability.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/bind.test.ts b/test/extensions/bind.test.ts index 64bf35883..49ef36eba 100644 --- a/test/extensions/bind.test.ts +++ b/test/extensions/bind.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockDebounce} from "../mocks/debounce"; import {mockLogger} from "../mocks/logger"; diff --git a/test/extensions/bridge.test.ts b/test/extensions/bridge.test.ts index 2e78fc0b8..44d354914 100644 --- a/test/extensions/bridge.test.ts +++ b/test/extensions/bridge.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockJSZipFile, mockJSZipGenerateAsync} from "../mocks/jszip"; import {mockLogger} from "../mocks/logger"; diff --git a/test/extensions/configure.test.ts b/test/extensions/configure.test.ts index 71d2452b6..58e737c8b 100644 --- a/test/extensions/configure.test.ts +++ b/test/extensions/configure.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/externalConverters.test.ts b/test/extensions/externalConverters.test.ts index ace7b7234..6fa753783 100644 --- a/test/extensions/externalConverters.test.ts +++ b/test/extensions/externalConverters.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {mockMQTTEndAsync, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/externalExtensions.test.ts b/test/extensions/externalExtensions.test.ts index 9d957d8ab..ef94feb6b 100644 --- a/test/extensions/externalExtensions.test.ts +++ b/test/extensions/externalExtensions.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {mockMQTTEndAsync, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/frontend.test.ts b/test/extensions/frontend.test.ts index 4efa19374..3110ee1f3 100644 --- a/test/extensions/frontend.test.ts +++ b/test/extensions/frontend.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/groups.test.ts b/test/extensions/groups.test.ts index 85a215942..b466e26fd 100644 --- a/test/extensions/groups.test.ts +++ b/test/extensions/groups.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/health.test.ts b/test/extensions/health.test.ts index b31c13e45..d27c6dc57 100644 --- a/test/extensions/health.test.ts +++ b/test/extensions/health.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/homeassistant.test.ts b/test/extensions/homeassistant.test.ts index 7b7500d58..4f1ccea51 100644 --- a/test/extensions/homeassistant.test.ts +++ b/test/extensions/homeassistant.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, beforeAll, beforeEach, describe, expect, it, test, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync, mockMQTTSubscribeAsync, mockMQTTUnsubscribeAsync} from "../mocks/mqtt"; diff --git a/test/extensions/networkMap.test.ts b/test/extensions/networkMap.test.ts index 0110d6eaa..96cea4344 100644 --- a/test/extensions/networkMap.test.ts +++ b/test/extensions/networkMap.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/onEvent.test.ts b/test/extensions/onEvent.test.ts index 69c9ea3d3..8bb304c2d 100644 --- a/test/extensions/onEvent.test.ts +++ b/test/extensions/onEvent.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/otaUpdate.test.ts b/test/extensions/otaUpdate.test.ts index 83759643d..b5d8d4df9 100644 --- a/test/extensions/otaUpdate.test.ts +++ b/test/extensions/otaUpdate.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/publish.test.ts b/test/extensions/publish.test.ts index ab8901a54..aafadddeb 100644 --- a/test/extensions/publish.test.ts +++ b/test/extensions/publish.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/extensions/receive.test.ts b/test/extensions/receive.test.ts index 0e5e1d364..6e37a4acf 100644 --- a/test/extensions/receive.test.ts +++ b/test/extensions/receive.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "../mocks/data"; import {mockLogger} from "../mocks/logger"; import {events as mockMQTTEvents, mockMQTTPublishAsync} from "../mocks/mqtt"; diff --git a/test/logger.test.ts b/test/logger.test.ts index d542d6c1d..379d53dfe 100644 --- a/test/logger.test.ts +++ b/test/logger.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "./mocks/data"; import fs from "node:fs"; diff --git a/test/onboarding.test.ts b/test/onboarding.test.ts index 047339d19..4923c2e58 100644 --- a/test/onboarding.test.ts +++ b/test/onboarding.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import * as data from "./mocks/data"; import {rmSync, writeFileSync} from "node:fs"; diff --git a/test/sd-notify.test.ts b/test/sd-notify.test.ts index dd0b27f61..e9d59291e 100644 --- a/test/sd-notify.test.ts +++ b/test/sd-notify.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import {mockLogger} from "./mocks/logger"; import {initSdNotify} from "../lib/util/sd-notify"; diff --git a/test/settings.test.ts b/test/settings.test.ts index d5695ba36..ccc613fed 100644 --- a/test/settings.test.ts +++ b/test/settings.test.ts @@ -1,8 +1,8 @@ // side-effect ensures using mock paths +import {beforeEach, describe, expect, it} from "vitest"; import "./mocks/data"; import fs from "node:fs"; - import yaml from "js-yaml"; import objectAssignDeep from "object-assign-deep"; diff --git a/test/settingsMigration.test.ts b/test/settingsMigration.test.ts index d68fc21e8..69b605f70 100644 --- a/test/settingsMigration.test.ts +++ b/test/settingsMigration.test.ts @@ -1,4 +1,5 @@ // biome-ignore assist/source/organizeImports: import mocks first +import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it} from "vitest"; import * as data from "./mocks/data"; import {existsSync, readFileSync, rmSync} from "node:fs"; diff --git a/test/tsconfig.json b/test/tsconfig.json index 04c10c8b7..a52208207 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../tsconfig", "include": ["./**/*", "vitest.config.mts"], "compilerOptions": { - "types": ["vitest/globals"], "rootDir": "..", "noEmit": true }, diff --git a/test/utils.test.ts b/test/utils.test.ts index 66fdf1269..3c3e41e98 100644 --- a/test/utils.test.ts +++ b/test/utils.test.ts @@ -1,7 +1,7 @@ import {exec} from "node:child_process"; import fs from "node:fs"; import path from "node:path"; - +import {describe, expect, it, vi} from "vitest"; import utils, {assertString} from "../lib/util/utils"; // keep the implementations, just spy