@nocobase/test 0.12.0-alpha.4 → 0.13.0-alpha.1

package/lib/index.d.ts

@@ -1,5 +1,18 @@
 /// <reference types="jest" />
+import ws from 'ws';
 export { mockDatabase } from '@nocobase/database';
 export * from './mockServer';
+export { default as supertest } from 'supertest';
 export declare const pgOnly: () => jest.Describe;
 export declare function randomStr(): string;
+export declare const waitSecond: () => Promise<void>;
+export declare const startServerWithRandomPort: (startServer: any) => Promise<unknown>;
+export declare const createWsClient: ({ serverPort, options }: {
+    serverPort: any;
+    options?: {};
+}) => Promise<{
+    wsc: ws;
+    messages: any[];
+    stop(): Promise<void>;
+    lastMessage(): any;
+}>;

package/lib/index.js

@@ -6,8 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 var _exportNames = {
   pgOnly: true,
   randomStr: true,
-  mockDatabase: true
+  waitSecond: true,
+  startServerWithRandomPort: true,
+  createWsClient: true,
+  mockDatabase: true,
+  supertest: true
 };
+exports.createWsClient = void 0;
 Object.defineProperty(exports, "mockDatabase", {
   enumerable: true,
   get: function get() {
@@ -16,6 +21,21 @@ Object.defineProperty(exports, "mockDatabase", {
 });
 exports.pgOnly = void 0;
 exports.randomStr = randomStr;
+exports.startServerWithRandomPort = void 0;
+Object.defineProperty(exports, "supertest", {
+  enumerable: true,
+  get: function get() {
+    return _supertest().default;
+  }
+});
+exports.waitSecond = void 0;
+function _ws() {
+  const data = _interopRequireDefault(require("ws"));
+  _ws = function _ws() {
+    return data;
+  };
+  return data;
+}
 function _database() {
   const data = require("@nocobase/database");
   _database = function _database() {
@@ -35,9 +55,85 @@ Object.keys(_mockServer).forEach(function (key) {
     }
   });
 });
+function _supertest() {
+  const data = _interopRequireDefault(require("supertest"));
+  _supertest = function _supertest() {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 const pgOnly = () => process.env.DB_DIALECT == 'postgres' ? describe : describe.skip;
 exports.pgOnly = pgOnly;
 function randomStr() {
   // create random string
   return Math.random().toString(36).substring(2);
-}
+}
+const waitSecond = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(function* () {
+    yield new Promise(resolve => setTimeout(resolve, 1000));
+  });
+  return function waitSecond() {
+    return _ref.apply(this, arguments);
+  };
+}();
+exports.waitSecond = waitSecond;
+const startServerWithRandomPort = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(function* (startServer) {
+    return yield new Promise(resolve => {
+      startServer({
+        port: 0,
+        host: 'localhost',
+        callback(server) {
+          // @ts-ignore
+          const port = server.address().port;
+          resolve(port);
+        }
+      });
+    });
+  });
+  return function startServerWithRandomPort(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+exports.startServerWithRandomPort = startServerWithRandomPort;
+const createWsClient = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(function* ({
+    serverPort,
+    options = {}
+  }) {
+    console.log(`connect to ws://localhost:${serverPort}/ws`, options);
+    const wsc = new (_ws().default)(`ws://localhost:${serverPort}/ws`, options);
+    const messages = [];
+    wsc.on('message', data => {
+      const message = data.toString();
+      messages.push(message);
+    });
+    // await connection established
+    yield new Promise(resolve => {
+      wsc.on('open', resolve);
+    });
+    return {
+      wsc,
+      messages,
+      stop() {
+        return _asyncToGenerator(function* () {
+          const promise = new Promise(resolve => {
+            wsc.on('close', resolve);
+          });
+          wsc.close();
+          yield promise;
+        })();
+      },
+      lastMessage() {
+        return JSON.parse(messages[messages.length - 1]);
+      }
+    };
+  });
+  return function createWsClient(_x2) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+exports.createWsClient = createWsClient;

package/lib/mockServer.d.ts

@@ -51,6 +51,7 @@ interface Resource {
 export declare class MockServer extends Application {
     loadAndInstall(options?: any): Promise<void>;
     cleanDb(): Promise<void>;
+    destroy(options?: any): Promise<void>;
     agent(): SuperAgentTest & {
         login: (user: any) => SuperAgentTest;
         loginUsingId: (userId: number) => SuperAgentTest;

package/lib/mockServer.js

@@ -42,7 +42,7 @@ function _supertest() {
   };
   return data;
 }
-const _excluded = ["filterByTk", "values", "file"];
+const _excluded = ["values", "file"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -83,8 +83,17 @@ class MockServer extends _server().default {
       });
     })();
   }
+  destroy(options = {}) {
+    var _superprop_getDestroy = () => super.destroy,
+      _this3 = this;
+    return _asyncToGenerator(function* () {
+      yield _superprop_getDestroy().call(_this3, options);
+      _server().Gateway.getInstance().destroy();
+      yield _server().AppSupervisor.getInstance().destroy();
+    })();
+  }
   agent() {
-    const agent = _supertest().default.agent(this.appManager.callback());
+    const agent = _supertest().default.agent(this.callback());
     const prefix = this.resourcer.options.prefix;
     const proxy = new Proxy(agent, {
       get(target, method, receiver) {
@@ -105,8 +114,8 @@ class MockServer extends _server().default {
             const proxy = new Proxy({}, {
               get(target, method, receiver) {
                 return (params = {}) => {
-                  let filterByTk = params.filterByTk,
-                    _params$values = params.values,
+                  let filterByTk = params.filterByTk;
+                  const _params$values = params.values,
                     values = _params$values === void 0 ? {} : _params$values,
                     file = params.file,
                     restParams = _objectWithoutProperties(params, _excluded);
@@ -160,6 +169,8 @@ function mockServer(options = {}) {
   if (typeof TextDecoder === 'undefined') {
     global.TextDecoder = require('util').TextDecoder;
   }
+  _server().Gateway.getInstance().reset();
+  _server().AppSupervisor.getInstance().reset();
   // @ts-ignore
   if (!_server().PluginManager.findPackagePatched) {
     _server().PluginManager.getPackageJson = () => {

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@nocobase/test",
-  "version": "0.12.0-alpha.4",
+  "version": "0.13.0-alpha.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/server": "0.12.0-alpha.4",
+    "@nocobase/server": "0.13.0-alpha.1",
     "@types/supertest": "^2.0.11",
     "mockjs": "^1.1.0",
     "mysql2": "^2.3.3",
     "pg": "^8.7.3",
     "pg-hstore": "^2.3.4",
     "sqlite3": "^5.0.8",
-    "supertest": "^6.1.6"
+    "supertest": "^6.1.6",
+    "ws": "^8.13.0"
   },
-  "gitHead": "215dc3b2437c501ca903b56cc378ab5e81c8a11c"
+  "gitHead": "0ebd4e85a1b0b0d0943768ab6cb5c3d824562239"
 }