@iobroker/testing 2.4.4 → 2.5.3

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

@@ -18,15 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,18 +32,18 @@ const path = __importStar(require("path"));
 const adapterTools_1 = require("../../../lib/adapterTools");
 const executeCommand_1 = require("../../../lib/executeCommand");
 const tools_1 = require("./tools");
-const debug = debug_1.default("testing:integration:ControllerSetup");
+const debug = (0, debug_1.default)("testing:integration:ControllerSetup");
 class ControllerSetup {
     constructor(adapterDir, testDir, dbConnection) {
         this.adapterDir = adapterDir;
         this.testDir = testDir;
         this.dbConnection = dbConnection;
         debug("Creating ControllerSetup...");
-        this.adapterName = adapterTools_1.getAdapterName(this.adapterDir);
-        this.appName = adapterTools_1.getAppName(this.adapterDir);
-        this.testAdapterDir = tools_1.getTestAdapterDir(this.adapterDir, this.testDir);
-        this.testControllerDir = tools_1.getTestControllerDir(this.appName, this.testDir);
-        this.testDataDir = tools_1.getTestDataDir(this.appName, this.testDir);
+        this.adapterName = (0, adapterTools_1.getAdapterName)(this.adapterDir);
+        this.appName = (0, adapterTools_1.getAppName)(this.adapterDir);
+        this.testAdapterDir = (0, tools_1.getTestAdapterDir)(this.adapterDir, this.testDir);
+        this.testControllerDir = (0, tools_1.getTestControllerDir)(this.appName, this.testDir);
+        this.testDataDir = (0, tools_1.getTestDataDir)(this.appName, this.testDir);
         debug(`  directories:`);
         debug(`    controller: ${this.testControllerDir}`);
         debug(`    adapter:    ${this.testAdapterDir}`);
@@ -60,56 +51,52 @@ class ControllerSetup {
         debug(`  appName:      ${this.appName}`);
         debug(`  adapterName:  ${this.adapterName}`);
     }
-    prepareTestDir() {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug("Preparing the test directory...");
-            // Make sure the test dir exists
-            yield fs_extra_1.ensureDir(this.testDir);
-            // Write the package.json
-            const packageJson = {
-                name: path.basename(this.testDir),
-                version: "1.0.0",
-                main: "index.js",
-                scripts: {
-                    test: 'echo "Error: no test specified" && exit 1',
-                },
-                keywords: [],
-                author: "",
-                license: "ISC",
-                dependencies: {
-                    [`${this.appName}.js-controller`]: `https://github.com/${this.appName}/${this.appName}.js-controller/tarball/master`,
-                },
-                description: "",
-            };
-            yield fs_extra_1.writeJSON(path.join(this.testDir, "package.json"), packageJson, {
-                spaces: 2,
-            });
-            // Delete a possible package-lock.json as it can mess with future installations
-            const pckLockPath = path.join(this.testDir, "package-lock.json");
-            if (yield fs_extra_1.pathExists(pckLockPath))
-                yield fs_extra_1.unlink(pckLockPath);
-            // Set the engineStrict flag on new Node.js versions to be in line with newer ioBroker installations
-            const nodeMajorVersion = parseInt(process.versions.node.split(".")[0], 10);
-            if (nodeMajorVersion >= 10) {
-                yield fs_extra_1.writeFile(path.join(this.testDir, ".npmrc"), "engine-strict=true", "utf8");
-            }
-            debug("  => done!");
+    async prepareTestDir() {
+        debug("Preparing the test directory...");
+        // Make sure the test dir exists
+        await (0, fs_extra_1.ensureDir)(this.testDir);
+        // Write the package.json
+        const packageJson = {
+            name: path.basename(this.testDir),
+            version: "1.0.0",
+            main: "index.js",
+            scripts: {
+                test: 'echo "Error: no test specified" && exit 1',
+            },
+            keywords: [],
+            author: "",
+            license: "ISC",
+            dependencies: {
+                [`${this.appName}.js-controller`]: "dev",
+            },
+            description: "",
+        };
+        await (0, fs_extra_1.writeJSON)(path.join(this.testDir, "package.json"), packageJson, {
+            spaces: 2,
         });
+        // Delete a possible package-lock.json as it can mess with future installations
+        const pckLockPath = path.join(this.testDir, "package-lock.json");
+        if (await (0, fs_extra_1.pathExists)(pckLockPath))
+            await (0, fs_extra_1.unlink)(pckLockPath);
+        // Set the engineStrict flag on new Node.js versions to be in line with newer ioBroker installations
+        const nodeMajorVersion = parseInt(process.versions.node.split(".")[0], 10);
+        if (nodeMajorVersion >= 10) {
+            await (0, fs_extra_1.writeFile)(path.join(this.testDir, ".npmrc"), "engine-strict=true", "utf8");
+        }
+        debug("  => done!");
     }
     /**
      * Tests if JS-Controller is already installed
      * @param appName The branded name of "iobroker"
      * @param testDir The directory the integration tests are executed in
      */
-    isJsControllerInstalled() {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug("Testing if JS-Controller is installed...");
-            // We expect js-controller to be installed if the dir in <testDir>/node_modules and the data directory exist
-            const isInstalled = (yield fs_extra_1.pathExists(this.testControllerDir)) &&
-                (yield fs_extra_1.pathExists(this.testDataDir));
-            debug(`  => ${isInstalled}`);
-            return isInstalled;
-        });
+    async isJsControllerInstalled() {
+        debug("Testing if JS-Controller is installed...");
+        // We expect js-controller to be installed if the dir in <testDir>/node_modules and the data directory exist
+        const isInstalled = (await (0, fs_extra_1.pathExists)(this.testControllerDir)) &&
+            (await (0, fs_extra_1.pathExists)(this.testDataDir));
+        debug(`  => ${isInstalled}`);
+        return isInstalled;
     }
     /**
      * Tests if an instance of JS-Controller is already running by attempting to connect to the Objects DB
@@ -168,38 +155,36 @@ class ControllerSetup {
      * @param appName The branded name of "iobroker"
      * @param testDir The directory the integration tests are executed in
      */
-    setupJsController() {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug("Initializing JS-Controller installation...");
-            // Stop the controller before calling setup first
-            yield executeCommand_1.executeCommand("node", [`${this.appName}.js`, "stop"], {
-                cwd: this.testControllerDir,
-                stdout: "ignore",
-            });
-            const setupResult = yield executeCommand_1.executeCommand("node", [`${this.appName}.js`, "setup", "first", "--console"], {
-                cwd: this.testControllerDir,
-                stdout: "ignore",
-            });
-            if (setupResult.exitCode !== 0)
-                throw new Error(`${this.appName} setup first failed!`);
-            debug("  => done!");
+    async setupJsController() {
+        debug("Initializing JS-Controller installation...");
+        // Stop the controller before calling setup first
+        await (0, executeCommand_1.executeCommand)("node", [`${this.appName}.js`, "stop"], {
+            cwd: this.testControllerDir,
+            stdout: "ignore",
+        });
+        const setupResult = await (0, executeCommand_1.executeCommand)("node", [`${this.appName}.js`, "setup", "first", "--console"], {
+            cwd: this.testControllerDir,
+            stdout: "ignore",
         });
+        if (setupResult.exitCode !== 0)
+            throw new Error(`${this.appName} setup first failed!`);
+        debug("  => done!");
     }
     /**
      * Changes the objects and states db to use alternative ports
      * @param appName The branded name of "iobroker"
      * @param testDir The directory the integration tests are executed in
      */
-    setupSystemConfig() {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug("Moving databases to different ports...");
-            const systemFilename = path.join(this.testDataDir, `${this.appName}.json`);
-            const systemConfig = require(systemFilename);
-            systemConfig.objects.port = 19001;
-            systemConfig.states.port = 19000;
-            yield fs_extra_1.writeFile(systemFilename, JSON.stringify(systemConfig, null, 2));
-            debug("  => done!");
-        });
+    async setupSystemConfig() {
+        debug(`Moving databases to different ports and setting type "file"...`);
+        const systemFilename = path.join(this.testDataDir, `${this.appName}.json`);
+        const systemConfig = require(systemFilename);
+        systemConfig.objects.port = 19001;
+        systemConfig.objects.type = "file";
+        systemConfig.states.port = 19000;
+        systemConfig.states.type = "file";
+        await (0, fs_extra_1.writeFile)(systemFilename, JSON.stringify(systemConfig, null, 2));
+        debug("  => done!");
     }
     /**
      * Clears the log dir for integration tests (and creates it if it doesn't exist)
@@ -208,7 +193,7 @@ class ControllerSetup {
      */
     clearLogDir() {
         debug("Cleaning log directory...");
-        return fs_extra_1.emptyDir(tools_1.getTestLogDir(this.appName, this.testDir));
+        return (0, fs_extra_1.emptyDir)((0, tools_1.getTestLogDir)(this.appName, this.testDir));
     }
     /**
      * Clears the sqlite DB dir for integration tests (and creates it if it doesn't exist)
@@ -217,28 +202,26 @@ class ControllerSetup {
      */
     clearDBDir() {
         debug("Cleaning SQLite directory...");
-        return fs_extra_1.emptyDir(tools_1.getTestDBDir(this.appName, this.testDir));
+        return (0, fs_extra_1.emptyDir)((0, tools_1.getTestDBDir)(this.appName, this.testDir));
     }
     /**
      * Disables all admin instances in the objects DB
      * @param objects The contents of objects.json
      */
-    disableAdminInstances() {
-        return __awaiter(this, void 0, void 0, function* () {
-            debug("Disabling admin instances...");
-            const objects = yield this.dbConnection.readObjectsDB();
-            if (objects) {
-                for (const id of Object.keys(objects)) {
-                    if (/^system\.adapter\.admin\.\d.+$/.test(id)) {
-                        const obj = objects[id];
-                        if (obj && obj.common)
-                            obj.common.enabled = false;
-                    }
+    async disableAdminInstances() {
+        debug("Disabling admin instances...");
+        const objects = await this.dbConnection.readObjectsDB();
+        if (objects) {
+            for (const id of Object.keys(objects)) {
+                if (/^system\.adapter\.admin\.\d.+$/.test(id)) {
+                    const obj = objects[id];
+                    if (obj && obj.common)
+                        obj.common.enabled = false;
                 }
-                yield this.dbConnection.writeObjectsDB(objects);
             }
-            debug("  => done!");
-        });
+            await this.dbConnection.writeObjectsDB(objects);
+        }
+        debug("  => done!");
     }
 }
 exports.ControllerSetup = ControllerSetup;

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

@@ -18,15 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DBConnection = void 0;
 const fs_extra_1 = require("fs-extra");
@@ -41,46 +32,38 @@ class DBConnection {
     constructor(appName, testDir) {
         this.appName = appName;
         this.testDir = testDir;
-        this.testDataDir = tools_1.getTestDataDir(appName, testDir);
+        this.testDataDir = (0, tools_1.getTestDataDir)(appName, testDir);
         this.objectsPath = path.join(this.testDataDir, "objects.json");
         this.statesPath = path.join(this.testDataDir, "states.json");
     }
     // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-    readObjectsDB() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // debug(`reading objects db...`);
-            // debug(`  dataDir:     ${dataDir}`);
-            // debug(`  objectsPath: ${objectsPath}`);
-            if (yield fs_extra_1.pathExists(this.objectsPath)) {
-                // debug(`  exists:      true`);
-                return fs_extra_1.readJSON(this.objectsPath, { encoding: "utf8" });
-            }
-        });
+    async readObjectsDB() {
+        // debug(`reading objects db...`);
+        // debug(`  dataDir:     ${dataDir}`);
+        // debug(`  objectsPath: ${objectsPath}`);
+        if (await (0, fs_extra_1.pathExists)(this.objectsPath)) {
+            // debug(`  exists:      true`);
+            return (0, fs_extra_1.readJSON)(this.objectsPath, { encoding: "utf8" });
+        }
     }
-    writeObjectsDB(objects) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!objects)
-                return;
-            return fs_extra_1.writeJSON(this.objectsPath, objects);
-        });
+    async writeObjectsDB(objects) {
+        if (!objects)
+            return;
+        return (0, fs_extra_1.writeJSON)(this.objectsPath, objects);
     }
