@allurereport/plugin-testops 3.8.2 → 3.10.0

package/README.md

@@ -12,7 +12,26 @@
 
 ## Overview
 
-The plugin creates a new launch in Allure TestOps with all the tests data from the current report.
+The plugin can create a new launch in Allure TestOps with all the tests data from the current report.
+
+## CI and local runs
+
+The plugin is intended to run in a **CI environment**. When a supported CI is detected, upload to TestOps starts automatically (as long as `accessToken`, `endpoint`, and `projectId` are configured).
+
+On a **local machine** (no CI detected), upload is disabled by default.
+
+To upload from your machine anyway, opt in with one of these environment variables set to a truthy value (`true` or `1`):
+
+| Environment variable       | Purpose |
+|----------------------------|---------|
+| `ALLURE_TESTOPS_ENABLED`   | Explicitly enable TestOps upload outside CI |
+| `CI`                       | Same effect; useful if your tooling already sets `CI` in non-CI workflows |
+
+Example:
+
+```shell
+ALLURE_TESTOPS_ENABLED=true allure run ...
+```
 
 ## Install
 
@@ -71,3 +90,5 @@ The plugin automatically reads the following environment variables and uses them
 | `ALLURE_ENDPOINT` | `endpoint` |
 | `ALLURE_LAUNCH_NAME` | `launchName` |
 | `ALLURE_LAUNCH_TAGS` | `launchTags` |
