fix(hooks): changed context to ScenarioContext for BEFORE/AFTER_STEP hook (#175)

daantimmer · web-flow · commit a76cdd47a8fb · 2025-05-03T18:25:20.000Z
fix: correct spelling of ScopedFeatureContext in ContextManager and related files
diff --git a/cucumber_cpp/library/engine/ContextManager.cpp b/cucumber_cpp/library/engine/ContextManager.cpp
@@ -77,11 +77,11 @@ namespace cucumber_cpp::library::engine
     {
     }
 
-    ContextManager::ScopedFeautureContext::ScopedFeautureContext(ContextManager& contextManager)
+    ContextManager::ScopedFeatureContext::ScopedFeatureContext(ContextManager& contextManager)
         : contextManager{ contextManager }
     {}
 
-    ContextManager::ScopedFeautureContext ::~ScopedFeautureContext()
+    ContextManager::ScopedFeatureContext::~ScopedFeatureContext()
     {
         contextManager.DisposeFeatureContext();
     }
@@ -90,7 +90,7 @@ namespace cucumber_cpp::library::engine
         : contextManager{ contextManager }
     {}
 
-    ContextManager::ScopedRuleContext ::~ScopedRuleContext()
+    ContextManager::ScopedRuleContext::~ScopedRuleContext()
     {
         contextManager.DisposeRuleContext();
     }
@@ -99,7 +99,7 @@ namespace cucumber_cpp::library::engine
         : contextManager{ contextManager }
     {}
 
-    ContextManager::ScopedScenarioContext ::~ScopedScenarioContext()
+    ContextManager::ScopedScenarioContext::~ScopedScenarioContext()
     {
         contextManager.DisposeScenarioContext();
     }
@@ -129,12 +129,12 @@ namespace cucumber_cpp::library::engine
         return *programContext;
     }
 
-    ContextManager::ScopedFeautureContext ContextManager::CreateFeatureContext(const FeatureInfo& featureInfo)
+    ContextManager::ScopedFeatureContext ContextManager::CreateFeatureContext(const FeatureInfo& featureInfo)
     {
         featureContext = std::make_shared<decltype(featureContext)::element_type>(*programContext, featureInfo);
         runnerContext.push(featureContext);
 
-        return ScopedFeautureContext{ *this };
+        return ScopedFeatureContext{ *this };
     }
 
     void ContextManager::DisposeFeatureContext()
diff --git a/cucumber_cpp/library/engine/ContextManager.hpp b/cucumber_cpp/library/engine/ContextManager.hpp
@@ -74,12 +74,12 @@ namespace cucumber_cpp::library::engine
         cucumber_cpp::library::engine::ProgramContext& ProgramContext();
         [[nodiscard]] cucumber_cpp::library::engine::ProgramContext& ProgramContext() const;
 
-        struct ScopedFeautureContext;
+        struct ScopedFeatureContext;
         struct ScopedRuleContext;
         struct ScopedScenarioContext;
         struct ScopedStepContext;
 
-        [[nodiscard]] ScopedFeautureContext CreateFeatureContext(const FeatureInfo& featureInfo);
+        [[nodiscard]] ScopedFeatureContext CreateFeatureContext(const FeatureInfo& featureInfo);
         cucumber_cpp::library::engine::FeatureContext& FeatureContext();
 
         [[nodiscard]] ScopedRuleContext CreateRuleContext(const RuleInfo& ruleInfo);
@@ -109,10 +109,10 @@ namespace cucumber_cpp::library::engine
         std::stack<std::shared_ptr<cucumber_cpp::library::engine::StepContext>> stepContext;
     };
 
-    struct ContextManager::ScopedFeautureContext : library::util::Immoveable
+    struct ContextManager::ScopedFeatureContext : library::util::Immoveable
     {
-        explicit ScopedFeautureContext(ContextManager& contextManager);
-        ~ScopedFeautureContext();
+        explicit ScopedFeatureContext(ContextManager& contextManager);
+        ~ScopedFeatureContext();
 
     private:
         ContextManager& contextManager;
diff --git a/cucumber_cpp/library/engine/HookExecutor.cpp b/cucumber_cpp/library/engine/HookExecutor.cpp
@@ -64,7 +64,7 @@ namespace cucumber_cpp::library::engine
     {}
 
     HookExecutor::StepScope::StepScope(cucumber_cpp::library::engine::ContextManager& contextManager)
-        : ScopedHook{ contextManager.StepContext(), stepHooks, contextManager.ScenarioContext().info.Tags() }
+        : ScopedHook{ contextManager.ScenarioContext(), stepHooks, contextManager.ScenarioContext().info.Tags() }
     {}
 
     HookExecutorImpl::HookExecutorImpl(cucumber_cpp::library::engine::ContextManager& contextManager)
diff --git a/cucumber_cpp/library/engine/TestExecution.hpp b/cucumber_cpp/library/engine/TestExecution.hpp
@@ -51,7 +51,7 @@ namespace cucumber_cpp::library::engine
         FeatureScope(cucumber_cpp::library::engine::ContextManager& contextManager, report::ReportForwarder& reportHandler, HookExecutor& hookExecution, const cucumber_cpp::library::engine::FeatureInfo& featureInfo);
 
     private:
-        cucumber_cpp::library::engine::ContextManager::ScopedFeautureContext scopedFeatureContext;
+        cucumber_cpp::library::engine::ContextManager::ScopedFeatureContext scopedFeatureContext;
         report::ReportForwarder::FeatureScope scopedFeatureReport;
         HookExecutor::FeatureScope scopedFeatureHook;
     };