-    writeStatesDB(states) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!states)
-                return;
-            return fs_extra_1.writeJSON(this.statesPath, states);
-        });
+    async writeStatesDB(states) {
+        if (!states)
+            return;
+        return (0, fs_extra_1.writeJSON)(this.statesPath, states);
     }
-    readStatesDB() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // debug(`reading states db...`);
-            // debug(`  dataDir:     ${dataDir}`);
-            // debug(`  statesPath:  ${statesPath}`);
-            if (yield fs_extra_1.pathExists(this.statesPath)) {
-                // debug(`  exists:      true`);
-                return fs_extra_1.readJSON(this.statesPath, { encoding: "utf8" });
-            }
-        });
+    async readStatesDB() {
+        // debug(`reading states db...`);
+        // debug(`  dataDir:     ${dataDir}`);
+        // debug(`  statesPath:  ${statesPath}`);
+        if (await (0, fs_extra_1.pathExists)(this.statesPath)) {
+            // debug(`  exists:      true`);
+            return (0, fs_extra_1.readJSON)(this.statesPath, { encoding: "utf8" });
+        }
     }
     /**
      * Creates a backup of the objects and states DB, so it can be restored after each test
@@ -88,23 +71,19 @@ class DBConnection {
      * @param testDir The directory the integration tests are executed in
      */
     // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-    readDB() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const objects = yield this.readObjectsDB();
-            const states = yield this.readStatesDB();
-            return { objects, states };
-        });
+    async readDB() {
+        const objects = await this.readObjectsDB();
+        const states = await this.readStatesDB();
+        return { objects, states };
     }
     /**
      * Restores a previous backup of the objects and states DB
      * @param appName The branded name of "iobroker"
      * @param testDir The directory the integration tests are executed in
      */
-    writeDB(objects, states) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.writeObjectsDB(objects);
-            yield this.writeStatesDB(states);
-        });
+    async writeDB(objects, states) {
+        await this.writeObjectsDB(objects);
+        await this.writeStatesDB(states);
     }
 }
 exports.DBConnection = DBConnection;