chore: only execute hooks when there was no failure previously

Author: daantimmer

cucumber_cpp/library/engine/HookExecutor.cpp

@@ -23,28 +23,30 @@ namespace cucumber_cpp::library::engine
 
         void ExecuteHook(cucumber_cpp::library::engine::RunnerContext& runnerContext, HookType hook, const std::set<std::string, std::less<>>& tags)
         {
-            if (runnerContext.InheritedExecutionStatus() == Result::passed)
-                for (const auto& match : HookRegistry::Instance().Query(hook, tags))
-                {
-                    match.factory(runnerContext)->Execute();
+            for (const auto& match : HookRegistry::Instance().Query(hook, tags))
+            {
+                match.factory(runnerContext)->Execute();
 
-                    if (runnerContext.ExecutionStatus() != cucumber_cpp::library::engine::Result::passed)
-                        return;
-                }
+                if (runnerContext.ExecutionStatus() != cucumber_cpp::library::engine::Result::passed)
+                    return;
+            }
         }
     }
 
     HookExecutor::ScopedHook::ScopedHook(cucumber_cpp::library::engine::RunnerContext& runnerContext, HookPair hookPair, const std::set<std::string, std::less<>>& tags)
         : runnerContext{ runnerContext }
         , hookPair{ hookPair }
         , tags{ tags }
+        , executeHooks{ runnerContext.InheritedExecutionStatus() == Result::passed }
     {
-        ExecuteHook(runnerContext, hookPair.before, tags);
+        if (executeHooks)
+            ExecuteHook(runnerContext, hookPair.before, tags);
     }
 
     HookExecutor::ScopedHook::~ScopedHook()
     {
-        ExecuteHook(runnerContext, hookPair.after, tags);
+        if (executeHooks)
+            ExecuteHook(runnerContext, hookPair.after, tags);
     }
 
     HookExecutor::ProgramScope::ProgramScope(cucumber_cpp::library::engine::ContextManager& contextManager)

cucumber_cpp/library/engine/HookExecutor.hpp

@@ -47,6 +47,7 @@ namespace cucumber_cpp::library::engine
         cucumber_cpp::library::engine::RunnerContext& runnerContext;
         HookPair hookPair;
         const std::set<std::string, std::less<>>& tags;
+        bool executeHooks{ true };
     };
 
     struct HookExecutor::ProgramScope : private ScopedHook