@tramvai/test-helpers 2.26.2 → 2.28.0

package/lib/index.es.js

@@ -1,4 +1,5 @@
 import { parse } from 'node-html-parser';
+import prettier from 'prettier';
 import supertest from 'supertest';
 import { walkOfModules, getModuleParameters } from '@tramvai/core';
 import { createMockDi } from '@tramvai/test-mocks';
@@ -8,7 +9,8 @@ const parseHtml = (html, parserOptions = { blockTextElements: { script: false, s
     if (!html) {
         return null;
     }
-    const parsed = parse(html, parserOptions);
+    const prettyHtml = prettier.format(html, { parser: 'html', printWidth: 120 });
+    const parsed = parse(prettyHtml, parserOptions);
     return {
         parsed,
         body: (_a = parsed.querySelector('body')) === null || _a === void 0 ? void 0 : _a.innerHTML,
@@ -17,9 +19,13 @@ const parseHtml = (html, parserOptions = { blockTextElements: { script: false, s
     };
 };
 
-const renderFactory = (request) => async (path, { method = 'get', parserOptions, } = {}) => {
+const renderFactory = (request, { replaceDynamicStrings = {}, } = {}) => async (path, { method = 'get', parserOptions, } = {}) => {
     const response = await request(path, { method });
-    const parsed = parseHtml(response.text, parserOptions);
+    let { text } = response;
+    for (const key in replaceDynamicStrings) {
+        text = text.replace(new RegExp(key, 'g'), replaceDynamicStrings[key]);
+    }
+    const parsed = parseHtml(text, parserOptions);
     if (!parsed) {
         throw new Error(`Cannot parse response
   got response:
@@ -29,12 +35,12 @@ const renderFactory = (request) => async (path, { method = 'get', parserOptions,
     return {
         ...parsed,
         get initialState() {
-            var _a;
+            var _a, _b, _c;
             const parsedWithScripts = (_a = parseHtml(response.text, {})) === null || _a === void 0 ? void 0 : _a.parsed;
             if (!parsedWithScripts) {
                 return;
             }
-            return JSON.parse(parsedWithScripts.querySelector('#__TRAMVAI_STATE__').textContent);
+            return JSON.parse((_c = (_b = parsedWithScripts.querySelector('#__TRAMVAI_STATE__')) === null || _b === void 0 ? void 0 : _b.textContent) !== null && _c !== void 0 ? _c : 'null');
         },
     };
 };

package/lib/index.js

@@ -3,12 +3,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var nodeHtmlParser = require('node-html-parser');
+var prettier = require('prettier');
 var supertest = require('supertest');
 var core = require('@tramvai/core');
 var testMocks = require('@tramvai/test-mocks');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var prettier__default = /*#__PURE__*/_interopDefaultLegacy(prettier);
 var supertest__default = /*#__PURE__*/_interopDefaultLegacy(supertest);
 
 const parseHtml = (html, parserOptions = { blockTextElements: { script: false, style: false } }) => {
@@ -16,7 +18,8 @@ const parseHtml = (html, parserOptions = { blockTextElements: { script: false, s
     if (!html) {
         return null;
     }
-    const parsed = nodeHtmlParser.parse(html, parserOptions);
+    const prettyHtml = prettier__default["default"].format(html, { parser: 'html', printWidth: 120 });
+    const parsed = nodeHtmlParser.parse(prettyHtml, parserOptions);
     return {
         parsed,
         body: (_a = parsed.querySelector('body')) === null || _a === void 0 ? void 0 : _a.innerHTML,
@@ -25,9 +28,13 @@ const parseHtml = (html, parserOptions = { blockTextElements: { script: false, s
     };
 };
 
-const renderFactory = (request) => async (path, { method = 'get', parserOptions, } = {}) => {
+const renderFactory = (request, { replaceDynamicStrings = {}, } = {}) => async (path, { method = 'get', parserOptions, } = {}) => {
     const response = await request(path, { method });
-    const parsed = parseHtml(response.text, parserOptions);
+    let { text } = response;
+    for (const key in replaceDynamicStrings) {
+        text = text.replace(new RegExp(key, 'g'), replaceDynamicStrings[key]);
+    }
+    const parsed = parseHtml(text, parserOptions);
     if (!parsed) {
         throw new Error(`Cannot parse response
   got response:
@@ -37,12 +44,12 @@ const renderFactory = (request) => async (path, { method = 'get', parserOptions,
     return {
         ...parsed,
         get initialState() {
-            var _a;
+            var _a, _b, _c;
             const parsedWithScripts = (_a = parseHtml(response.text, {})) === null || _a === void 0 ? void 0 : _a.parsed;
             if (!parsedWithScripts) {
                 return;
             }
-            return JSON.parse(parsedWithScripts.querySelector('#__TRAMVAI_STATE__').textContent);
+            return JSON.parse((_c = (_b = parsedWithScripts.querySelector('#__TRAMVAI_STATE__')) === null || _b === void 0 ? void 0 : _b.textContent) !== null && _c !== void 0 ? _c : 'null');
         },
     };
 };

package/lib/render.d.ts

@@ -1,6 +1,8 @@
 import type { ParseOptions } from './parseHtml';
 import type { requestFactory } from './request';
-export declare const renderFactory: (request: ReturnType<typeof requestFactory>) => (path: string, { method, parserOptions, }?: {
+export declare const renderFactory: (request: ReturnType<typeof requestFactory>, { replaceDynamicStrings, }?: {
+    replaceDynamicStrings?: Record<string, string> | undefined;
+}) => (path: string, { method, parserOptions, }?: {
     method?: "get" | "post" | "put" | undefined;
     parserOptions?: Partial<import("node-html-parser").Options> | undefined;
 }) => Promise<{

package/package.json

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