@storyous/test-utils 2.2.0 → 2.3.0

package/README.md

@@ -1,32 +1,32 @@
-# `testUtils`
-
-Package for help with testing you app.
-Creates api for test requesting, creates test database collection and mocked mailer.
-
-## Usage
-
-``` typescript
-import * as assert from 'assert';
-import Koa from 'koa';
-import { describe, it } from 'mocha';
-import mailer from '@storyous/mailer';
-import testUtils from '@storyous/test-utils';
-
-testUtils.init(
- () => new Koa(),
- testUtils.uniqueDatabase('mongodb://127.0.0.0:27017/test'),
- mailer,
-);
-
-describe('some test', async () => {
-
-    it('should do some request', async () => {
-        await testUtils.request().get('/').expect(200);
-    });
-    
-    it('should getSent emails', async () => {
-        await mailer.sendMail({});
-        assert.deepStrictEqual(testUtils.getSentMails(), []);
-    });
-};
-```
+# `testUtils`
+
+Package for help with testing you app.
+Creates api for test requesting, creates test database collection and mocked mailer.
+
+## Usage
+
+``` typescript
+import * as assert from 'assert';
+import Koa from 'koa';
+import { describe, it } from 'mocha';
+import mailer from '@storyous/mailer';
+import testUtils from '@storyous/test-utils';
+
+testUtils.init(
+ () => new Koa(),
+ testUtils.uniqueDatabase('mongodb://127.0.0.0:27017/test'),
+ mailer,
+);
+
+describe('some test', async () => {
+
+    it('should do some request', async () => {
+        await testUtils.request().get('/').expect(200);
+    });
+    
+    it('should getSent emails', async () => {
+        await mailer.sendMail({});
+        assert.deepStrictEqual(testUtils.getSentMails(), []);
+    });
+};
+```

package/__tests__/testUtils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/__tests__/testUtils.test.js

