@allurereport/plugin-jira 3.18.0 → 3.19.0

package/dist/helpers.d.ts

@@ -2,7 +2,7 @@ import { type TestResult } from "@allurereport/core-api";
 import { type ForgePluginTestResult } from "./types.js";
 export declare const isJiraIssueKey: (issue: string) => boolean;
 export declare const findJiraLink: (tr: TestResult) => import("@allurereport/core-api").TestLink | undefined;
-export declare const prepareTestResults: (trs: TestResult[]) => ForgePluginTestResult[];
+export declare const prepareTestResults: (trs: TestResult[], environmentNames?: ReadonlyMap<string, string>) => ForgePluginTestResult[];
 export declare const trimName: (name: string) => string;
 export declare const trimParameters: (p: string) => string;
 export declare const trimCiInfoLabel: (label: string) => string;

package/dist/helpers.js

@@ -1,4 +1,4 @@
-import { DEFAULT_ENVIRONMENT } from "@allurereport/core-api";
+import { DEFAULT_ENVIRONMENT, calculateRetryHash } from "@allurereport/core-api";
 const isJiraUrl = (url) => {
     const jiraPattern = /^https:\/\/[a-zA-Z0-9-]+\.atlassian\.net\/browse\/[A-Z]+-\d+$/;
     return jiraPattern.test(url);
@@ -41,14 +41,14 @@ const filterOutDefaultEnvironment = (env) => {
     }
     return env;
 };
-export const prepareTestResults = (trs) => {
+export const prepareTestResults = (trs, environmentNames = new Map()) => {
     const trMap = new Map();
     for (const tr of trs) {
         const jiraLink = findJiraLink(tr);
         if (!jiraLink) {
             continue;
         }
-        const trId = tr.historyId ?? tr.id;
+        const trId = calculateRetryHash({ testCaseHash: tr.testCaseHash, parametersHash: tr.parametersHash }) ?? tr.id;
         if (!trMap.has(trId)) {
             trMap.set(trId, {
                 id: trId,
@@ -59,7 +59,12 @@ export const prepareTestResults = (trs) => {
             });
         }
         const storedTr = trMap.get(trId);
-        storedTr.entries.push({ status: tr.status, env: filterOutDefaultEnvironment(tr.environment), date: tr.stop });
+        const environmentId = filterOutDefaultEnvironment(tr.environment);
+        storedTr.entries.push({
+            status: tr.status,
+            env: environmentId ? (environmentNames.get(environmentId) ?? environmentId) : undefined,
+            date: tr.stop,
+        });
         storedTr.keyParams.push(...tr.parameters);
     }
     return Array.from(trMap.values()).map((tr) => {

package/dist/plugin.js

@@ -85,7 +85,8 @@ _JiraPlugin_pluginName = new WeakMap(), _JiraPlugin_instances = new WeakSet(), _
     if (allTestResults.length === 0) {
         throw new Error(`[${__classPrivateFieldGet(this, _JiraPlugin_pluginName, "f")}] no test results found`);
     }
-    const testResults = prepareTestResults(allTestResults);
+    const environments = await store.allEnvironmentIdentities();
+    const testResults = prepareTestResults(allTestResults, new Map(environments.map(({ id, name }) => [id, name])));
     const payload = {
         results: testResults,
         reportUrl: context.reportUrl,
@@ -114,12 +115,12 @@ _JiraPlugin_pluginName = new WeakMap(), _JiraPlugin_instances = new WeakSet(), _
     return "failed";
 }, _JiraPlugin_getStatisticByEnv = async function _JiraPlugin_getStatisticByEnv(store) {
     const statisticByEnv = {};
-    const envs = await store.allEnvironments();
-    for (const env of envs) {
-        if (env === DEFAULT_ENVIRONMENT) {
+    const envs = await store.allEnvironmentIdentities();
+    for (const { id, name } of envs) {
+        if (id === DEFAULT_ENVIRONMENT) {
             continue;
         }
-        statisticByEnv[env] = await store.testsStatistic((tr) => tr.environment === env);
+        statisticByEnv[name] = await store.testsStatistic((tr) => tr.environment === id);
     }
     return statisticByEnv;
 }, _JiraPlugin_getCiInfo = async function _JiraPlugin_getCiInfo(context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-jira",
-  "version": "3.18.0",
+  "version": "3.19.0",
   "description": "Allure Plugin to Report results to Jira",
   "keywords": [
     "allure",
@@ -30,8 +30,8 @@
     "lint:fix": "oxlint --import-plugin --fix src test features stories"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.18.0",
-    "@allurereport/plugin-api": "3.18.0",
+    "@allurereport/core-api": "3.19.0",
+    "@allurereport/plugin-api": "3.19.0",
     "axios": "^1.20.0"
   },
   "devDependencies": {