add fallback mechanism for source locations

e2e/jest.config.js

@@ -63,6 +63,7 @@ module.exports = {
   transform: {
     '^.+\\.coffee$': path.join(__dirname, 'coffee-transformer.js'),
   },
-  testEnvironment: 'jest-allure2-reporter/environment-node',
+  setupFilesAfterEnv: process.env.JEST_ENVIRONMENT ? ['<rootDir>/setup.js'] : [],
+  testEnvironment: process.env.JEST_ENVIRONMENT ?? 'jest-allure2-reporter/environment-node',
   testMatch: ['<rootDir>/tests/**/*.js', '<rootDir>/tests/**/*.ts', '<rootDir>/tests/**/*.coffee'],
 };

e2e/presets/code-snippets.js

@@ -1,8 +1,9 @@
 const path = require('node:path');
 
-const description = async ({ $, testCaseMetadata }) => {
-  const text = testCaseMetadata.description?.join('\n\n') ?? '';
-  const codes = await $.extractSourceCode(testCaseMetadata, true);
+const description = async ({ $, testRunMetadata, testFileMetadata, testCaseMetadata }) => {
+  const metadata = testCaseMetadata ?? testFileMetadata ?? testRunMetadata;
+  const text = metadata.description?.join('\n\n') ?? '';
+  const codes = await $.extractSourceCode(metadata, true);
   const snippets = codes.map($.source2markdown);
   return [text, ...snippets].filter(t => t != null).join('\n\n');
 };

e2e/presets/remark.js

@@ -1,6 +1,8 @@
-const descriptionHtml = async ({ $, result }) => {
+const descriptionHtml = async ({ $, value, result }) => {
   const description = await result.description;
-  return description ? $.markdown2html(description) : '';
+  const html = await value;
+  const markdown = description ? await $.markdown2html(description) : '';
+  return [html, markdown].filter(Boolean).join('\n\n');
 };
 
 /** @type {import('jest-allure2-reporter').ReporterOptions} */

e2e/setup.js

@@ -0,0 +1,2 @@
+Object.assign(global, require('jest-allure2-reporter/api'));
+delete global.default;

src/reporter/JestAllure2Reporter.ts

@@ -136,7 +136,7 @@ export class JestAllure2Reporter extends JestMetadataReporter {
       JestAllure2Reporter.query.testCaseResult(testCaseResult).lastInvocation!,
     );
 
-    fallbacks.onTestCaseResult(testCaseMetadata);
+    fallbacks.onTestCaseResult(test, testCaseResult, testCaseMetadata);
   }
 
   async onTestFileResult(test: Test, testResult: TestResult, aggregatedResult: AggregatedResult) {

src/reporter/fallbacks.ts

@@ -1,4 +1,4 @@
-import type { Test } from '@jest/reporters';
+import type { Test, TestCaseResult } from '@jest/reporters';
 import type { AllureTestItemMetadata, AllureTestFileMetadata } from 'jest-allure2-reporter';
 
 import type { AllureMetadataProxy } from '../metadata';
@@ -7,7 +7,7 @@ import { ThreadService } from './ThreadService';
 
 const threadService = new ThreadService();
 
-export async function onTestFileStart(
+export function onTestFileStart(
   test: Test,
   testFileMetadata: AllureMetadataProxy<AllureTestFileMetadata>,
 ) {
@@ -21,16 +21,24 @@ export async function onTestFileStart(
     .push('labels', [{ name: 'thread', value: String(1 + threadId).padStart(2, '0') }]);
 }
 
-export async function onTestCaseResult(
+export function onTestCaseResult(
+  test: Test,
+  testCase: TestCaseResult,
   testCaseMetadata: AllureMetadataProxy<AllureTestItemMetadata>,
 ) {
-  const stop = testCaseMetadata.get('stop') ?? Number.NaN;
-  if (Number.isNaN(stop)) {
-    testCaseMetadata.set('stop', Date.now());
-  }
+  testCaseMetadata.defaults({
+    sourceLocation: testCase.location
+      ? {
+          fileName: test.path,
+          lineNumber: testCase.location.line,
+          columnNumber: testCase.location.column + 1,
+        }
+      : undefined,
+    stop: Date.now(),
+  });
 }
 
-export async function onTestFileResult(
+export function onTestFileResult(
   test: Test,
   testFileMetadata: AllureMetadataProxy<AllureTestFileMetadata>,
 ) {

src/reporter/postProcessMetadata.ts

@@ -19,11 +19,18 @@ export async function postProcessMetadata(
   }
 
   const allDescribeBlocks = [...testFile.allDescribeBlocks()];
-  const allHooks = allDescribeBlocks.flatMap((describeBlock) => [
+  const allHookDefinitions = allDescribeBlocks.flatMap((describeBlock) => [
     ...describeBlock.hookDefinitions(),
   ]);
 
-  const batch = [testFile, ...allDescribeBlocks, ...allHooks, ...testFile.allTestEntries()];
+  const batch = [
+    testFile,
+    ...allDescribeBlocks,
+    ...allHookDefinitions,
+    ...testFile.allTestEntries(),
+    ...testFile.allTestInvocations(),
+    ...testFile.allInvocations(),
+  ];
 
   await Promise.all(
     batch.map(async (metadata) => {