testit-js-commons 4.2.0-TMS-5.8 → 5.0.0

package/lib/services/testruns/testruns.converter.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestRunConverter = void 0;
-const testit_api_client_1 = require("testit-api-client");
 const common_1 = require("../../common");
 const autotests_1 = require("../autotests");
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const AdaptersApi = require("../../adapters-api/dist/index");
+const TestRunStateEnum = AdaptersApi.TestRunState;
 class TestRunConverter extends common_1.BaseConverter {
     constructor(config) {
         super(config);
@@ -11,18 +13,18 @@ class TestRunConverter extends common_1.BaseConverter {
     }
     toLocalState(state) {
         // @ts-ignore
-        return testit_api_client_1.TestRunState[state];
+        return TestRunStateEnum[state];
     }
     toOriginState(state) {
         // @ts-ignore
-        return testit_api_client_1.TestRunState[state];
+        return TestRunStateEnum[state];
     }
     mapToStatusType(status) {
         const statusMap = {
             Passed: "Succeeded",
             Failed: "Failed",
             Blocked: "Incomplete",
-            Skipped: "Incomplete"
+            Skipped: "Incomplete",
         };
         return statusMap[status];
     }
@@ -49,7 +51,7 @@ class TestRunConverter extends common_1.BaseConverter {
             outcome: undefined,
             startedOn: undefined,
             completedOn: undefined,
-            duration: undefined
+            duration: undefined,
         };
         if (autotest.duration !== undefined) {
             model.duration = autotest.duration;
@@ -83,7 +85,7 @@ class TestRunConverter extends common_1.BaseConverter {
         return model;
     }
     toLocalTestRun(testRun) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         return {
             id: testRun.id,
             name: testRun.name,
@@ -92,8 +94,17 @@ class TestRunConverter extends common_1.BaseConverter {
             description: (_c = testRun.description) !== null && _c !== void 0 ? _c : undefined,
             launchSource: (_d = testRun.launchSource) !== null && _d !== void 0 ? _d : undefined,
             stateName: this.toLocalState(testRun.stateName),
-            attachments: testRun.attachments,
-            links: testRun.links,
+            attachments: (_e = testRun.attachments) === null || _e === void 0 ? void 0 : _e.map((a) => ({ id: a.id })),
+            links: (_f = testRun.links) === null || _f === void 0 ? void 0 : _f.map((link) => {
+                var _a;
+                return ({
+                    url: link.url,
+                    id: link.id,
+                    title: link.title,
+                    description: link.description,
+                    hasInfo: (_a = link.hasInfo) !== null && _a !== void 0 ? _a : true,
+                });
+            }),
         };
     }
 }

package/lib/services/testruns/testruns.service.d.ts

@@ -1,10 +1,9 @@
-import * as TestitApiClient from "testit-api-client";
 import { AdapterConfig, BaseService } from "../../common";
 import { type ITestRunsService, TestRunId, AutotestResult, TestRunGet } from "./testruns.type";
 import { type ITestRunConverter } from "./testruns.converter";
 export declare class TestRunsService extends BaseService implements ITestRunsService {
     protected readonly config: AdapterConfig;
-    protected _client: TestitApiClient.TestRunsApi;
+    protected _client: any;
     protected _converter: ITestRunConverter;
     private readonly _testResults;
     /** testResultId by autoTestExternalId within current run (InProgress POST + search). */

package/lib/services/testruns/testruns.service.js

@@ -1,37 +1,4 @@
 "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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestRunsService = void 0;
-// @ts-ignore
-const TestitApiClient = __importStar(require("testit-api-client"));
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const AdaptersApi = require("../../adapters-api/dist/index");
 const common_1 = require("../../common");
 const utils_1 = require("../../common/utils");
 const testresults_1 = require("../testresults");
@@ -60,7 +27,7 @@ class TestRunsService extends common_1.BaseService {
         this.config = config;
         /** testResultId by autoTestExternalId within current run (InProgress POST + search). */
         this.testResultIdsByExternalId = new Map();
-        this._client = new TestitApiClient.TestRunsApi();
+        this._client = new AdaptersApi.TestRunsApi(AdaptersApi.ApiClient.instance);
         this._converter = new testruns_converter_1.TestRunConverter(config);
         this._testResults = new testresults_1.TestResultsService(config);
     }
@@ -71,10 +38,10 @@ class TestRunsService extends common_1.BaseService {
                 name: this.config.testRunName,
             };
             return yield this._client
-                .createEmpty({ createEmptyTestRunApiModel: (0, utils_1.escapeHtmlInObject)(createRequest) })
+                .adaptersTestRunsPost({ createEmptyTestRunApiModel: (0, utils_1.escapeHtmlInObject)(createRequest) })
                 // @ts-ignore
                 .then((response) => {
-                const data = response.body || response;
+                const data = (response === null || response === void 0 ? void 0 : response.body) || response;
                 if (!data) {
                     throw new Error("API returned undefined response");
                 }
@@ -92,10 +59,10 @@ class TestRunsService extends common_1.BaseService {
     getTestRun(testRunId) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this._client
-                .getTestRunById(testRunId)
+                .adaptersTestRunsIdGet(testRunId)
                 // @ts-ignore
                 .then((response) => {
-                const data = response.body || response;
+                const data = (response === null || response === void 0 ? void 0 : response.body) || response;
                 return data;
             })
                 // @ts-ignore
@@ -105,11 +72,11 @@ class TestRunsService extends common_1.BaseService {
     updateTestRun(testRun) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._client
-                .updateEmpty({ updateEmptyTestRunApiModel: testRun })
+                .adaptersTestRunsPut({ updateEmptyTestRunApiModel: testRun })
                 // @ts-ignore
                 .then((response) => {
-                logger_1.default.log("Full response from updateEmpty:", response);
-                const data = response.body || response;
+                logger_1.default.log("Full response from adaptersTestRunsPut:", response);
+                const data = (response === null || response === void 0 ? void 0 : response.body) || response;
                 if (!data) {
                     throw new Error("API returned undefined response");
                 }
@@ -124,7 +91,7 @@ class TestRunsService extends common_1.BaseService {
             try {
                 const testRun = yield this.getTestRun(testRunId);
                 if (testRun.stateName === "NotStarted") {
-                    yield this._client.startTestRun(testRunId);
+                    yield this._client.adaptersTestRunsIdStartPost(testRunId);
                 }
             }
             catch (err) {
@@ -137,7 +104,7 @@ class TestRunsService extends common_1.BaseService {
             try {
                 const testRun = yield this.getTestRun(testRunId);
                 if (testRun.stateName === "InProgress") {
-                    yield this._client.completeTestRun(testRunId);
+                    yield this._client.adaptersTestRunsIdCompletePost(testRunId);
                 }
             }
             catch (err) {
@@ -234,7 +201,7 @@ class TestRunsService extends common_1.BaseService {
     sendAutotestResultWithRetry(testRunId, autotestResult) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const ids = yield (0, utils_1.withHttpRetry)(() => this._client.setAutoTestResultsForTestRun(testRunId, {
+            const ids = yield (0, utils_1.withHttpRetry)(() => this._client.adaptersTestRunsIdTestResultsPost(testRunId, {
                 autoTestResultsForTestRunModel: [autotestResult],
             }), {
                 label: `setAutoTestResults:${autotestResult.autoTestExternalId}:${(_a = autotestResult.statusCode) !== null && _a !== void 0 ? _a : autotestResult.statusType}`,

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "testit-js-commons",
-  "version": "4.2.0-TMS-5.8",
+  "version": "5.0.0",
   "description": "JavaScript commons for Test IT",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "source": "src/index.ts",
   "scripts": {
-    "prebuild": "npm install && npm --prefix src/sync-storage install && npm --prefix src/sync-storage run build",
-    "build": "tsc && npm run copy:sync-storage",
+    "prebuild": "npm install && npm --prefix src/sync-storage install && npm --prefix src/sync-storage run build && npm --prefix src/adapters-api install && npm --prefix src/adapters-api run build",
+    "build": "tsc && npm run copy:adapters-api && npm run copy:sync-storage",
+    "copy:adapters-api": "node -e \"const fs=require('fs');fs.rmSync('lib/adapters-api',{recursive:true,force:true});fs.mkdirSync('lib/adapters-api',{recursive:true});fs.cpSync('src/adapters-api/dist','lib/adapters-api/dist',{recursive:true});fs.copyFileSync('src/adapters-api/index.d.ts','lib/adapters-api/index.d.ts');\"",
     "copy:sync-storage": "node -e \"const fs=require('fs');fs.rmSync('lib/sync-storage',{recursive:true,force:true});fs.mkdirSync('lib/sync-storage',{recursive:true});fs.cpSync('src/sync-storage/dist','lib/sync-storage/dist',{recursive:true});fs.copyFileSync('src/sync-storage/index.d.ts','lib/sync-storage/index.d.ts');\"",
-    "pretest": "npm --prefix src/sync-storage run build",
+    "pretest": "npm --prefix src/sync-storage run build && npm --prefix src/adapters-api run build",
     "watch": "tsc -w",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -39,10 +40,11 @@
   },
   "dependencies": {
     "dotenv": "^16.0.3",
-    "testit-api-client": "7.3.1-TMS-5.8"
+    "superagent": "^10.3.0"
   },
   "files": [
     "lib",
+    "lib/adapters-api",
     "lib/sync-storage"
   ]
 }