@iobroker/testing 2.4.4 → 2.5.3

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAdapterMock = void 0;
-/* eslint-disable @typescript-eslint/camelcase */
 const objects_1 = require("alcalzone-shared/objects");
 const sinon_1 = require("sinon");
 const mockLogger_1 = require("./mockLogger");
@@ -100,11 +99,11 @@ function createAdapterMock(db, options = {}) {
         adapterDir: "",
         ioPack: {},
         pack: {},
-        log: mockLogger_1.createLoggerMock(),
+        log: (0, mockLogger_1.createLoggerMock)(),
         version: "any",
         connected: true,
         getPort: asyncEnabledStub,
-        stop: sinon_1.stub(),
+        stop: (0, sinon_1.stub)(),
         checkPassword: asyncEnabledStub,
         setPassword: asyncEnabledStub,
         checkGroup: asyncEnabledStub,
@@ -112,7 +111,7 @@ function createAdapterMock(db, options = {}) {
         getCertificates: asyncEnabledStub,
         sendTo: asyncEnabledStub,
         sendToHost: asyncEnabledStub,
-        idToDCS: sinon_1.stub(),
+        idToDCS: (0, sinon_1.stub)(),
         getObject: ((id, ...args) => {
             if (!id.startsWith(ret.namespace))
                 id = ret.namespace + "." + id;
@@ -150,7 +149,7 @@ function createAdapterMock(db, options = {}) {
             }
             const callback = getCallback(...args);
             if (typeof callback === "function") {
-                let objects = objects_1.values(db.getObjects("*"));
+                let objects = (0, objects_1.values)(db.getObjects("*"));
                 objects = objects.filter((obj) => obj.type === search);
                 if (startkey)
                     objects = objects.filter((obj) => obj._id >= startkey);
@@ -167,7 +166,7 @@ function createAdapterMock(db, options = {}) {
         getObjectList: (({ startkey, endkey, include_docs, }, ...args) => {
             const callback = getCallback(...args);
             if (typeof callback === "function") {
-                let objects = objects_1.values(db.getObjects("*"));
+                let objects = (0, objects_1.values)(db.getObjects("*"));
                 if (startkey)
                     objects = objects.filter((obj) => obj._id >= startkey);
                 if (endkey)
@@ -187,7 +186,7 @@ function createAdapterMock(db, options = {}) {
             if (!id.startsWith(ret.namespace))
                 id = ret.namespace + "." + id;
             const existing = db.getObject(id) || {};
-            const target = objects_1.extend({}, existing, obj);
+            const target = (0, objects_1.extend)({}, existing, obj);
             target._id = id;
             db.publishObject(target);
             const callback = getCallback(...args);
@@ -241,7 +240,7 @@ function createAdapterMock(db, options = {}) {
             if (callback)
                 callback(null, { id: target._id, value: target }, id);
         }),
-        findForeignObject: sinon_1.stub(),
+        findForeignObject: (0, sinon_1.stub)(),
         delForeignObject: ((id, ...args) => {
             db.deleteObject(id);
             const callback = getCallback(...args);
@@ -374,7 +373,7 @@ function createAdapterMock(db, options = {}) {
         createState: asyncEnabledStub,
         deleteState: asyncEnabledStub,
         getDevices: asyncEnabledStub,
-        getChannels: sinon_1.stub(),
+        getChannels: (0, sinon_1.stub)(),
         getChannelsOf: asyncEnabledStub,
         getStatesOf: asyncEnabledStub,
         readDir: asyncEnabledStub,
@@ -385,8 +384,8 @@ function createAdapterMock(db, options = {}) {
         unlink: asyncEnabledStub,
         rename: asyncEnabledStub,
         chmodFile: asyncEnabledStub,
-        formatValue: sinon_1.stub(),
-        formatDate: sinon_1.stub(),
+        formatValue: (0, sinon_1.stub)(),
+        formatDate: (0, sinon_1.stub)(),
         terminate: ((reason, exitCode) => {
             if (typeof reason === "number") {
                 // Only the exit code was passed
@@ -396,13 +395,13 @@ function createAdapterMock(db, options = {}) {
             const errorMessage = `Adapter.terminate was called${typeof exitCode === "number" ? ` (exit code ${exitCode})` : ""}: ${reason ? reason : "Without reason"}`;
             // Terminates execution by
             const err = new Error(errorMessage);
-            // @ts-ignore
+            // @ts-expect-error I'm too lazy to add terminateReason to the error type
             err.terminateReason = reason || "no reason given!";
             throw err;
         }),
-        supportsFeature: sinon_1.stub(),
-        getPluginInstance: sinon_1.stub(),
-        getPluginConfig: sinon_1.stub(),
+        supportsFeature: (0, sinon_1.stub)(),
+        getPluginInstance: (0, sinon_1.stub)(),
+        getPluginConfig: (0, sinon_1.stub)(),
         // EventEmitter methods
         on: ((event, handler) => {
             // Remember the event handlers so we can call them on demand
@@ -467,12 +466,12 @@ function createAdapterMock(db, options = {}) {
         // Mock-specific methods
         resetMockHistory() {
             // reset Adapter
-            tools_1.doResetHistory(ret);
+            (0, tools_1.doResetHistory)(ret);
             ret.log.resetMockHistory();
         },
         resetMockBehavior() {
             // reset Adapter
-            tools_1.doResetBehavior(ret, implementedMethods);
+            (0, tools_1.doResetBehavior)(ret, implementedMethods);
             ret.log.resetMockBehavior();
         },
         resetMock() {
@@ -480,7 +479,7 @@ function createAdapterMock(db, options = {}) {
             ret.resetMockBehavior();
         },
     });
-    tools_1.stubAndPromisifyImplementedMethods(ret, implementedMethods, [
+    (0, tools_1.stubAndPromisifyImplementedMethods)(ret, implementedMethods, [
         "getObjectView",
         "getObjectList",
     ]);

package/build/tests/unit/mocks/mockAdapterCore.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="iobroker" />
 import { MockAdapter } from "./mockAdapter";
-import { MockDatabase } from "./mockDatabase";
+import type { MockDatabase } from "./mockDatabase";
 interface MockAdapterConstructor {
     new (nameOrOptions: string | ioBroker.AdapterOptions): MockAdapter;
     (nameOrOptions: string | ioBroker.AdapterOptions): MockAdapter;

package/build/tests/unit/mocks/mockDatabase.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="iobroker" />
-import { MockAdapter } from "./mockAdapter";
+import type { MockAdapter } from "./mockAdapter";
 /**
  * A minimalistic version of ioBroker's Objects and States DB that just operates on a Map
  */
@@ -48,5 +48,5 @@ export declare function createAsserts(db: MockDatabase, adapter: MockAdapter): {
     assertStateIsAcked(id: string | string[], ack?: boolean): void;
     assertStateProperty(id: string | string[], property: string, value: any): void;
     assertObjectCommon(id: string | string[], common: ioBroker.ObjectCommon): void;
-    assertObjectNative(id: string | string[], native: object): void;
+    assertObjectNative(id: string | string[], native: Record<string, any>): void;
 };

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

@@ -36,7 +36,7 @@ class MockDatabase {
             throw new Error("An object must have an ID");
         if (obj.type == null)
             throw new Error("An object must have a type");
-        const completeObject = objects_1.extend({}, objectTemplate, obj);
+        const completeObject = (0, objects_1.extend)({}, objectTemplate, obj);
         this.objects.set(obj._id, completeObject);
     }
     publishObjects(...objects) {
@@ -44,17 +44,17 @@ class MockDatabase {
     }
     publishStateObjects(...objects) {
         objects
-            .map((obj) => objects_1.extend({}, obj, { type: "state" }))
+            .map((obj) => (0, objects_1.extend)({}, obj, { type: "state" }))
             .forEach(this.publishObject.bind(this));
     }
     publishChannelObjects(...objects) {
         objects
-            .map((obj) => objects_1.extend({}, obj, { type: "channel" }))
+            .map((obj) => (0, objects_1.extend)({}, obj, { type: "channel" }))
             .forEach(this.publishObject.bind(this));
     }
     publishDeviceObjects(...objects) {
         objects
-            .map((obj) => objects_1.extend({}, obj, { type: "device" }))
+            .map((obj) => (0, objects_1.extend)({}, obj, { type: "device" }))
             .forEach(this.publishObject.bind(this));
     }
     deleteObject(objOrID) {
@@ -66,7 +66,7 @@ class MockDatabase {
             this.deleteState(id);
             return;
         }
-        const completeState = objects_1.extend({}, stateTemplate, state);
+        const completeState = (0, objects_1.extend)({}, stateTemplate, state);
         this.states.set(id, completeState);
     }
     deleteState(id) {
@@ -114,15 +114,15 @@ class MockDatabase {
         else {
             pattern = namespaceOrPattern;
         }
-        const idRegExp = str2regex_1.str2regex(pattern);
-        return objects_1.composeObject([...this.objects.entries()]
+        const idRegExp = (0, str2regex_1.str2regex)(pattern);
+        return (0, objects_1.composeObject)([...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 = str2regex_1.str2regex(pattern);
-        return objects_1.composeObject([...this.states.entries()].filter(([id]) => idRegExp.test(id)));
+        const idRegExp = (0, str2regex_1.str2regex)(pattern);
+        return (0, objects_1.composeObject)([...this.states.entries()].filter(([id]) => idRegExp.test(id)));
     }
 }
 exports.MockDatabase = MockDatabase;
@@ -139,7 +139,7 @@ exports.MockDatabase = MockDatabase;
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 function createAsserts(db, adapter) {
     function normalizeID(id) {
-        if (typeguards_1.isArray(id))
+        if ((0, typeguards_1.isArray)(id))
             id = id.join(".");
         // Test if this ID is fully qualified
         if (!/^[a-z0-9\-_]+\.\d+\./.test(id)) {

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

@@ -11,27 +11,27 @@ const implementedMethods = {};
  */
 function createLoggerMock() {
     const ret = {
-        info: sinon_1.stub(),
-        warn: sinon_1.stub(),
-        error: sinon_1.stub(),
-        debug: sinon_1.stub(),
-        silly: sinon_1.stub(),
+        info: (0, sinon_1.stub)(),
+        warn: (0, sinon_1.stub)(),
+        error: (0, sinon_1.stub)(),
+        debug: (0, sinon_1.stub)(),
+        silly: (0, sinon_1.stub)(),
         level: "info",
         // Mock-specific methods
         resetMockHistory() {
             // reset Logger
-            tools_1.doResetHistory(ret);
+            (0, tools_1.doResetHistory)(ret);
         },
         resetMockBehavior() {
             // reset Logger
-            tools_1.doResetBehavior(ret, implementedMethods);
+            (0, tools_1.doResetBehavior)(ret, implementedMethods);
         },
         resetMock() {
             ret.resetMockHistory();
             ret.resetMockBehavior();
         },
     };
-    tools_1.stubAndPromisifyImplementedMethods(ret, implementedMethods);
+    (0, tools_1.stubAndPromisifyImplementedMethods)(ret, implementedMethods);
     return ret;
 }
 exports.createLoggerMock = createLoggerMock;

package/build/tests/unit/mocks/tools.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="sinon" />
-import { Equals, Overwrite } from "alcalzone-shared/types";
+import type { Equals, Overwrite } from "alcalzone-shared/types";
 export declare type IsAny<T> = Equals<T extends never ? false : true, boolean>;
 export declare type MockableMethods<T, All = Required<T>, NoAny = {
     [K in keyof All]: IsAny<All[K]> extends true ? never : All[K] extends (...args: any[]) => void ? K : never;

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

@@ -32,7 +32,7 @@ function stubAndPromisifyImplementedMethods(parent, implementedMethods, allowUse
         if (methodName.endsWith("Async"))
             continue;
         const originalMethod = parent[methodName];
-        const callbackFake = (parent[methodName] = sinon_1.stub());
+        const callbackFake = (parent[methodName] = (0, sinon_1.stub)());
         callbackFake.callsFake(originalMethod);
         // Prevent the user from changing the stub's behavior
         if (allowUserOverrides.indexOf(methodName) === -1) {
@@ -44,7 +44,7 @@ function stubAndPromisifyImplementedMethods(parent, implementedMethods, allowUse
         if (asyncType === "none")
             continue;
         const promisifyMethod = asyncType === "no error" ? async_1.promisifyNoError : async_1.promisify;
-        const asyncFake = sinon_1.stub().callsFake(promisifyMethod(originalMethod, parent));
+        const asyncFake = (0, sinon_1.stub)().callsFake(promisifyMethod(originalMethod, parent));
         parent[`${methodName}Async`] = asyncFake;
         // Prevent the user from changing the stub's behavior
         if (allowUserOverrides.indexOf(methodName) === -1 ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/testing",
-  "version": "2.4.4",
+  "version": "2.5.3",
   "description": "Shared utilities for adapter and module testing in ioBroker",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -38,36 +38,38 @@
   },
   "homepage": "https://github.com/AlCalzone/testing#readme",
   "devDependencies": {
-    "@alcalzone/release-script": "^1.8.2",
-    "@iobroker/adapter-core": "^2.4.0",
-    "@types/chai": "^4.2.14",
-    "@types/chai-as-promised": "^7.1.3",
-    "@types/debug": "4.1.5",
-    "@types/fs-extra": "^9.0.4",
-    "@types/iobroker": "^3.2.7",
-    "@types/mocha": "^8.0.4",
-    "@types/node": "^14.14.10",
-    "@types/sinon": "^9.0.9",
-    "@types/sinon-chai": "^3.2.5",
-    "@typescript-eslint/eslint-plugin": "^2.24.0",
-    "@typescript-eslint/parser": "^2.24.0",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
-    "eslint-plugin-prettier": "^3.2.0",
-    "prettier": "^2.2.1",
+    "@alcalzone/release-script": "^3.5.0",
+    "@alcalzone/release-script-plugin-license": "^3.5.0",
+    "@iobroker/adapter-core": "^2.5.1",
+    "@tsconfig/node12": "^1.0.9",
+    "@types/chai": "^4.2.22",
+    "@types/chai-as-promised": "^7.1.4",
+    "@types/debug": "4.1.7",
+    "@types/fs-extra": "^9.0.13",
+    "@types/iobroker": "^3.3.4",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "^16.10.2",
+    "@types/sinon": "^10.0.6",
+    "@types/sinon-chai": "^3.2.8",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "prettier": "^2.4.1",
     "rimraf": "^3.0.2",
-    "source-map-support": "^0.5.19",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.1.2"
+    "source-map-support": "^0.5.21",
+    "ts-node": "^10.2.1",
+    "typescript": "~4.4.4"
   },
   "dependencies": {
-    "alcalzone-shared": "~3.0.1",
-    "chai": "^4.2.0",
+    "alcalzone-shared": "~4.0.1",
+    "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "debug": "^4.3.1",
-    "fs-extra": "^9.0.1",
-    "mocha": "^8.2.1",
-    "sinon": "^9.2.1",
-    "sinon-chai": "^3.5.0"
+    "debug": "^4.3.3",
+    "fs-extra": "^10.0.0",
+    "mocha": "^9.1.3",
+    "sinon": "^12.0.1",
+    "sinon-chai": "^3.7.0"
   }
 }