@iobroker/testing 5.0.2 → 5.0.4

package/build/tests/integration/lib/adapterSetup.js

@@ -38,8 +38,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdapterSetup = void 0;
 // Add debug logging for tests
-// @ts-expect-error no types
-const objects_1 = require("alcalzone-shared/objects");
 const debug_1 = __importDefault(require("debug"));
 const fs_extra_1 = require("fs-extra");
 const path = __importStar(require("path"));
@@ -100,7 +98,7 @@ class AdapterSetup {
         const packageJsonPath = path.join(this.testDir, 'package.json');
         const packageJson = await (0, fs_extra_1.readJSON)(packageJsonPath);
         packageJson.dependencies[this.adapterFullName] = `file:./${tarballName}`;
-        for (const [dep, version] of (0, objects_1.entries)((0, adapterTools_1.getAdapterDependencies)(this.adapterDir))) {
+        for (const [dep, version] of Object.entries((0, adapterTools_1.getAdapterDependencies)(this.adapterDir))) {
             // Don't overwrite the js-controller GitHub dependency with a probably lower one
             if (dep === 'js-controller') {
                 continue;

package/build/tests/integration/lib/dbConnection.d.ts

@@ -13,10 +13,11 @@ export declare class DBConnection extends EventEmitter {
     /**
      * @param appName The branded name of "iobroker"
      * @param testDir The directory the integration tests are executed in
+     * @param logger Logger object
      */
     constructor(appName: string, testDir: string, logger: ioBroker.Logger);
-    private testDataDir;
-    private testControllerDir;
+    private readonly testDataDir;
+    private readonly testControllerDir;
     private _objectsServer;
     private _statesServer;
     private _objectsClient;

package/build/tests/integration/lib/dbConnection.js

@@ -48,6 +48,7 @@ class DBConnection extends events_1.default {
     /**
      * @param appName The branded name of "iobroker"
      * @param testDir The directory the integration tests are executed in
+     * @param logger Logger object
      */
     constructor(appName, testDir, logger) {
         super();
@@ -85,11 +86,18 @@ class DBConnection extends events_1.default {
             }
             return this._statesClient.setStateAsync(...args);
         });
-        this.delState = (...args) => {
+        this.delState = async (...args) => {
             if (!this._statesClient) {
                 throw new Error('States DB is not running');
             }
-            return this._statesClient.delStateAsync(...args);
+            await new Promise((resolve, reject) => this._statesClient.delState(args[0], (err) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve();
+                }
+            }));
         };
         this.getObjectViewAsync = (...args) => {
             if (!this._objectsClient) {

package/build/tests/unit/mocks/mockAdapter.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAdapterMock = createAdapterMock;
-// @ts-expect-error no types
 const objects_1 = require("alcalzone-shared/objects");
 const sinon_1 = require("sinon");
 const mockLogger_1 = require("./mockLogger");
@@ -159,7 +158,7 @@ function createAdapterMock(db, options = {}) {
             }
             const callback = getCallback(...args);
             if (typeof callback === 'function') {
-                let objects = (0, objects_1.values)(db.getObjects('*'));
+                let objects = Object.values(db.getObjects('*'));
                 objects = objects.filter(obj => obj.type === search);
                 if (startkey) {
                     objects = objects.filter(obj => obj._id >= startkey);
@@ -178,7 +177,7 @@ function createAdapterMock(db, options = {}) {
         getObjectList: (({ startkey, endkey, include_docs, }, ...args) => {
             const callback = getCallback(...args);
             if (typeof callback === 'function') {
-                let objects = (0, objects_1.values)(db.getObjects('*'));
+                let objects = Object.values(db.getObjects('*'));
                 if (startkey) {
                     objects = objects.filter(obj => obj._id >= startkey);
                 }

package/build/tests/unit/mocks/mockDatabase.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockDatabase = void 0;
 exports.createAsserts = createAsserts;
-// @ts-expect-error no types
 const objects_1 = require("alcalzone-shared/objects");
 const str2regex_1 = require("../../../lib/str2regex");
 const objectTemplate = Object.freeze({
@@ -113,14 +112,14 @@ class MockDatabase {
             pattern = namespaceOrPattern;
         }
         const idRegExp = (0, str2regex_1.str2regex)(pattern);
-        return (0, objects_1.composeObject)([...this.objects.entries()]
+        return Object.fromEntries([...this.objects.entries()]
             .filter(([id]) => idRegExp.test(id))
             .filter(([, obj]) => type == null || obj.type === type));
     }
     getStates(pattern) {
         // combines getStates and getForeignStates into one
         const idRegExp = (0, str2regex_1.str2regex)(pattern);
-        return (0, objects_1.composeObject)([...this.states.entries()].filter(([id]) => idRegExp.test(id)));
+        return Object.fromEntries([...this.states.entries()].filter(([id]) => idRegExp.test(id)));
     }
 }
 exports.MockDatabase = MockDatabase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/testing",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Shared utilities for adapter and module testing in ioBroker",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,7 +42,7 @@
     "@alcalzone/release-script": "^3.8.0",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@iobroker/adapter-core": "^3.2.3",
-    "@iobroker/eslint-config": "^1.0.0",
+    "@iobroker/eslint-config": "^2.0.1",
     "@iobroker/types": "^7.0.6",
     "@tsconfig/node16": "^16.1.3",
     "@types/chai": "^4.3.20",
@@ -50,13 +50,13 @@
     "@types/debug": "4.1.12",
     "@types/fs-extra": "^11.0.4",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.10.7",
-    "@types/sinon": "^17.0.3",
+    "@types/node": "^22.13.13",
+    "@types/sinon": "^17.0.4",
     "@types/sinon-chai": "^3.2.12",
     "rimraf": "^6.0.1",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.2",
-    "typescript": "~5.7.3"
+    "typescript": "~5.8.2"
   },
   "dependencies": {
     "alcalzone-shared": "~5.0.0",
@@ -64,8 +64,8 @@
     "chai-as-promised": "^7.1.2",
     "debug": "^4.4.0",
     "fs-extra": "^11.3.0",
-    "mocha": "^11.0.1",
-    "sinon": "^19.0.2",
+    "mocha": "^11.1.0",
+    "sinon": "^19.0.4",
     "sinon-chai": "^3.7.0"
   }
 }