Support for Reqnroll v2.4.1 (#587)

egorshulga · web-flow · commit 5d52a2ae8340 · 2025-09-26T00:01:23.000+07:00
diff --git a/Allure.Reqnroll.Tests.Samples/Allure.Reqnroll.Tests.Samples.csproj b/Allure.Reqnroll.Tests.Samples/Allure.Reqnroll.Tests.Samples.csproj
@@ -15,9 +15,9 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
         <PackageReference Include="Castle.Core" Version="5.1.1" />
-        <PackageReference Include="Reqnroll" Version="2.0.3" />
-        <PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="2.0.3" />
-        <PackageReference Include="Reqnroll.xUnit" Version="2.0.3" />
+        <PackageReference Include="Reqnroll" Version="2.4.1" />
+        <PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="2.4.1" />
+        <PackageReference Include="Reqnroll.xUnit" Version="2.4.1" />
         <PackageReference Include="xunit" Version="2.9.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <PrivateAssets>all</PrivateAssets>
diff --git a/Allure.Reqnroll/Allure.Reqnroll.csproj b/Allure.Reqnroll/Allure.Reqnroll.csproj
@@ -21,7 +21,7 @@
 
     <ItemGroup>
         <PackageReference Include="CsvHelper" Version="33.0.1" />
-        <PackageReference Include="Reqnroll" Version="2.0.0" />
+        <PackageReference Include="Reqnroll" Version="2.4.1" />
         <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
     </ItemGroup>
 
diff --git a/Allure.Reqnroll/Events/HookFinishedEventHandler.cs b/Allure.Reqnroll/Events/HookFinishedEventHandler.cs
@@ -77,7 +77,6 @@ void EnsureFixtureErrorReported(HookFinishedEvent eventData)
         if (error is not null)
         {
             this.ReportHookFailure(eventData);
-            this.EnsureScenarioReported(eventData);
         }
     }
 
@@ -114,10 +113,6 @@ void EnsureFeatureReported(HookFinishedEvent eventData)
                 eventData.FeatureContext.FeatureInfo,
                 eventData.HookException
             );
-
-            // Reqnroll doesn't fire FeatureFinishedEvent if an AfterFeature
-            // hook fails. We need to emit feature files here instead.
-            AllureReqnrollStateFacade.EmitFeatureFiles();
         }
     }
 
@@ -152,18 +147,6 @@ void ReportHookFailure(HookFinishedEvent eventData)
         }
     }
 
-    void EnsureScenarioReported(HookFinishedEvent eventData)
-    {
-        if (eventData.HookType is HookType.AfterScenario)
-        {
-            // Reqnroll doesn't fire ScenarioFinishedEvent if an AfterScenario
-            // hook fails. We need to emit scenario files here instead.
-            AllureReqnrollStateFacade.EmitScenarioFiles(
-                eventData.ScenarioContext
-            );
-        }
-    }
-
     static bool IsThrownFromHook(StateSnapshot? snapshot, Exception error) =>
         snapshot is not null
             && ExceptionFunctions.IsFromHookMethod(error, snapshot.Origin);

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ void EnsureFixtureErrorReported(HookFinishedEvent eventData)`
`77`	`77`	`if (error is not null)`
`78`	`78`	`{`
`79`	`79`	`this.ReportHookFailure(eventData);`
`80`		`- this.EnsureScenarioReported(eventData);`
`81`	`80`	`}`
`82`	`81`	`}`
`83`	`82`
`@@ -114,10 +113,6 @@ void EnsureFeatureReported(HookFinishedEvent eventData)`
`114`	`113`	`eventData.FeatureContext.FeatureInfo,`
`115`	`114`	`eventData.HookException`
`116`	`115`	`);`
`117`		`-`
`118`		`- // Reqnroll doesn't fire FeatureFinishedEvent if an AfterFeature`
`119`		`- // hook fails. We need to emit feature files here instead.`
`120`		`- AllureReqnrollStateFacade.EmitFeatureFiles();`
`121`	`116`	`}`
`122`	`117`	`}`
`123`	`118`
`@@ -152,18 +147,6 @@ void ReportHookFailure(HookFinishedEvent eventData)`
`152`	`147`	`}`
`153`	`148`	`}`
`154`	`149`
`155`		`- void EnsureScenarioReported(HookFinishedEvent eventData)`
`156`		`- {`
`157`		`- if (eventData.HookType is HookType.AfterScenario)`
`158`		`- {`
`159`		`- // Reqnroll doesn't fire ScenarioFinishedEvent if an AfterScenario`
`160`		`- // hook fails. We need to emit scenario files here instead.`
`161`		`- AllureReqnrollStateFacade.EmitScenarioFiles(`
`162`		`- eventData.ScenarioContext`
`163`		`- );`
`164`		`- }`
`165`		`- }`
`166`		`-`
`167`	`150`	`static bool IsThrownFromHook(StateSnapshot? snapshot, Exception error) =>`
`168`	`151`	`snapshot is not null`
`169`	`152`	`&& ExceptionFunctions.IsFromHookMethod(error, snapshot.Origin);`