+
+`ALLURE_TESTOPS_ENABLED` and `CI` are not configuration options: they only control whether upload runs when no CI is detected. See [CI and local runs](#ci-and-local-runs).

package/dist/client.d.ts

@@ -23,7 +23,6 @@ export declare class TestOpsClient {
     get launchId(): number | undefined;
     closeLaunch(launchId: number): Promise<void>;
     createLaunchCategoriesBulk(launchId: number, items: LaunchCategoryBulkItem[]): Promise<LaunchCategoryBulkResult[]>;
-    issueOauthToken(): Promise<void>;
     startUpload(ci: CiDescriptor): Promise<void>;
     stopUpload(ci: CiDescriptor, status: TestStatus): Promise<void>;
     createLaunch(launchName: string, launchTags: string[]): Promise<void>;

package/dist/client.js

@@ -9,14 +9,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TestOpsClient_instances, _TestOpsClient_logger, _TestOpsClient_accessToken, _TestOpsClient_projectId, _TestOpsClient_oauthToken, _TestOpsClient_client, _TestOpsClient_launch, _TestOpsClient_session, _TestOpsClient_uploadInProgress, _TestOpsClient_uploadLimit, _TestOpsClient_namedEnvsIdsByEnv, _TestOpsClient_postTestResultsChunk, _TestOpsClient_uploadChunkAttachmentsAndFixtures, _TestOpsClient_uploadAttachmentsForResult, _TestOpsClient_uploadFixturesForResult;
-import axios, { AxiosError, isAxiosError } from "axios";
+var _TestOpsClient_instances, _TestOpsClient_baseUrl, _TestOpsClient_logger, _TestOpsClient_accessToken, _TestOpsClient_projectId, _TestOpsClient_client, _TestOpsClient_launch, _TestOpsClient_session, _TestOpsClient_uploadInProgress, _TestOpsClient_uploadLimit, _TestOpsClient_namedEnvsIdsByEnv, _TestOpsClient_postTestResultsChunk, _TestOpsClient_uploadChunkAttachmentsAndFixtures, _TestOpsClient_uploadAttachmentsForResult, _TestOpsClient_uploadFixturesForResult;
+import { createServiceHttpClient } from "@allurereport/service";
+import { AxiosError, isAxiosError } from "axios";
 import FormData from "form-data";
 import { chunk } from "lodash-es";
 import pLimit from "p-limit";
 import { bold } from "yoctocolors";
 import { Logger } from "./logger.js";
-import { toUploadFixturesResultsDto, toUploadResultsDto } from "./uploaderDto.js";
+import { toUploadFixturesResultsDto, toUploadResultsDto } from "./utils/uploaderDto.js";
 class TestOpsClientError extends AxiosError {
 }
 const CHUNK_SIZE = 100;
@@ -24,10 +25,10 @@ const BULK_UPLOAD_CHUNK_SIZE = 1000;
 export class TestOpsClient {
     constructor(params) {
         _TestOpsClient_instances.add(this);
+        _TestOpsClient_baseUrl.set(this, void 0);
         _TestOpsClient_logger.set(this, new Logger("TestOpsClient"));
         _TestOpsClient_accessToken.set(this, void 0);
         _TestOpsClient_projectId.set(this, void 0);
-        _TestOpsClient_oauthToken.set(this, "");
         _TestOpsClient_client.set(this, void 0);
         _TestOpsClient_launch.set(this, void 0);
         _TestOpsClient_session.set(this, void 0);
@@ -46,18 +47,12 @@ export class TestOpsClient {
         if (params.limit && params.limit > 5) {
             throw new Error("limit can't be greater than 5");
         }
+        __classPrivateFieldSet(this, _TestOpsClient_baseUrl, params.baseUrl, "f");
         __classPrivateFieldSet(this, _TestOpsClient_accessToken, params.accessToken, "f");
         __classPrivateFieldSet(this, _TestOpsClient_projectId, params.projectId, "f");
-        __classPrivateFieldSet(this, _TestOpsClient_client, axios.create({
-            baseURL: params.baseUrl,
-            validateStatus: (status) => status >= 200 && status < 400,
+        __classPrivateFieldSet(this, _TestOpsClient_client, createServiceHttpClient(params.baseUrl, {
+            apiToken: __classPrivateFieldGet(this, _TestOpsClient_accessToken, "f"),
         }), "f");
-        __classPrivateFieldGet(this, _TestOpsClient_client, "f").interceptors.request.use((config) => {
-            if (__classPrivateFieldGet(this, _TestOpsClient_oauthToken, "f")) {
-                config.headers.set("Authorization", `Bearer ${__classPrivateFieldGet(this, _TestOpsClient_oauthToken, "f")}`);
-            }
-            return config;
-        });
         if (params.limit) {
             __classPrivateFieldSet(this, _TestOpsClient_uploadLimit, params.limit, "f");
         }
@@ -71,7 +66,7 @@ export class TestOpsClient {
         if (!__classPrivateFieldGet(this, _TestOpsClient_launch, "f")) {
             return undefined;
         }
-        return new URL(`launch/${__classPrivateFieldGet(this, _TestOpsClient_launch, "f").id}`, __classPrivateFieldGet(this, _TestOpsClient_client, "f").defaults.baseURL).toString();
+        return new URL(`launch/${__classPrivateFieldGet(this, _TestOpsClient_launch, "f").id}`, __classPrivateFieldGet(this, _TestOpsClient_baseUrl, "f")).toString();
     }
     get launchId() {
         return __classPrivateFieldGet(this, _TestOpsClient_launch, "f")?.id;
@@ -95,8 +90,9 @@ export class TestOpsClient {
                 __classPrivateFieldGet(this, _TestOpsClient_logger, "f").debug(`POST /api/launch/category/bulk request (${currentRequestIndex + 1}/${totalChunks}, items: ${chunk.length})`);
             }
             __classPrivateFieldGet(this, _TestOpsClient_logger, "f").debug(body);
-            const { data } = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch/category/bulk", body, {
+            const data = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch/category/bulk", {
                 headers: { "Content-Type": "application/json" },
+                body,
             });
             if (Array.isArray(data)) {
                 results.push(...data);
@@ -115,37 +111,27 @@ export class TestOpsClient {
         }
         return results;
     }
-    async issueOauthToken() {
-        const base = __classPrivateFieldGet(this, _TestOpsClient_client, "f").defaults.baseURL;
-        __classPrivateFieldGet(this, _TestOpsClient_logger, "f").debug(`Endpoint: ${base}`);
-        __classPrivateFieldGet(this, _TestOpsClient_logger, "f").verbose("Issuing OAuth token…");
-        const formData = new FormData();
-        formData.append("grant_type", "apitoken");
-        formData.append("scope", "openid");
-        formData.append("token", __classPrivateFieldGet(this, _TestOpsClient_accessToken, "f"));
-        const { data } = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/uaa/oauth/token", formData);
-        __classPrivateFieldSet(this, _TestOpsClient_oauthToken, data.access_token, "f");
-        __classPrivateFieldGet(this, _TestOpsClient_logger, "f").verbose("OAuth token received");
-    }
     async startUpload(ci) {
         if (!__classPrivateFieldGet(this, _TestOpsClient_launch, "f")) {
             throw new Error("Launch isn't created! Call createLaunch first");
         }
         __classPrivateFieldGet(this, _TestOpsClient_logger, "f").verbose(`Starting CI upload (${ci.type})…`);
         await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/upload/start", {
-            projectId: __classPrivateFieldGet(this, _TestOpsClient_projectId, "f"),
-            ci: {
-                name: ci.type,
-            },
-            job: {
-                name: ci.jobUid,
-                uid: ci.jobUid,
-            },
-            jobRun: {
-                uid: ci.jobRunUid,
-            },
-            launch: {
-                id: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
+            body: {
+                projectId: __classPrivateFieldGet(this, _TestOpsClient_projectId, "f"),
+                ci: {
+                    name: ci.type,
+                },
+                job: {
+                    name: ci.jobUid,
+                    uid: ci.jobUid,
+                },
+                jobRun: {
+                    uid: ci.jobRunUid,
+                },
+                launch: {
+                    id: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
+                },
             },
         });
         __classPrivateFieldSet(this, _TestOpsClient_uploadInProgress, true, "f");
@@ -156,22 +142,26 @@ export class TestOpsClient {
             throw new Error("Upload isn't started! Call startUpload first");
         }
         await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/upload/stop", {
-            jobRunUid: ci.jobRunUid,
-            jobUid: ci.jobUid,
-            projectId: __classPrivateFieldGet(this, _TestOpsClient_projectId, "f"),
-            status,
+            body: {
+                jobRunUid: ci.jobRunUid,
+                jobUid: ci.jobUid,
+                projectId: __classPrivateFieldGet(this, _TestOpsClient_projectId, "f"),
+                status,
+            },
         });
         __classPrivateFieldSet(this, _TestOpsClient_uploadInProgress, false, "f");
         __classPrivateFieldGet(this, _TestOpsClient_logger, "f").verbose(`CI upload stopped (status: ${status})`);
     }
     async createLaunch(launchName, launchTags) {
         __classPrivateFieldGet(this, _TestOpsClient_logger, "f").verbose("Creating launch…");
-        const { data } = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch", {
-            name: launchName,
-            projectId: __classPrivateFieldGet(this, _TestOpsClient_projectId, "f"),
-            autoclose: true,
-            external: true,
-            tags: launchTags.map((tag) => ({ name: tag })),
+        const data = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch", {
+            body: {
+                name: launchName,
+                projectId: __classPrivateFieldGet(this, _TestOpsClient_projectId, "f"),
+                autoclose: true,
+                external: true,
+                tags: launchTags.map((tag) => ({ name: tag })),
+            },
         });
         __classPrivateFieldSet(this, _TestOpsClient_launch, data, "f");
         __classPrivateFieldGet(this, _TestOpsClient_logger, "f").debug(`Launch created: id=${bold(data.id.toString())}`);
@@ -180,13 +170,14 @@ export class TestOpsClient {
         if (!__classPrivateFieldGet(this, _TestOpsClient_launch, "f")) {
             throw new Error("Launch isn't created! Call createLaunch first");
         }
-        const { data } = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/upload/session", {
-            launchId: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
-            environment: Object.entries(environment).map(([key, value]) => ({
-                key,
-                value: String(value),
-            })),
-        }, {
+        const data = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/upload/session", {
+            body: {
+                launchId: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
+                environment: Object.entries(environment).map(([key, value]) => ({
+                    key,
+                    value: String(value),
+                })),
+            },
             params: {
                 manual: "true",
             },
@@ -211,13 +202,14 @@ export class TestOpsClient {
         if (!__classPrivateFieldGet(this, _TestOpsClient_launch, "f")) {
             throw new Error("Launch isn't created! Call createLaunch first");
         }
-        const { data } = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch/named-env/bulk", {
-            launchId: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
-            items: environments.map(({ id, name }) => ({
-                externalId: id,
-                name,
-            })),
-        }, {
+        const data = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch/named-env/bulk", {
+            body: {
+                launchId: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
+                items: environments.map(({ id, name }) => ({
+                    externalId: id,
+                    name,
+                })),
+            },
             headers: {
                 "Content-Type": "application/json",
             },
@@ -254,7 +246,8 @@ export class TestOpsClient {
                 contentType: attachment.contentType,
             });
         }
-        await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch/attachment", formData, {
+        await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch/attachment", {
+            body: formData,
             onUploadProgress(progressEvent) {
                 const total = progressEvent.total ?? 100;
                 const percent = total > 0 ? Math.min(100, Math.max(0, (progressEvent.loaded / total) * 100)) : 0;
@@ -272,9 +265,10 @@ export class TestOpsClient {
             throw new Error("Launch isn't created! Call createLaunch first");
         }
         await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch/error/bulk", {
-            launchId: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
-            items: errors,
-        }, {
+            body: {
+                launchId: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
+                items: errors,
+            },
             onUploadProgress(progressEvent) {
                 const total = progressEvent.total ?? 100;
                 const percent = total > 0 ? Math.min(100, Math.max(0, (progressEvent.loaded / total) * 100)) : 0;
@@ -345,9 +339,10 @@ export class TestOpsClient {
             return item;
         });
         await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/launch/quality-gate/bulk", {
-            launchId: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
-            items,
-        }, {
+            body: {
+                launchId: __classPrivateFieldGet(this, _TestOpsClient_launch, "f").id,
+                items,
+            },
             onUploadProgress(progressEvent) {
                 const total = progressEvent.total ?? 100;
                 const percent = total > 0 ? Math.min(100, Math.max(0, (progressEvent.loaded / total) * 100)) : 0;
@@ -356,7 +351,7 @@ export class TestOpsClient {
         });
     }
 }
-_TestOpsClient_logger = new WeakMap(), _TestOpsClient_accessToken = new WeakMap(), _TestOpsClient_projectId = new WeakMap(), _TestOpsClient_oauthToken = new WeakMap(), _TestOpsClient_client = new WeakMap(), _TestOpsClient_launch = new WeakMap(), _TestOpsClient_session = new WeakMap(), _TestOpsClient_uploadInProgress = new WeakMap(), _TestOpsClient_uploadLimit = new WeakMap(), _TestOpsClient_namedEnvsIdsByEnv = new WeakMap(), _TestOpsClient_instances = new WeakSet(), _TestOpsClient_postTestResultsChunk = async function _TestOpsClient_postTestResultsChunk(trsChunk) {
+_TestOpsClient_baseUrl = new WeakMap(), _TestOpsClient_logger = new WeakMap(), _TestOpsClient_accessToken = new WeakMap(), _TestOpsClient_projectId = new WeakMap(), _TestOpsClient_client = new WeakMap(), _TestOpsClient_launch = new WeakMap(), _TestOpsClient_session = new WeakMap(), _TestOpsClient_uploadInProgress = new WeakMap(), _TestOpsClient_uploadLimit = new WeakMap(), _TestOpsClient_namedEnvsIdsByEnv = new WeakMap(), _TestOpsClient_instances = new WeakSet(), _TestOpsClient_postTestResultsChunk = async function _TestOpsClient_postTestResultsChunk(trsChunk) {
     const extendedChunk = trsChunk.map((testResult) => {
         const extendedTestResult = {
             ...testResult,
@@ -376,7 +371,8 @@ _TestOpsClient_logger = new WeakMap(), _TestOpsClient_accessToken = new WeakMap(
         return extendedTestResult;
     });
     const body = toUploadResultsDto(__classPrivateFieldGet(this, _TestOpsClient_session, "f").id, extendedChunk);
-    const { data } = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/upload/test-result", body, {
+    const data = await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post("/api/upload/test-result", {
+        body,
         headers: { "Content-Type": "application/json" },
     });
     const reportIdsToTestOpsIds = {};
@@ -409,7 +405,8 @@ _TestOpsClient_logger = new WeakMap(), _TestOpsClient_accessToken = new WeakMap(
             });
         }
         try {
-            await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post(`/api/upload/test-result/${testOpsResultId}/attachment`, formData, {
+            await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post(`/api/upload/test-result/${testOpsResultId}/attachment`, {
+                body: formData,
                 headers: formData.getHeaders(),
             });
         }
@@ -430,5 +427,7 @@ _TestOpsClient_logger = new WeakMap(), _TestOpsClient_accessToken = new WeakMap(
     if (fixtures.length === 0)
         return;
     const body = toUploadFixturesResultsDto(fixtures);
-    await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post(`/api/upload/test-result/${testOpsResultId}/test-fixture-result`, body);
+    await __classPrivateFieldGet(this, _TestOpsClient_client, "f").post(`/api/upload/test-result/${testOpsResultId}/test-fixture-result`, {
+        body,
+    });
 };

package/dist/logger.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Logger_instances, _Logger_level, _Logger_isLogLevel, _Logger_prefix;
+var _Logger_instances, _Logger_level, _Logger_isLogLevel, _Logger_isSilent, _Logger_prefix;
 import console from "node:console";
 import { env } from "node:process";
 import { inspect } from "node:util";
@@ -37,7 +37,7 @@ export class Logger {
         _Logger_prefix.set(this, cyan(bold(`[${this.name}]:`)));
     }
     progressBarCounter(message, total) {
-        if (__classPrivateFieldGet(this, _Logger_instances, "m", _Logger_isLogLevel).call(this, "silent")) {
+        if (__classPrivateFieldGet(this, _Logger_instances, "m", _Logger_isSilent).call(this)) {
             return {
                 tick: () => { },
                 update: () => { },
@@ -51,7 +51,7 @@ export class Logger {
         return progressBar;
     }
     progressBar(message) {
-        if (__classPrivateFieldGet(this, _Logger_instances, "m", _Logger_isLogLevel).call(this, "silent")) {
+        if (__classPrivateFieldGet(this, _Logger_instances, "m", _Logger_isSilent).call(this)) {
             return {
                 update: () => { },
                 terminate: () => { },
@@ -126,4 +126,6 @@ export class Logger {
 }
 _Logger_level = new WeakMap(), _Logger_prefix = new WeakMap(), _Logger_instances = new WeakSet(), _Logger_isLogLevel = function _Logger_isLogLevel(level) {
     return logLevelsPriority[__classPrivateFieldGet(this, _Logger_level, "f")] <= logLevelsPriority[level];
+}, _Logger_isSilent = function _Logger_isSilent() {
+    return __classPrivateFieldGet(this, _Logger_level, "f") === "silent";
 };

package/dist/plugin.d.ts

@@ -4,7 +4,8 @@ export declare class TestOpsPlugin implements Plugin {
     #private;
     readonly options: TestOpsPluginOptions;
     constructor(options: TestOpsPluginOptions);
-    get ciMode(): boolean | undefined;
+    get isOverridenByEnv(): boolean;
+    get enabled(): boolean;
     start(context: PluginContext, store: AllureStore): Promise<void>;
     update(context: PluginContext, store: AllureStore): Promise<void>;
     done(context: PluginContext, store: AllureStore): Promise<void>;

package/dist/plugin.js

@@ -1,43 +1,44 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _TestOpsPlugin_instances, _TestOpsPlugin_logger, _TestOpsPlugin_ci, _TestOpsPlugin_client, _TestOpsPlugin_enabled, _TestOpsPlugin_launchName, _TestOpsPlugin_launchTags, _TestOpsPlugin_uploadedTestResultsIds, _TestOpsPlugin_autocloseLaunch, _TestOpsPlugin_uploadQualityGateResults, _TestOpsPlugin_uploadGlobalErrors, _TestOpsPlugin_uploadGlobalAttachments, _TestOpsPlugin_uploadTestResults, _TestOpsPlugin_upload, _TestOpsPlugin_trsToUpload, _TestOpsPlugin_enrichWithCategories, _TestOpsPlugin_syncLaunchCategories, _TestOpsPlugin_collectCategoryNamesByExternalId, _TestOpsPlugin_assignCreatedCategoryIds, _TestOpsPlugin_startUpload, _TestOpsPlugin_stopUpload;
+var _TestOpsPlugin_instances, _TestOpsPlugin_logger, _TestOpsPlugin_ci, _TestOpsPlugin_client, _TestOpsPlugin_launchName, _TestOpsPlugin_launchTags, _TestOpsPlugin_uploadedTestResultsIds, _TestOpsPlugin_autocloseLaunch, _TestOpsPlugin_uploadQualityGateResults, _TestOpsPlugin_uploadGlobalErrors, _TestOpsPlugin_uploadGlobalAttachments, _TestOpsPlugin_uploadTestResults, _TestOpsPlugin_upload, _TestOpsPlugin_trsToUpload, _TestOpsPlugin_enrichWithCategories, _TestOpsPlugin_syncLaunchCategories, _TestOpsPlugin_collectCategoryNamesByExternalId, _TestOpsPlugin_assignCreatedCategoryIds, _TestOpsPlugin_startUpload, _TestOpsPlugin_stopUpload;
 import { env } from "node:process";
-import { detect } from "@allurereport/ci";
+import { detect, isLocalCiDescriptor } from "@allurereport/ci";
 import { getWorstStatus } from "@allurereport/core-api";
 import { createPluginSummary } from "@allurereport/plugin-api";
 import { uniqBy, stubTrue } from "lodash-es";
 import { bold } from "yoctocolors";
 import { TestOpsClient } from "./client.js";
 import { Logger } from "./logger.js";
-import { toUploadCategory } from "./uploadCategory.js";
-import { uploadFilenameForLink } from "./uploaderDto.js";
-import { attachmentsResolverFactory, fixturesResolverFactory, resolvePluginOptions, unwrapStepsAttachments, } from "./utils.js";
+import { attachmentsResolverFactory, fixturesResolverFactory, resolvePluginOptions, unwrapStepsAttachments, } from "./utils/index.js";
+import { toUploadCategory } from "./utils/uploadCategory.js";
+import { uploadFilenameForLink } from "./utils/uploaderDto.js";
 const categoryDisplayName = (cat) => cat.name ?? cat.grouping?.[0]?.name ?? cat.grouping?.[0]?.value ?? cat.grouping?.[0]?.key ?? cat.externalId;
 export class TestOpsPlugin {
     constructor(options) {
         _TestOpsPlugin_instances.add(this);
         this.options = options;
         _TestOpsPlugin_logger.set(this, new Logger("TestOpsPlugin"));
-        _TestOpsPlugin_ci.set(this, void 0);
+        _TestOpsPlugin_ci.set(this, detect());
         _TestOpsPlugin_client.set(this, void 0);
-        _TestOpsPlugin_enabled.set(this, false);
         _TestOpsPlugin_launchName.set(this, "");
         _TestOpsPlugin_launchTags.set(this, []);
         _TestOpsPlugin_uploadedTestResultsIds.set(this, new Set());
-        _TestOpsPlugin_autocloseLaunch.set(this, void 0);
+        _TestOpsPlugin_autocloseLaunch.set(this, false);
+        if (isLocalCiDescriptor(__classPrivateFieldGet(this, _TestOpsPlugin_ci, "f")) && !this.isOverridenByEnv) {
+            __classPrivateFieldGet(this, _TestOpsPlugin_logger, "f").info(`plugin is disabled - no CI environment detected. To enable, set ${bold("ALLURE_TESTOPS_ENABLED")}=true or ${bold("CI")}=true.`);
+            return;
+        }
         const { accessToken, endpoint, projectId, launchName, launchTags, autocloseLaunch = true, } = resolvePluginOptions(options);
-        __classPrivateFieldSet(this, _TestOpsPlugin_ci, detect(), "f");
         if ([accessToken, endpoint, projectId].every(Boolean)) {
-            __classPrivateFieldSet(this, _TestOpsPlugin_enabled, true, "f");
             __classPrivateFieldSet(this, _TestOpsPlugin_client, new TestOpsClient({
                 baseUrl: endpoint,
                 accessToken,
@@ -57,32 +58,50 @@ export class TestOpsPlugin {
             __classPrivateFieldGet(this, _TestOpsPlugin_logger, "f").warn(`Allure TestOps ${bold("project ID")} is missing. Please provide a valid project ID in the plugin options.`);
         }
     }
-    get ciMode() {
-        return __classPrivateFieldGet(this, _TestOpsPlugin_ci, "f") && __classPrivateFieldGet(this, _TestOpsPlugin_ci, "f").type !== "local";
+    get isOverridenByEnv() {
+        const isEnabled = (value) => {
+            if (!value) {
+                return false;
+            }
+            return ["true", "1"].includes(value);
+        };
+        return isEnabled(env.ALLURE_TESTOPS_ENABLED) || isEnabled(env.CI);
+    }
+    get enabled() {
+        if (!(__classPrivateFieldGet(this, _TestOpsPlugin_client, "f") instanceof TestOpsClient)) {
+            return false;
+        }
+        if (this.isOverridenByEnv) {
+            return true;
+        }
+        if (!__classPrivateFieldGet(this, _TestOpsPlugin_ci, "f") || __classPrivateFieldGet(this, _TestOpsPlugin_ci, "f").type === "local") {
+            return false;
+        }
+        return true;
     }
     async start(context, store) {
-        if (!__classPrivateFieldGet(this, _TestOpsPlugin_enabled, "f")) {
+        if (!this.enabled) {
             return;
         }
         __classPrivateFieldGet(this, _TestOpsPlugin_logger, "f").verbose("Starting upload…");
         await __classPrivateFieldGet(this, _TestOpsPlugin_instances, "m", _TestOpsPlugin_startUpload).call(this);
-        await __classPrivateFieldGet(this, _TestOpsPlugin_instances, "m", _TestOpsPlugin_upload).call(this, store, { issueNewToken: false, context, stage: "start" });
+        await __classPrivateFieldGet(this, _TestOpsPlugin_instances, "m", _TestOpsPlugin_upload).call(this, store, { context, stage: "start" });
         __classPrivateFieldGet(this, _TestOpsPlugin_logger, "f").info(`Allure TestOps Launch: ${__classPrivateFieldGet(this, _TestOpsPlugin_client, "f").launchUrl}`);
     }
     async update(context, store) {
-        if (!__classPrivateFieldGet(this, _TestOpsPlugin_enabled, "f")) {
+        if (!this.enabled) {
             return;
         }
         __classPrivateFieldGet(this, _TestOpsPlugin_logger, "f").verbose("Updating (uploading new results)…");
         await __classPrivateFieldGet(this, _TestOpsPlugin_instances, "m", _TestOpsPlugin_upload).call(this, store, { context, stage: "update" });
     }
     async done(context, store) {
-        if (!__classPrivateFieldGet(this, _TestOpsPlugin_enabled, "f")) {
+        if (!this.enabled) {
             return;
         }
         const allTrs = await store.allTestResults({
             filter: this.options.filter,
-            includeHidden: false,
+            includeRetries: false,
         });
         const worstStatus = getWorstStatus(allTrs.map(({ status }) => status));
         __classPrivateFieldGet(this, _TestOpsPlugin_logger, "f").verbose("Finalizing upload…");
@@ -110,7 +129,7 @@ export class TestOpsPlugin {
         __classPrivateFieldGet(this, _TestOpsPlugin_logger, "f").info(`Upload finished. Allure TestOps Launch: ${__classPrivateFieldGet(this, _TestOpsPlugin_client, "f").launchUrl}`);
     }
     async info(context, store) {
-        if (!__classPrivateFieldGet(this, _TestOpsPlugin_enabled, "f")) {
+        if (!this.enabled) {
             return undefined;
         }
         if (!__classPrivateFieldGet(this, _TestOpsPlugin_client, "f").launchUrl) {
@@ -131,7 +150,7 @@ export class TestOpsPlugin {
         return summary;
     }
 }
-_TestOpsPlugin_logger = new WeakMap(), _TestOpsPlugin_ci = new WeakMap(), _TestOpsPlugin_client = new WeakMap(), _TestOpsPlugin_enabled = new WeakMap(), _TestOpsPlugin_launchName = new WeakMap(), _TestOpsPlugin_launchTags = new WeakMap(), _TestOpsPlugin_uploadedTestResultsIds = new WeakMap(), _TestOpsPlugin_autocloseLaunch = new WeakMap(), _TestOpsPlugin_instances = new WeakSet(), _TestOpsPlugin_uploadQualityGateResults = async function _TestOpsPlugin_uploadQualityGateResults(store) {
+_TestOpsPlugin_logger = new WeakMap(), _TestOpsPlugin_ci = new WeakMap(), _TestOpsPlugin_client = new WeakMap(), _TestOpsPlugin_launchName = new WeakMap(), _TestOpsPlugin_launchTags = new WeakMap(), _TestOpsPlugin_uploadedTestResultsIds = new WeakMap(), _TestOpsPlugin_autocloseLaunch = new WeakMap(), _TestOpsPlugin_instances = new WeakSet(), _TestOpsPlugin_uploadQualityGateResults = async function _TestOpsPlugin_uploadQualityGateResults(store) {
     const results = await store.qualityGateResults();
     const uniqueResults = uniqBy(results.filter(({ success }) => !success), ({ rule, environment }) => `${rule}-${environment}`);
     if (uniqueResults.length === 0) {
@@ -255,7 +274,7 @@ _TestOpsPlugin_logger = new WeakMap(), _TestOpsPlugin_ci = new WeakMap(), _TestO
     }
     __classPrivateFieldGet(this, _TestOpsPlugin_logger, "f").info(`Uploaded ${uploadedCount} ${uploadedCount > 1 ? "test results" : "test result"}`);
 }, _TestOpsPlugin_upload = async function _TestOpsPlugin_upload(store, options = {}) {
-    const { issueNewToken = true, context, stage } = options;
+    const { context, stage } = options;
     const trsToUpload = await __classPrivateFieldGet(this, _TestOpsPlugin_instances, "m", _TestOpsPlugin_trsToUpload).call(this, store);
     if (trsToUpload.length === 0) {
         if (stage == "update") {
@@ -266,10 +285,6 @@ _TestOpsPlugin_logger = new WeakMap(), _TestOpsPlugin_ci = new WeakMap(), _TestO
         }
         return;
     }
-    if (issueNewToken) {
-        __classPrivateFieldGet(this, _TestOpsPlugin_logger, "f").verbose("Issuing new OAuth token");
-        await __classPrivateFieldGet(this, _TestOpsPlugin_client, "f").issueOauthToken();
-    }
     await __classPrivateFieldGet(this, _TestOpsPlugin_client, "f").createSession(env);
     await __classPrivateFieldGet(this, _TestOpsPlugin_instances, "m", _TestOpsPlugin_uploadGlobalAttachments).call(this, store);
     await __classPrivateFieldGet(this, _TestOpsPlugin_instances, "m", _TestOpsPlugin_uploadGlobalErrors).call(this, store);
@@ -289,7 +304,7 @@ _TestOpsPlugin_logger = new WeakMap(), _TestOpsPlugin_ci = new WeakMap(), _TestO
             }
             return filter(tr);
         },
-        includeHidden: false,
+        includeRetries: false,
     });
     return filteredTrs;
 }, _TestOpsPlugin_enrichWithCategories = async function _TestOpsPlugin_enrichWithCategories(store, trs, contextCategories) {
@@ -378,15 +393,8 @@ _TestOpsPlugin_logger = new WeakMap(), _TestOpsPlugin_ci = new WeakMap(), _TestO
         }
     }
 }, _TestOpsPlugin_startUpload = async function _TestOpsPlugin_startUpload() {
-    await __classPrivateFieldGet(this, _TestOpsPlugin_client, "f").issueOauthToken();
     await __classPrivateFieldGet(this, _TestOpsPlugin_client, "f").createLaunch(__classPrivateFieldGet(this, _TestOpsPlugin_launchName, "f"), __classPrivateFieldGet(this, _TestOpsPlugin_launchTags, "f"));
-    if (!this.ciMode) {
-        return;
-    }
     await __classPrivateFieldGet(this, _TestOpsPlugin_client, "f").startUpload(__classPrivateFieldGet(this, _TestOpsPlugin_ci, "f"));
 }, _TestOpsPlugin_stopUpload = async function _TestOpsPlugin_stopUpload(status) {
-    if (!this.ciMode) {
-        return;
-    }
     await __classPrivateFieldGet(this, _TestOpsPlugin_client, "f").stopUpload(__classPrivateFieldGet(this, _TestOpsPlugin_ci, "f"), status);
 };

package/dist/{utils.d.ts → utils/index.d.ts}

@@ -1,6 +1,6 @@
 import type { TestStepResult } from "@allurereport/core-api";
 import { AllureStore } from "@allurereport/plugin-api";
-import type { AttachmentsResolver, FixtureResolver, TestOpsPluginOptions } from "./model.js";
+import type { AttachmentsResolver, FixtureResolver, TestOpsPluginOptions } from "../model.js";
 export declare const unwrapStepsAttachments: (steps: TestStepResult[]) => TestStepResult[];
 export declare const resolvePluginOptions: (options: TestOpsPluginOptions) => Omit<TestOpsPluginOptions, "filter">;
 export declare function attachmentsResolverFactory(store: AllureStore): AttachmentsResolver;

package/dist/{uploadCategory.d.ts → utils/uploadCategory.d.ts}

@@ -1,3 +1,3 @@
 import type { CategoryDefinition } from "@allurereport/core-api";
-import type { TestResultWithCategories, UploadCategory } from "./model.js";
+import type { TestResultWithCategories, UploadCategory } from "../model.js";
 export declare const toUploadCategory: (tr: TestResultWithCategories, contextCategories: CategoryDefinition[]) => UploadCategory | undefined;

package/dist/{uploadCategory.js → utils/uploadCategory.js}

@@ -1,4 +1,4 @@
-import { buildUploadCategoryGrouping, toUploadCategoryFromContext } from "./utils/categories.js";
+import { buildUploadCategoryGrouping, toUploadCategoryFromContext } from "./categories.js";
 export const toUploadCategory = (tr, contextCategories) => {
     const c = tr.categories?.[0];
     if (c?.name) {

package/dist/{uploaderDto.d.ts → utils/uploaderDto.d.ts}

@@ -1,6 +1,6 @@
 import type { AttachmentLink } from "@allurereport/core-api";
-import type { UploadAttachmentDto, UploadFixturesResultsDto, UploadResultsDto, UploadTestFixtureResultDto, UploadTestResultDto } from "./model.js";
-import type { TestOpsFixtureResult, TestOpsPluginTestResult } from "./model.js";
+import type { UploadAttachmentDto, UploadFixturesResultsDto, UploadResultsDto, UploadTestFixtureResultDto, UploadTestResultDto } from "../model.js";
+import type { TestOpsFixtureResult, TestOpsPluginTestResult } from "../model.js";
 export declare const uploadFilenameForLink: (link: AttachmentLink) => string | undefined;
 export declare const toUploadAttachmentDto: (link: AttachmentLink) => UploadAttachmentDto;
 export declare const toUploadTestResultDto: (tr: TestOpsPluginTestResult) => UploadTestResultDto;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-testops",
-  "version": "3.8.2",
+  "version": "3.10.0",
   "description": "Allure Plugin TestOps",
   "keywords": [
     "allure",
@@ -32,10 +32,11 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/ci": "3.8.2",
-    "@allurereport/core-api": "3.8.2",
-    "@allurereport/plugin-api": "3.8.2",
-    "@allurereport/reader-api": "3.8.2",
+    "@allurereport/ci": "3.10.0",
+    "@allurereport/core-api": "3.10.0",
+    "@allurereport/plugin-api": "3.10.0",
+    "@allurereport/reader-api": "3.10.0",
+    "@allurereport/service": "3.10.0",
     "axios": "^1.15.2",
     "form-data": "^4.0.5",
     "lodash-es": "^4.18.1",
@@ -46,13 +47,14 @@
   "devDependencies": {
     "@types/d3-shape": "^3.1.6",
     "@types/lodash-es": "^4",
-    "@types/node": "^20.17.9",
+    "@types/node": "^20",
     "@types/progress": "^2",
-    "@vitest/runner": "^2.1.9",
+    "@vitest/runner": "^2",
     "@vitest/snapshot": "^2.1.9",
-    "allure-vitest": "^3.3.3",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.6.3",
-    "vitest": "^2.1.9"
+    "allure-js-commons": "^3",
+    "allure-vitest": "^3",
+    "rimraf": "^6",
+    "typescript": "^5",
+    "vitest": "^4.1.0"
   }
 }