@tramvai/test-helpers 1.84.2 → 1.85.0

package/lib/index.es.js

@@ -4,16 +4,16 @@ import { walkOfModules, getModuleParameters } from '@tramvai/core';
 import { createMockDi } from '@tramvai/test-mocks';
 
 const parseHtml = (html, parserOptions = { blockTextElements: { script: false, style: false } }) => {
-    var _a;
+    var _a, _b, _c;
     if (!html) {
         return null;
     }
     const parsed = parse(html, parserOptions);
     return {
         parsed,
-        head: parsed.querySelector('head').innerHTML,
-        body: parsed.querySelector('body').innerHTML,
-        application: (_a = parsed.querySelector('.application')) === null || _a === void 0 ? void 0 : _a.innerHTML,
+        body: (_a = parsed.querySelector('body')) === null || _a === void 0 ? void 0 : _a.innerHTML,
+        head: (_b = parsed.querySelector('head')) === null || _b === void 0 ? void 0 : _b.innerHTML,
+        application: (_c = parsed.querySelector('.application')) === null || _c === void 0 ? void 0 : _c.innerHTML,
     };
 };
 
@@ -50,7 +50,12 @@ const renderFactory = (request) => async (path, { method = 'get', parserOptions,
 };
 
 const requestFactory = (appOrUrl) => {
-    const request = supertest(appOrUrl);
+    let server = appOrUrl;
+    if (typeof appOrUrl === 'object' && 'ready' in appOrUrl) {
+        appOrUrl.ready();
+        server = appOrUrl.server;
+    }
+    const request = supertest(server);
     return (path, { method = 'get' } = {}) => {
         return request[method](path);
     };

package/lib/index.js

@@ -12,16 +12,16 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var supertest__default = /*#__PURE__*/_interopDefaultLegacy(supertest);
 
 const parseHtml = (html, parserOptions = { blockTextElements: { script: false, style: false } }) => {
-    var _a;
+    var _a, _b, _c;
     if (!html) {
         return null;
     }
     const parsed = nodeHtmlParser.parse(html, parserOptions);
     return {
         parsed,
-        head: parsed.querySelector('head').innerHTML,
-        body: parsed.querySelector('body').innerHTML,
-        application: (_a = parsed.querySelector('.application')) === null || _a === void 0 ? void 0 : _a.innerHTML,
+        body: (_a = parsed.querySelector('body')) === null || _a === void 0 ? void 0 : _a.innerHTML,
+        head: (_b = parsed.querySelector('head')) === null || _b === void 0 ? void 0 : _b.innerHTML,
+        application: (_c = parsed.querySelector('.application')) === null || _c === void 0 ? void 0 : _c.innerHTML,
     };
 };
 
@@ -58,7 +58,12 @@ const renderFactory = (request) => async (path, { method = 'get', parserOptions,
 };
 
 const requestFactory = (appOrUrl) => {
-    const request = supertest__default["default"](appOrUrl);
+    let server = appOrUrl;
+    if (typeof appOrUrl === 'object' && 'ready' in appOrUrl) {
+        appOrUrl.ready();
+        server = appOrUrl.server;
+    }
+    const request = supertest__default["default"](server);
     return (path, { method = 'get' } = {}) => {
         return request[method](path);
     };

package/lib/parseHtml.d.ts

@@ -2,7 +2,7 @@ import type { Options as ParserOptions } from 'node-html-parser';
 export declare type ParseOptions = Partial<ParserOptions>;
 export declare const parseHtml: (html: string, parserOptions?: ParseOptions) => {
     parsed: import("node-html-parser").HTMLElement;
-    head: string;
     body: string;
+    head: string;
     application: string;
 } | null;

package/lib/render.d.ts

@@ -6,7 +6,7 @@ export declare const renderFactory: (request: ReturnType<typeof requestFactory>)
 }) => Promise<{
     initialState: any;
     parsed: import("node-html-parser").HTMLElement;
-    head: string;
     body: string;
+    head: string;
     application: string;
 }>;

package/lib/request.d.ts

@@ -1,5 +1,6 @@
 import supertest from 'supertest';
+import type { FastifyInstance } from 'fastify';
 import type { Application } from 'express';
-export declare const requestFactory: (appOrUrl: Application | string) => (path: string, { method }?: {
+export declare const requestFactory: (appOrUrl: Application | FastifyInstance | string) => (path: string, { method }?: {
     method?: "get" | "post" | "put" | undefined;
 }) => supertest.Test;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/test-helpers",
-  "version": "1.84.2",
+  "version": "1.85.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -18,11 +18,12 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tramvai/core": "1.84.2",
-    "@tramvai/test-mocks": "1.84.2",
+    "@tramvai/core": "1.85.0",
+    "@tramvai/test-mocks": "1.85.0",
     "@types/express": "^4.17.1",
     "@types/supertest": "^2.0.11",
     "express": "^4.17.1",
+    "fastify": "^3.27.4",
     "node-html-parser": "^3.0.4",
     "supertest": "^6.1.3"
   },