diff --git a/cucumber_cpp/library/engine/test/TestHookExecutor.cpp b/cucumber_cpp/library/engine/test/TestHookExecutor.cpp
@@ -52,13 +52,13 @@ namespace cucumber_cpp::library::engine
 
     TEST_F(TestHookExecutor, ExecuteBeforeStep)
     {
-        ASSERT_FALSE(contextManagerInstance.StepContext().Contains("hookBeforeStep"));
-        ASSERT_FALSE(contextManagerInstance.StepContext().Contains("hookAfterStep"));
+        ASSERT_FALSE(contextManagerInstance.ScenarioContext().Contains("hookBeforeStep"));
+        ASSERT_FALSE(contextManagerInstance.ScenarioContext().Contains("hookAfterStep"));
 
         {
             auto scope = hookExecutor.StepStart();
-            EXPECT_TRUE(contextManagerInstance.StepContext().Contains("hookBeforeStep"));
+            EXPECT_TRUE(contextManagerInstance.ScenarioContext().Contains("hookBeforeStep"));
         }
-        EXPECT_TRUE(contextManagerInstance.StepContext().Contains("hookAfterStep"));
+        EXPECT_TRUE(contextManagerInstance.ScenarioContext().Contains("hookAfterStep"));
     }
 }
diff --git a/cucumber_cpp/library/engine/test_helper/ContextManagerInstance.hpp b/cucumber_cpp/library/engine/test_helper/ContextManagerInstance.hpp
@@ -22,10 +22,6 @@ namespace cucumber_cpp::library::engine::test_helper
     {
         ContextManagerInstance()
             : cucumber_cpp::library::engine::ContextManager{ contextStorageFactory }
-            , featureContextScope{ CreateFeatureContext(feature) }
-            , ruleContextScope{ CreateRuleContext(rule) }
-            , scenarioContextScope{ CreateScenarioContext(scenario) }
-            , stepContextScope{ CreateStepContext(step) }
         {
         }
 
@@ -35,10 +31,10 @@ namespace cucumber_cpp::library::engine::test_helper
         cucumber_cpp::library::engine::ScenarioInfo scenario{ rule, {}, {}, {}, {}, {} };
         cucumber_cpp::library::engine::StepInfo step{ scenario, {}, {}, {}, {}, {} };
 
-        ContextManager::ScopedFeautureContext featureContextScope;
-        ContextManager::ScopedRuleContext ruleContextScope;
-        ContextManager::ScopedScenarioContext scenarioContextScope;
-        ContextManager::ScopedStepContext stepContextScope;
+        ContextManager::ScopedFeatureContext featureContextScope{ CreateFeatureContext(feature) };
+        ContextManager::ScopedRuleContext ruleContextScope{ CreateRuleContext(rule) };
+        ContextManager::ScopedScenarioContext scenarioContextScope{ CreateScenarioContext(scenario) };
+        ContextManager::ScopedStepContext stepContextScope{ CreateStepContext(step) };
     };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,11 @@ namespace cucumber_cpp::library::engine`
`77`	`77`	`{`
`78`	`78`	`}`
`79`	`79`
`80`		`- ContextManager::ScopedFeautureContext::ScopedFeautureContext(ContextManager& contextManager)`
	`80`	`+ ContextManager::ScopedFeatureContext::ScopedFeatureContext(ContextManager& contextManager)`
`81`	`81`	`: contextManager{ contextManager }`
`82`	`82`	`{}`
`83`	`83`
`84`		`- ContextManager::ScopedFeautureContext ::~ScopedFeautureContext()`
	`84`	`+ ContextManager::ScopedFeatureContext::~ScopedFeatureContext()`
`85`	`85`	`{`
`86`	`86`	`contextManager.DisposeFeatureContext();`
`87`	`87`	`}`
`@@ -90,7 +90,7 @@ namespace cucumber_cpp::library::engine`
`90`	`90`	`: contextManager{ contextManager }`
`91`	`91`	`{}`
`92`	`92`
`93`		`- ContextManager::ScopedRuleContext ::~ScopedRuleContext()`
	`93`	`+ ContextManager::ScopedRuleContext::~ScopedRuleContext()`
`94`	`94`	`{`
`95`	`95`	`contextManager.DisposeRuleContext();`
`96`	`96`	`}`
`@@ -99,7 +99,7 @@ namespace cucumber_cpp::library::engine`
`99`	`99`	`: contextManager{ contextManager }`
`100`	`100`	`{}`
`101`	`101`
`102`		`- ContextManager::ScopedScenarioContext ::~ScopedScenarioContext()`
	`102`	`+ ContextManager::ScopedScenarioContext::~ScopedScenarioContext()`
`103`	`103`	`{`
`104`	`104`	`contextManager.DisposeScenarioContext();`
`105`	`105`	`}`
`@@ -129,12 +129,12 @@ namespace cucumber_cpp::library::engine`
`129`	`129`	`return *programContext;`
`130`	`130`	`}`
`131`	`131`
`132`		`- ContextManager::ScopedFeautureContext ContextManager::CreateFeatureContext(const FeatureInfo& featureInfo)`
	`132`	`+ ContextManager::ScopedFeatureContext ContextManager::CreateFeatureContext(const FeatureInfo& featureInfo)`
`133`	`133`	`{`
`134`	`134`	`featureContext = std::make_shared<decltype(featureContext)::element_type>(*programContext, featureInfo);`
`135`	`135`	`runnerContext.push(featureContext);`
`136`	`136`
`137`		`- return ScopedFeautureContext{ *this };`
	`137`	`+ return ScopedFeatureContext{ *this };`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`void ContextManager::DisposeFeatureContext()`
Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,13 @@ namespace cucumber_cpp::library::engine`
`52`	`52`
`53`	`53`	`TEST_F(TestHookExecutor, ExecuteBeforeStep)`
`54`	`54`	`{`
`55`		`- ASSERT_FALSE(contextManagerInstance.StepContext().Contains("hookBeforeStep"));`
`56`		`- ASSERT_FALSE(contextManagerInstance.StepContext().Contains("hookAfterStep"));`
	`55`	`+ ASSERT_FALSE(contextManagerInstance.ScenarioContext().Contains("hookBeforeStep"));`
	`56`	`+ ASSERT_FALSE(contextManagerInstance.ScenarioContext().Contains("hookAfterStep"));`
`57`	`57`
`58`	`58`	`{`
`59`	`59`	`auto scope = hookExecutor.StepStart();`
`60`		`- EXPECT_TRUE(contextManagerInstance.StepContext().Contains("hookBeforeStep"));`
	`60`	`+ EXPECT_TRUE(contextManagerInstance.ScenarioContext().Contains("hookBeforeStep"));`
`61`	`61`	`}`
`62`		`- EXPECT_TRUE(contextManagerInstance.StepContext().Contains("hookAfterStep"));`
	`62`	`+ EXPECT_TRUE(contextManagerInstance.ScenarioContext().Contains("hookAfterStep"));`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,6 @@ namespace cucumber_cpp::library::engine::test_helper`
`22`	`22`	`{`
`23`	`23`	`ContextManagerInstance()`
`24`	`24`	`: cucumber_cpp::library::engine::ContextManager{ contextStorageFactory }`
`25`		`- , featureContextScope{ CreateFeatureContext(feature) }`
`26`		`- , ruleContextScope{ CreateRuleContext(rule) }`
`27`		`- , scenarioContextScope{ CreateScenarioContext(scenario) }`
`28`		`- , stepContextScope{ CreateStepContext(step) }`
`29`	`25`	`{`
`30`	`26`	`}`
`31`	`27`
`@@ -35,10 +31,10 @@ namespace cucumber_cpp::library::engine::test_helper`
`35`	`31`	`cucumber_cpp::library::engine::ScenarioInfo scenario{ rule, {}, {}, {}, {}, {} };`
`36`	`32`	`cucumber_cpp::library::engine::StepInfo step{ scenario, {}, {}, {}, {}, {} };`
`37`	`33`
`38`		`- ContextManager::ScopedFeautureContext featureContextScope;`
`39`		`- ContextManager::ScopedRuleContext ruleContextScope;`
`40`		`- ContextManager::ScopedScenarioContext scenarioContextScope;`
`41`		`- ContextManager::ScopedStepContext stepContextScope;`
	`34`	`+ ContextManager::ScopedFeatureContext featureContextScope{ CreateFeatureContext(feature) };`
	`35`	`+ ContextManager::ScopedRuleContext ruleContextScope{ CreateRuleContext(rule) };`
	`36`	`+ ContextManager::ScopedScenarioContext scenarioContextScope{ CreateScenarioContext(scenario) };`
	`37`	`+ ContextManager::ScopedStepContext stepContextScope{ CreateStepContext(step) };`
`42`	`38`	`};`
`43`	`39`	`}`
`44`	`40`