one more attempt

allure-framework · Aug 16, 2024 · 13977df · 13977df
1 parent d893342
commit 13977df
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/packages/allure-cypress/test/utils.ts b/packages/allure-cypress/test/utils.ts
@@ -5,10 +5,11 @@ import { dirname, join, relative, resolve as resolvePath } from "node:path";
 import type { TestResult, TestResultContainer } from "allure-js-commons";
 import { ContentType, attachment, step } from "allure-js-commons";
 import type { AllureResults, EnvironmentInfo } from "allure-js-commons/sdk";
-import { parseProperties } from "allure-js-commons/sdk/reporter";
+import { getPosixPath, parseProperties } from "allure-js-commons/sdk/reporter";
 
 type CypressModulesPaths = {
   allureCommonsModulePath: string;
+  allureCypressModulePath: string;
   allureCypressReporterModulePath: string;
 };
 
@@ -31,14 +32,12 @@ export const runCypressInlineTest = async (
     timestamps: new Map(),
   };
   const testDir = join(__dirname, "fixtures", randomUUID());
-  const allureCommonsModulePath = require.resolve("allure-js-commons");
-  const allureCypressModulePath = require.resolve("allure-cypress");
-  const allureCypressReporterModulePath = require.resolve("allure-cypress/reporter");
+
   const testFilesToWrite: CypressTestFiles = {
-    "cypress/support/e2e.js": () => `
+    "cypress/support/e2e.js": ({ allureCypressModulePath }) => `
       require("${allureCypressModulePath}");
     `,
-    "cypress.config.js": () => `
+    "cypress.config.js": ({ allureCypressReporterModulePath }) => `
       const { allureCypress } = require("${allureCypressReporterModulePath}");
 
       module.exports = {
@@ -66,13 +65,18 @@ export const runCypressInlineTest = async (
   };
 
   await step("Prepare files", async () => {
+    const allureCommonsModulePath = require.resolve("allure-js-commons");
+    const allureCypressModulePath = require.resolve("allure-cypress");
+    const allureCypressReporterModulePath = require.resolve("allure-cypress/reporter");
+
     // eslint-disable-next-line guard-for-in
     for (const testFile in testFilesToWrite) {
       const fileDir = dirname(join(testDir, testFile));
       await mkdir(fileDir, { recursive: true });
       const content = testFilesToWrite[testFile]({
-        allureCommonsModulePath: relative(fileDir, allureCommonsModulePath),
-        allureCypressReporterModulePath,
+        allureCommonsModulePath: getPosixPath(relative(fileDir, allureCommonsModulePath)),
+        allureCypressModulePath: getPosixPath(relative(fileDir, allureCypressModulePath)),
+        allureCypressReporterModulePath: getPosixPath(relative(fileDir, allureCypressReporterModulePath)),
       });
       await writeFile(join(testDir, testFile), content, "utf8");
       await attachment(testFile, content, ContentType.TEXT);