@@ -0,0 +1,47 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert = __importStar(require("assert"));
+const koa_1 = __importDefault(require("koa"));
+const mocha_1 = __importStar(require("mocha"));
+const testUtils_1 = __importDefault(require("../lib/testUtils"));
+testUtils_1.default.init({ mocha: mocha_1.default, app: () => new koa_1.default(), cleanDatabaseUrl: 'mongodb://127.0.0.1/testing' });
+(0, mocha_1.describe)('packages/testUtils', async () => {
+    (0, mocha_1.it)('should do some request', async () => {
+        await testUtils_1.default.request().get('/').expect(404);
+    });
+    (0, mocha_1.it)('should getSent emails', async () => {
+        assert.deepStrictEqual(testUtils_1.default.getSentMails(), []);
+    });
+    (0, mocha_1.it)('should generate uniqueDatabase', () => {
+        testUtils_1.default.init({ mocha: mocha_1.default, app: () => new koa_1.default() });
+        assert.deepStrictEqual(testUtils_1.default.uniqueDatabase(), null);
+        assert.deepStrictEqual(testUtils_1.default.uniqueDatabase('mongodb://127.0.0.0:27017/test')?.startsWith('mongodb://127.0.0.0:27017/test___'), true);
+    });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdFV0aWxzLnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0ZXN0VXRpbHMudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsK0NBQWlDO0FBQ2pDLDhDQUFzQjtBQUN0QiwrQ0FBNEM7QUFDNUMsaUVBQXlDO0FBRXpDLG1CQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFMLGVBQUssRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUMsSUFBSSxhQUFHLEVBQUUsRUFBRSxnQkFBZ0IsRUFBRSw2QkFBNkIsRUFBRSxDQUFDLENBQUM7QUFFakcsSUFBQSxnQkFBUSxFQUFDLG9CQUFvQixFQUFFLEtBQUssSUFBSSxFQUFFO0lBRXRDLElBQUEsVUFBRSxFQUFDLHdCQUF3QixFQUFFLEtBQUssSUFBSSxFQUFFO1FBQ3BDLE1BQU0sbUJBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ25ELENBQUMsQ0FBQyxDQUFDO0lBRUgsSUFBQSxVQUFFLEVBQUMsdUJBQXVCLEVBQUUsS0FBSyxJQUFJLEVBQUU7UUFDbkMsTUFBTSxDQUFDLGVBQWUsQ0FBQyxtQkFBUyxDQUFDLFlBQVksRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3pELENBQUMsQ0FBQyxDQUFDO0lBRUgsSUFBQSxVQUFFLEVBQUMsZ0NBQWdDLEVBQUUsR0FBRyxFQUFFO1FBQ3RDLG1CQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFMLGVBQUssRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUMsSUFBSSxhQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDaEQsTUFBTSxDQUFDLGVBQWUsQ0FBQyxtQkFBUyxDQUFDLGNBQWMsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3pELE1BQU0sQ0FBQyxlQUFlLENBQ2xCLG1CQUFTLENBQUMsY0FBYyxDQUFDLGdDQUFnQyxDQUFDLEVBQUUsVUFBVSxDQUFDLG1DQUFtQyxDQUFDLEVBQzNHLElBQUksQ0FDUCxDQUFDO0lBQ04sQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9

package/__tests__/testUtils.test.ts

@@ -1,26 +1,26 @@
-import * as assert from 'assert';
-import Koa from 'koa';
-import mocha, { describe, it } from 'mocha';
-import testUtils from '../lib/testUtils';
-
-testUtils.init({ mocha, app: () => new Koa(), cleanDatabaseUrl: 'mongodb://127.0.0.1/testing' });
-
-describe('packages/testUtils', async () => {
-
-    it('should do some request', async () => {
-        await testUtils.request().get('/').expect(404);
-    });
-
-    it('should getSent emails', async () => {
-        assert.deepStrictEqual(testUtils.getSentMails(), []);
-    });
-
-    it('should generate uniqueDatabase', () => {
-        testUtils.init({ mocha, app: () => new Koa() });
-        assert.deepStrictEqual(testUtils.uniqueDatabase(), null);
-        assert.deepStrictEqual(
-            testUtils.uniqueDatabase('mongodb://127.0.0.0:27017/test')?.startsWith('mongodb://127.0.0.0:27017/test___'),
-            true,
-        );
-    });
-});
+import * as assert from 'assert';
+import Koa from 'koa';
+import mocha, { describe, it } from 'mocha';
+import testUtils from '../lib/testUtils';
+
+testUtils.init({ mocha, app: () => new Koa(), cleanDatabaseUrl: 'mongodb://127.0.0.1/testing' });
+
+describe('packages/testUtils', async () => {
+
+    it('should do some request', async () => {
+        await testUtils.request().get('/').expect(404);
+    });
+
+    it('should getSent emails', async () => {
+        assert.deepStrictEqual(testUtils.getSentMails(), []);
+    });
+
+    it('should generate uniqueDatabase', () => {
+        testUtils.init({ mocha, app: () => new Koa() });
+        assert.deepStrictEqual(testUtils.uniqueDatabase(), null);
+        assert.deepStrictEqual(
+            testUtils.uniqueDatabase('mongodb://127.0.0.0:27017/test')?.startsWith('mongodb://127.0.0.0:27017/test___'),
+            true,
+        );
+    });
+});

package/lib/mockTransport.d.ts

@@ -0,0 +1,10 @@
+import { Transport } from 'nodemailer';
+import MailMessage from 'nodemailer/lib/mailer/mail-message';
+export default class MockTransport implements Transport {
+    private _sentMail;
+    readonly name: 'Mock';
+    readonly version: '1.0.0';
+    getSentMail(): MailMessage<any>[];
+    send(mail: MailMessage<any>, callback: (err: Error | null, info?: any) => void): void;
+    private _validate;
+}

package/lib/mockTransport.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class MockTransport {
+    constructor() {
+        this._sentMail = [];
+        this._validate = (address) => {
+            if (!address) {
+                return new Error('Error validating address.');
+            }
+            if (typeof address !== 'string') {
+                address = address.address;
+            }
+            if (address.length > 254) {
+                return new Error('Error validating address.');
+            }
+            if (!address.match(/^[^@]+@.+\..+$/)) {
+                return new Error('Error validating address.');
+            }
+            return null;
+        };
+    }
+    getSentMail() {
+        return this._sentMail;
+    }
+    send(mail, callback) {
+        let err;
+        if (!mail.data.to) {
+            callback(new Error('I need to know who this email is being sent to :-('));
+            return;
+        }
+        if (Array.isArray(mail.data.to)) {
+            for (let i = 0; i < mail.data.to.length; i++) {
+                const address = mail.data.to[i];
+                err = this._validate(address);
+                if (err !== null) {
+                    callback(err);
+                    return;
+                }
+            }
+        }
+        else {
+            err = this._validate(mail.data.to);
+            if (err !== null) {
+                callback(err);
+                return;
+            }
+        }
+        this._sentMail.push(mail);
+        callback(null, { accepted: [mail.data.to] });
+    }
+}
+exports.default = MockTransport;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja1RyYW5zcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1vY2tUcmFuc3BvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFJQSxNQUFxQixhQUFhO0lBQWxDO1FBQ1ksY0FBUyxHQUF1QixFQUFFLENBQUM7UUF1Q25DLGNBQVMsR0FBRyxDQUFDLE9BQTBCLEVBQUUsRUFBRTtZQUMvQyxJQUFJLENBQUMsT0FBTyxFQUFFO2dCQUNWLE9BQU8sSUFBSSxLQUFLLENBQUMsMkJBQTJCLENBQUMsQ0FBQzthQUNqRDtZQUVELElBQUksT0FBTyxPQUFPLEtBQUssUUFBUSxFQUFFO2dCQUM3QixPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQzthQUM3QjtZQUVELElBQUksT0FBTyxDQUFDLE1BQU0sR0FBRyxHQUFHLEVBQUU7Z0JBQ3RCLE9BQU8sSUFBSSxLQUFLLENBQUMsMkJBQTJCLENBQUMsQ0FBQzthQUNqRDtZQUVELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLEVBQUU7Z0JBQ2xDLE9BQU8sSUFBSSxLQUFLLENBQUMsMkJBQTJCLENBQUMsQ0FBQzthQUNqRDtZQUVELE9BQU8sSUFBSSxDQUFDO1FBQ2hCLENBQUMsQ0FBQztJQUNOLENBQUM7SUFwREcsV0FBVztRQUNQLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQztJQUMxQixDQUFDO0lBRU0sSUFBSSxDQUFFLElBQXNCLEVBQUUsUUFBaUQ7UUFDbEYsSUFBSSxHQUFHLENBQUM7UUFFUixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUU7WUFDZixRQUFRLENBQUMsSUFBSSxLQUFLLENBQUMsb0RBQW9ELENBQUMsQ0FBQyxDQUFDO1lBQzFFLE9BQU87U0FDVjtRQUVELElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxFQUFFO1lBQzdCLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzFDLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNoQyxHQUFHLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDOUIsSUFBSSxHQUFHLEtBQUssSUFBSSxFQUFFO29CQUNkLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQztvQkFDZCxPQUFPO2lCQUNWO2FBQ0o7U0FDSjthQUFNO1lBQ0gsR0FBRyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNuQyxJQUFJLEdBQUcsS0FBSyxJQUFJLEVBQUU7Z0JBQ2QsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNkLE9BQU87YUFDVjtTQUNKO1FBRUQsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDMUIsUUFBUSxDQUFDLElBQUksRUFBRSxFQUFFLFFBQVEsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2pELENBQUM7Q0FxQko7QUEzREQsZ0NBMkRDIn0=

package/lib/mockTransport.ts

@@ -1,64 +1,64 @@
-import { Transport } from 'nodemailer';
-import { Address } from 'nodemailer/lib/mailer';
-import MailMessage from 'nodemailer/lib/mailer/mail-message';
-
-export default class MockTransport implements Transport {
-    private _sentMail: MailMessage<any>[] = [];
-
-    public readonly name: 'Mock';
-
-    public readonly version: '1.0.0';
-
-    getSentMail () {
-        return this._sentMail;
-    }
-
-    public send (mail: MailMessage<any>, callback: (err: Error | null, info?: any) => void): void {
-        let err;
-
-        if (!mail.data.to) {
-            callback(new Error('I need to know who this email is being sent to :-('));
-            return;
-        }
-
-        if (Array.isArray(mail.data.to)) {
-            for (let i = 0; i < mail.data.to.length; i++) {
-                const address = mail.data.to[i];
-                err = this._validate(address);
-                if (err !== null) {
-                    callback(err);
-                    return;
-                }
-            }
-        } else {
-            err = this._validate(mail.data.to);
-            if (err !== null) {
-                callback(err);
-                return;
-            }
-        }
-
-        this._sentMail.push(mail);
-        callback(null, { accepted: [mail.data.to] });
-    }
-
-    private _validate = (address?: string | Address) => {
-        if (!address) {
-            return new Error('Error validating address.');
-        }
-
-        if (typeof address !== 'string') {
-            address = address.address;
-        }
-
-        if (address.length > 254) {
-            return new Error('Error validating address.');
-        }
-
-        if (!address.match(/^[^@]+@.+\..+$/)) {
-            return new Error('Error validating address.');
-        }
-
-        return null;
-    };
-}
+import { Transport } from 'nodemailer';
+import { Address } from 'nodemailer/lib/mailer';
+import MailMessage from 'nodemailer/lib/mailer/mail-message';
+
+export default class MockTransport implements Transport {
+    private _sentMail: MailMessage<any>[] = [];
+
+    public readonly name: 'Mock';
+
+    public readonly version: '1.0.0';
+
+    getSentMail () {
+        return this._sentMail;
+    }
+
+    public send (mail: MailMessage<any>, callback: (err: Error | null, info?: any) => void): void {
+        let err;
+
+        if (!mail.data.to) {
+            callback(new Error('I need to know who this email is being sent to :-('));
+            return;
+        }
+
+        if (Array.isArray(mail.data.to)) {
+            for (let i = 0; i < mail.data.to.length; i++) {
+                const address = mail.data.to[i];
+                err = this._validate(address);
+                if (err !== null) {
+                    callback(err);
+                    return;
+                }
+            }
+        } else {
+            err = this._validate(mail.data.to);
+            if (err !== null) {
+                callback(err);
+                return;
+            }
+        }
+
+        this._sentMail.push(mail);
+        callback(null, { accepted: [mail.data.to] });
+    }
+
+    private _validate = (address?: string | Address) => {
+        if (!address) {
+            return new Error('Error validating address.');
+        }
+
+        if (typeof address !== 'string') {
+            address = address.address;
+        }
+
+        if (address.length > 254) {
+            return new Error('Error validating address.');
+        }
+
+        if (!address.match(/^[^@]+@.+\..+$/)) {
+            return new Error('Error validating address.');
+        }
+
+        return null;
+    };
+}

package/lib/testUtils.d.ts

@@ -0,0 +1,29 @@
+/// <reference types="node" />
+/// <reference types="koa-bodyparser" />
+import http from 'http';
+import Koa from 'koa';
+import { MongoClientOptions } from 'mongodb';
+import nodemailer from 'nodemailer';
+import MailMessage from 'nodemailer/lib/mailer/mail-message';
+import { SuperAgentTest } from 'supertest';
+import MockTransport from './mockTransport';
+interface TypeParams {
+    mocha: any;
+    app?: () => Koa | Promise<Koa>;
+    cleanDatabaseUrl?: string;
+    mailer?: {
+        _transporter: any;
+    };
+    cleanDatabaseOptions?: MongoClientOptions;
+}
+declare const testUtils: {
+    _app: http.Server | null;
+    _originalTransporter: nodemailer.Transporter<any> | undefined;
+    _mockTransporter: MockTransport | undefined;
+    init({ mocha, app, cleanDatabaseUrl, mailer, cleanDatabaseOptions, }: TypeParams): void;
+    getSentMails(): MailMessage<any>[];
+    request(): SuperAgentTest;
+    uniqueDatabase(mongodbUrl?: string | undefined): string | null;
+    cleanTestingDatabases(mongodbUrl: string, options?: MongoClientOptions): Promise<void>;
+};
+export default testUtils;

package/lib/testUtils.js

@@ -0,0 +1,85 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const http_1 = __importDefault(require("http"));
+const mongodb_1 = require("mongodb");
+const nodemailer_1 = __importDefault(require("nodemailer"));
+const supertest_1 = __importDefault(require("supertest"));
+const mockTransport_1 = __importDefault(require("./mockTransport"));
+const testUtils = {
+    _app: null,
+    _originalTransporter: undefined,
+    _mockTransporter: undefined,
+    init({ mocha, app, cleanDatabaseUrl, mailer, cleanDatabaseOptions, }) {
+        const { afterEach, before, beforeEach } = mocha;
+        before(async () => {
+            if (cleanDatabaseUrl) {
+                await this.cleanTestingDatabases(cleanDatabaseUrl, cleanDatabaseOptions);
+            }
+            if (app) {
+                this._app = http_1.default.createServer((await app()).callback());
+            }
+        });
+        beforeEach(() => {
+            if (mailer) {
+                this._originalTransporter = mailer._transporter;
+                this._mockTransporter = new mockTransport_1.default();
+                mailer._transporter = nodemailer_1.default.createTransport(this._mockTransporter);
+            }
+        });
+        afterEach(() => {
+            if (mailer) {
+                mailer._transporter = this._originalTransporter;
+            }
+        });
+    },
+    getSentMails() {
+        if (!this._mockTransporter) {
+            throw new Error('The Email Transporter is not initialized yet!');
+        }
+        return this._mockTransporter.getSentMail();
+    },
+    request() {
+        if (!this._app) {
+            throw new Error('The app is not initialized yet!');
+        }
+        return supertest_1.default.agent(this._app);
+    },
+    uniqueDatabase(mongodbUrl) {
+        if (!mongodbUrl) {
+            return null;
+        }
+        const parsed = new URL(mongodbUrl);
+        parsed.pathname = `${parsed.pathname}___${Date.now()}`;
+        return parsed.toString();
+    },
+    async cleanTestingDatabases(mongodbUrl, options = {}) {
+        const client = new mongodb_1.MongoClient(mongodbUrl, options);
+        await client.connect();
+        const db = client.db();
+        const { databaseName } = db;
+        if (!/testing/i.test(databaseName)) {
+            throw new Error('The database name has to contains the "testing" keyword.');
+        }
+        const postfixMatcher = /___([0-9]{12,})/;
+        const baseName = databaseName.replace(postfixMatcher, '');
+        const matcher = new RegExp(`^${baseName}(${postfixMatcher.source})?$`);
+        const adminDb = db.admin();
+        const { databases } = await adminDb.listDatabases({ nameOnly: true });
+        const maxAgeDate = new Date();
+        maxAgeDate.setMinutes(maxAgeDate.getMinutes() - 15);
+        await Promise.all(databases.map(async ({ name }) => {
+            const [match, , timestamp] = name.match(matcher) || [];
+            if (match && (!timestamp || new Date(parseInt(timestamp, 10)) < maxAgeDate)) {
+                // eslint-disable-next-line no-console
+                console.log(`DROPPING OLD TESTING database ${name}`);
+                await client.db(name).dropDatabase();
+            }
+        }));
+        await client.close();
+    },
+};
+exports.default = testUtils;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdFV0aWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsidGVzdFV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsZ0RBQW9DO0FBRXBDLHFDQUEwRDtBQUMxRCw0REFBcUQ7QUFFckQsMERBQXNEO0FBQ3RELG9FQUE0QztBQVc1QyxNQUFNLFNBQVMsR0FBRztJQUNkLElBQUksRUFBaUIsSUFBSTtJQUN6QixvQkFBb0IsRUFBMkIsU0FBUztJQUN4RCxnQkFBZ0IsRUFBNkIsU0FBUztJQUV0RCxJQUFJLENBQUUsRUFDRixLQUFLLEVBQUUsR0FBRyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxvQkFBb0IsR0FDakQ7UUFDVCxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsR0FBRyxLQUFLLENBQUM7UUFDaEQsTUFBTSxDQUFDLEtBQUssSUFBSSxFQUFFO1lBQ2QsSUFBSSxnQkFBZ0IsRUFBRTtnQkFDbEIsTUFBTSxJQUFJLENBQUMscUJBQXFCLENBQUMsZ0JBQWdCLEVBQUUsb0JBQW9CLENBQUMsQ0FBQzthQUM1RTtZQUVELElBQUksR0FBRyxFQUFFO2dCQUNMLElBQUksQ0FBQyxJQUFJLEdBQUcsY0FBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO2FBQzNEO1FBQ0wsQ0FBQyxDQUFDLENBQUM7UUFFSCxVQUFVLENBQUMsR0FBRyxFQUFFO1lBQ1osSUFBSSxNQUFNLEVBQUU7Z0JBQ1IsSUFBSSxDQUFDLG9CQUFvQixHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUM7Z0JBQ2hELElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLHVCQUFhLEVBQUUsQ0FBQztnQkFDNUMsTUFBTSxDQUFDLFlBQVksR0FBRyxvQkFBVSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQzthQUMzRTtRQUNMLENBQUMsQ0FBQyxD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

package/lib/testUtils.ts

@@ -1,111 +1,111 @@
-import http, { Server } from 'http';
-import Koa from 'koa';
-import { MongoClient, MongoClientOptions } from 'mongodb';
-import nodemailer, { Transporter } from 'nodemailer';
-import MailMessage from 'nodemailer/lib/mailer/mail-message';
-import supertest, { SuperAgentTest } from 'supertest';
-import MockTransport from './mockTransport';
-
-interface TypeParams {
-    mocha: any,
-    app?: () => Koa | Promise<Koa>,
-    cleanDatabaseUrl?: string,
-    mailer?: { _transporter: any },
-
-    cleanDatabaseOptions?:MongoClientOptions
-}
-
-const testUtils = {
-    _app: <Server | null>null,
-    _originalTransporter: <Transporter | undefined>undefined,
-    _mockTransporter: <MockTransport | undefined>undefined,
-
-    init ({
-        mocha, app, cleanDatabaseUrl, mailer, cleanDatabaseOptions,
-    }: TypeParams) {
-        const { afterEach, before, beforeEach } = mocha;
-        before(async () => {
-            if (cleanDatabaseUrl) {
-                await this.cleanTestingDatabases(cleanDatabaseUrl, cleanDatabaseOptions);
-            }
-
-            if (app) {
-                this._app = http.createServer((await app()).callback());
-            }
-        });
-
-        beforeEach(() => {
-            if (mailer) {
-                this._originalTransporter = mailer._transporter;
-                this._mockTransporter = new MockTransport();
-                mailer._transporter = nodemailer.createTransport(this._mockTransporter);
-            }
-        });
-
-        afterEach(() => {
-            if (mailer) {
-                mailer._transporter = this._originalTransporter;
-            }
-        });
-    },
-
-    getSentMails (): MailMessage<any>[] {
-        if (!this._mockTransporter) {
-            throw new Error('The Email Transporter is not initialized yet!');
-        }
-
-        return this._mockTransporter.getSentMail();
-    },
-
-    request (): SuperAgentTest {
-        if (!this._app) {
-            throw new Error('The app is not initialized yet!');
-        }
-        return supertest.agent(this._app);
-    },
-
-    uniqueDatabase (mongodbUrl?: string): string | null {
-
-        if (!mongodbUrl) {
-            return null;
-        }
-
-        const parsed = new URL(mongodbUrl);
-        parsed.pathname = `${parsed.pathname}___${Date.now()}`;
-        return parsed.toString();
-    },
-
-    async cleanTestingDatabases (mongodbUrl: string, options:MongoClientOptions = {}): Promise<void> {
-        const client = new MongoClient(mongodbUrl, options);
-        await client.connect();
-        const db = client.db();
-        const { databaseName } = db;
-
-        if (!/testing/i.test(databaseName)) {
-            throw new Error('The database name has to contains the "testing" keyword.');
-        }
-
-        const postfixMatcher = /___([0-9]{12,})/;
-        const baseName = databaseName.replace(postfixMatcher, '');
-
-        const matcher = new RegExp(`^${baseName}(${postfixMatcher.source})?$`);
-        const adminDb = db.admin();
-        const { databases } = await adminDb.listDatabases({ nameOnly: true });
-
-        const maxAgeDate = new Date();
-        maxAgeDate.setMinutes(maxAgeDate.getMinutes() - 15);
-
-        await Promise.all(databases.map(async ({ name }) => {
-            const [match, , timestamp] = name.match(matcher) || [];
-            if (match && (!timestamp || new Date(parseInt(timestamp, 10)) < maxAgeDate)) {
-                // eslint-disable-next-line no-console
-                console.log(`DROPPING OLD TESTING database ${name}`);
-                await client.db(name).dropDatabase();
-            }
-        }));
-
-        await client.close();
-    },
-};
-
-export default testUtils;
+import http, { Server } from 'http';
+import Koa from 'koa';
+import { MongoClient, MongoClientOptions } from 'mongodb';
+import nodemailer, { Transporter } from 'nodemailer';
+import MailMessage from 'nodemailer/lib/mailer/mail-message';
+import supertest, { SuperAgentTest } from 'supertest';
+import MockTransport from './mockTransport';
+
+interface TypeParams {
+    mocha: any,
+    app?: () => Koa | Promise<Koa>,
+    cleanDatabaseUrl?: string,
+    mailer?: { _transporter: any },
+
+    cleanDatabaseOptions?:MongoClientOptions
+}
+
+const testUtils = {
+    _app: <Server | null>null,
+    _originalTransporter: <Transporter | undefined>undefined,
+    _mockTransporter: <MockTransport | undefined>undefined,
+
+    init ({
+        mocha, app, cleanDatabaseUrl, mailer, cleanDatabaseOptions,
+    }: TypeParams) {
+        const { afterEach, before, beforeEach } = mocha;
+        before(async () => {
+            if (cleanDatabaseUrl) {
+                await this.cleanTestingDatabases(cleanDatabaseUrl, cleanDatabaseOptions);
+            }
+
+            if (app) {
+                this._app = http.createServer((await app()).callback());
+            }
+        });
+
+        beforeEach(() => {
+            if (mailer) {
+                this._originalTransporter = mailer._transporter;
+                this._mockTransporter = new MockTransport();
+                mailer._transporter = nodemailer.createTransport(this._mockTransporter);
+            }
+        });
+
+        afterEach(() => {
+            if (mailer) {
+                mailer._transporter = this._originalTransporter;
+            }
+        });
+    },
+
+    getSentMails (): MailMessage<any>[] {
+        if (!this._mockTransporter) {
+            throw new Error('The Email Transporter is not initialized yet!');
+        }
+
+        return this._mockTransporter.getSentMail();
+    },
+
+    request (): SuperAgentTest {
+        if (!this._app) {
+            throw new Error('The app is not initialized yet!');
+        }
+        return supertest.agent(this._app);
+    },
+
+    uniqueDatabase (mongodbUrl?: string): string | null {
+
+        if (!mongodbUrl) {
+            return null;
+        }
+
+        const parsed = new URL(mongodbUrl);
+        parsed.pathname = `${parsed.pathname}___${Date.now()}`;
+        return parsed.toString();
+    },
+
+    async cleanTestingDatabases (mongodbUrl: string, options:MongoClientOptions = {}): Promise<void> {
+        const client = new MongoClient(mongodbUrl, options);
+        await client.connect();
+        const db = client.db();
+        const { databaseName } = db;
+
+        if (!/testing/i.test(databaseName)) {
+            throw new Error('The database name has to contains the "testing" keyword.');
+        }
+
+        const postfixMatcher = /___([0-9]{12,})/;
+        const baseName = databaseName.replace(postfixMatcher, '');
+
+        const matcher = new RegExp(`^${baseName}(${postfixMatcher.source})?$`);
+        const adminDb = db.admin();
+        const { databases } = await adminDb.listDatabases({ nameOnly: true });
+
+        const maxAgeDate = new Date();
+        maxAgeDate.setMinutes(maxAgeDate.getMinutes() - 15);
+
+        await Promise.all(databases.map(async ({ name }) => {
+            const [match, , timestamp] = name.match(matcher) || [];
+            if (match && (!timestamp || new Date(parseInt(timestamp, 10)) < maxAgeDate)) {
+                // eslint-disable-next-line no-console
+                console.log(`DROPPING OLD TESTING database ${name}`);
+                await client.db(name).dropDatabase();
+            }
+        }));
+
+        await client.close();
+    },
+};
+
+export default testUtils;

package/package.json

@@ -1,42 +1,45 @@
-{
-  "name": "@storyous/test-utils",
-  "version": "2.2.0",
-  "description": "",
-  "homepage": "https://github.com/Storyous/mono-utils#readme",
-  "license": "ISC",
-  "main": "lib/testUtils",
-  "scripts": {
-    "start": "tsc"
-  },
-  "mocha": {
-    "recursive": true,
-    "timeout": 15000,
-    "extension": [
-      "ts"
-    ],
-    "exit": true,
-    "require": "ts-node/register"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Storyous/mono-utils.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Storyous/mono-utils/issues"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "dependencies": {
-    "@types/koa": "^2.13.4",
-    "@types/lodash": "^4.14.182",
-    "@types/mocha": "^9.1.1",
-    "@types/nodemailer": "^6.4.4",
-    "@types/supertest": "^2.0.12",
-    "koa": "^2.13.4",
-    "mongodb": "^4.5.0",
-    "nodemailer": "^6.7.3",
-    "supertest": "^6.2.2"
-  }
-}
+{
+  "name": "@storyous/test-utils",
+  "version": "2.3.0",
+  "description": "",
+  "homepage": "https://github.com/Storyous/mono-utils#readme",
+  "license": "ISC",
+  "main": "lib/testUtils",
+  "scripts": {
+    "start": "tsc"
+  },
+  "mocha": {
+    "recursive": true,
+    "timeout": 15000,
+    "extension": [
+      "ts"
+    ],
+    "exit": true,
+    "require": "ts-node/register"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Storyous/mono-utils.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Storyous/mono-utils/issues"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {
+    "@types/koa": "^2.13.4",
+    "@types/lodash": "^4.14.182",
+    "@types/mocha": "^9.1.1",
+    "@types/nodemailer": "^6.4.4",
+    "@types/supertest": "^2.0.12",
+    "koa": "^2.13.4",
+    "nodemailer": "^6.7.3",
+    "supertest": "^6.2.2"
+  },
+  "peerDependencies": {
+    "mongodb": "^6.8.0"
+  },
+  "gitHead": "ebb317129687bc1e9619bf312b41598680fdd2c3"
+}

package/tsconfig.json

@@ -1,8 +1,8 @@
-{
-    "extends": "../../tsconfig.json",
-
-    "include": [
-        "lib",
-        "__tests__"
-    ]
-}
+{
+    "extends": "../../tsconfig.json",
+
+    "include": [
+        "lib",
+        "__tests__"
+    ]
+}