@tramvai/test-integration 1.96.0 → 1.97.0

package/lib/app/utils.d.ts

@@ -1,6 +1,8 @@
 import type { PromiseType } from 'utility-types';
 import type { start } from '@tramvai/cli';
+import type { StartCliOptions } from './startCli';
 declare type CliResult = PromiseType<ReturnType<typeof start>>;
 export declare const getServerUrl: ({ server }: CliResult) => string;
 export declare const getStaticUrl: ({ staticServer }: CliResult) => string;
+export declare const getUtilityServerUrl: (env: StartCliOptions['env'], { server }: CliResult) => string;
 export {};

package/lib/index.es.js

@@ -12,6 +12,10 @@ const getStaticUrl = ({ staticServer }) => {
     const { port } = staticServer === null || staticServer === void 0 ? void 0 : staticServer.address();
     return `http://localhost:${port}`;
 };
+const getUtilityServerUrl = (env, { server }) => {
+    const { port } = server === null || server === void 0 ? void 0 : server.address();
+    return `http://localhost:${(env === null || env === void 0 ? void 0 : env.UTILITY_SERVER_PORT) || port}`;
+};
 
 const wrapPapi = ({ serverUrl, appName }) => {
     const publicPapi = supertest(`${serverUrl}/${appName}/papi/`);
@@ -83,10 +87,11 @@ const startCli = async (targetOrConfig, { enableRebuild = false, env, logger = c
     });
     const serverUrl = getServerUrl(cliResult);
     const staticUrl = getStaticUrl(cliResult);
+    const utilityServerUrl = getUtilityServerUrl(env, cliResult);
     const appName = typeof targetOrConfig === 'string' ? targetOrConfig : targetOrConfig.name;
     try {
         await waitOn({
-            resources: [`${serverUrl}/readyz`],
+            resources: [`${utilityServerUrl}/readyz`],
         });
     }
     catch (e) {
@@ -117,4 +122,4 @@ const sleep = (ms) => {
     return new Promise((resolve) => setTimeout(resolve, ms).unref());
 };
 
-export { getServerUrl, getStaticUrl, sleep, startCli };
+export { getServerUrl, getStaticUrl, getUtilityServerUrl, sleep, startCli };

package/lib/index.js

@@ -21,6 +21,10 @@ const getStaticUrl = ({ staticServer }) => {
     const { port } = staticServer === null || staticServer === void 0 ? void 0 : staticServer.address();
     return `http://localhost:${port}`;
 };
+const getUtilityServerUrl = (env, { server }) => {
+    const { port } = server === null || server === void 0 ? void 0 : server.address();
+    return `http://localhost:${(env === null || env === void 0 ? void 0 : env.UTILITY_SERVER_PORT) || port}`;
+};
 
 const wrapPapi = ({ serverUrl, appName }) => {
     const publicPapi = supertest__default["default"](`${serverUrl}/${appName}/papi/`);
@@ -92,10 +96,11 @@ const startCli = async (targetOrConfig, { enableRebuild = false, env, logger = c
     });
     const serverUrl = getServerUrl(cliResult);
     const staticUrl = getStaticUrl(cliResult);
+    const utilityServerUrl = getUtilityServerUrl(env, cliResult);
     const appName = typeof targetOrConfig === 'string' ? targetOrConfig : targetOrConfig.name;
     try {
         await waitOn__default["default"]({
-            resources: [`${serverUrl}/readyz`],
+            resources: [`${utilityServerUrl}/readyz`],
         });
     }
     catch (e) {
@@ -128,5 +133,6 @@ const sleep = (ms) => {
 
 exports.getServerUrl = getServerUrl;
 exports.getStaticUrl = getStaticUrl;
+exports.getUtilityServerUrl = getUtilityServerUrl;
 exports.sleep = sleep;
 exports.startCli = startCli;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/test-integration",
-  "version": "1.96.0",
+  "version": "1.97.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@tinkoff/mocker": "1.5.6",
-    "@tramvai/test-helpers": "1.96.0",
+    "@tramvai/test-helpers": "1.97.0",
     "@types/supertest": "^2.0.11",
     "supertest": "^6.1.3",
     "utility-types": "^3.10.0",
@@ -30,7 +30,7 @@
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.96.0",
+    "@tramvai/cli": "1.97.0",
     "tslib": "^2.0.3"
   },
   "license": "Apache-2.0",