fix jasmine full name generation

allure-framework · Aug 19, 2024 · bb53688 · bb53688
1 parent d45c0d9
commit bb53688
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/allure-jasmine/src/testplan.ts b/packages/allure-jasmine/src/testplan.ts
@@ -65,7 +65,7 @@ const getIndexedTestPlan = (): TestPlanIndex | undefined => {
   }
 };
 
-const isInTestPlan = (testplan: TestPlanIndex | undefined, fullName: string, labels: readonly Label[]) => {
+const isInTestPlan = (testplan: TestPlanIndex | undefined, fullName: string | undefined, labels: readonly Label[]) => {
   if (testplan && !testplan.fullNames.has(fullName)) {
     const allureId = labels.find((l) => l.name === LabelName.ALLURE_ID)?.value;
     return allureId && testplan.ids.has(allureId);

diff --git a/packages/allure-jasmine/src/utils.ts b/packages/allure-jasmine/src/utils.ts
@@ -1,5 +1,6 @@
-import { cwd } from "node:process";
 import { extractMetadataFromString } from "allure-js-commons/sdk";
+import { getRelativePath } from "allure-js-commons/sdk/reporter";
+import { getPosixPath } from "allure-js-commons/sdk/reporter";
 
 import FailedExpectation = jasmine.FailedExpectation;
 
@@ -22,13 +23,13 @@ export const getAllureNamesAndLabels = (
   suites: readonly string[],
   rawSpecName: string,
 ) => {
-  const filePart = (filename || "").replace(cwd(), "").replace(/^[/\\]/, "");
+  const filePart = filename ? getPosixPath(getRelativePath(filename)) : undefined;
   const { cleanTitle: specName, labels } = extractMetadataFromString(rawSpecName);
   const specPart = [...suites, specName].join(" > ");
 
   return {
     name: specName,
-    fullName: `${filePart}#${specPart}`,
+    fullName: filePart ? `${filePart}#${specPart}` : undefined,
     labels,
   };
 };