Update Reqnroll to v3.1.1 and refactor SafeBindingInvoker (#15)

Author: KonstantinosArch

src/ReportPortal.ReqnrollPlugin/ReportPortal.ReqnrollPlugin.csproj

@@ -25,7 +25,7 @@
     <PackageReference Include="ReportPortal.Shared" Version="3.10.0">
       <PrivateAssets>contentfiles;analyzers;</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Reqnroll" Version="3.0.2" />
+    <PackageReference Include="Reqnroll" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>

src/ReportPortal.ReqnrollPlugin/SafeBindingInvoker.cs

@@ -1,7 +1,7 @@
 using Reqnroll;
 using Reqnroll.Bindings;
-using Reqnroll.BoDi;
 using Reqnroll.Configuration;
+using Reqnroll.EnvironmentAccess;
 using Reqnroll.ErrorHandling;
 using Reqnroll.Infrastructure;
 using Reqnroll.Tracing;
@@ -13,8 +13,8 @@ namespace ReportPortal.ReqnrollPlugin
 {
     internal class SafeBindingInvoker : BindingInvoker
     {
-        public SafeBindingInvoker(ReqnrollConfiguration reqnrollConfiguration, IErrorProvider errorProvider, IBindingDelegateInvoker bindingDelegateInvoker, IObjectContainer objectContainer)
-            : base(reqnrollConfiguration, errorProvider, bindingDelegateInvoker, objectContainer)
+        public SafeBindingInvoker(ReqnrollConfiguration reqnrollConfiguration, IErrorProvider errorProvider, IBindingDelegateInvoker bindingDelegateInvoker, IEnvironmentOptions environmentOptions)
+            : base(reqnrollConfiguration, errorProvider, bindingDelegateInvoker, environmentOptions)
         {
         }
 
@@ -37,8 +37,7 @@ public override async Task<object> InvokeBindingAsync(IBinding binding, IContext
 
                 var hookBinding = binding as IHookBinding;
 
-                if (hookBinding.HookType == HookType.BeforeScenario
-                    || hookBinding.HookType == HookType.BeforeScenarioBlock
+                if (hookBinding.HookType == HookType.BeforeScenarioBlock
                     || hookBinding.HookType == HookType.BeforeScenario
                     || hookBinding.HookType == HookType.BeforeStep
                     || hookBinding.HookType == HookType.AfterStep

test/ReportPortal.ReqnrollPlugin.Tests/ReportPortal.ReqnrollPlugin.IntegrationTests.csproj

@@ -12,8 +12,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Reqnroll.NUnit" Version="3.0.2" />
-    <PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="3.0.2" />
+    <PackageReference Include="Reqnroll.NUnit" Version="3.1.1" />
+    <PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>