feat: update scenarios and steps for improved clarity and consistency

Author: daantimmer

cucumber_cpp/acceptance_test/features/test_scenarios.feature

@@ -18,7 +18,5 @@ Feature: Simple feature file
 
   @result:UNDEFINED
   Scenario: A scenario with undefined step
-    Given a given step
-    When a when step
-    Then a missing step
-    Then a then step
+    Given a missing step
+    Then this should be skipped

cucumber_cpp/acceptance_test/steps/Steps.cpp

@@ -50,3 +50,8 @@ GIVEN("a ← tuple\\({float}, {float}, {float}, {float}\\)", (float /* unused */
 {
     // empty
 }
+
+THEN("this should be skipped")
+{
+    FAIL();
+}

cucumber_cpp/acceptance_test/test.bats

@@ -30,7 +30,7 @@ teardown() {
     run .build/Host/cucumber_cpp/acceptance_test/Debug/cucumber_cpp.acceptance_test run --tag "@result:UNDEFINED" --feature cucumber_cpp/acceptance_test/features --report console
     assert_failure
     assert_output --partial "undefined \"cucumber_cpp/acceptance_test/features/test_scenarios.feature\""
-    assert_output --partial "skipped Then a then step"
+    assert_output --partial "skipped Then this should be skipped"
 }
 
 @test "No tests" {
@@ -127,7 +127,7 @@ teardown() {
     run .build/Host/cucumber_cpp/acceptance_test/Debug/cucumber_cpp.acceptance_test run --feature cucumber_cpp/acceptance_test/features --tag "@result:UNDEFINED" --report console --dry
     assert_failure
     assert_output --partial "undefined \"cucumber_cpp/acceptance_test/features/test_scenarios.feature\""
-    assert_output --partial "skipped Then a then step"
+    assert_output --partial "skipped Then this should be skipped"
 }
 
 @test "Test the and keyword" {

cucumber_cpp/library/test/TestSteps.cpp

@@ -25,30 +25,10 @@ namespace cucumber_cpp::library
 
     TEST_F(TestSteps, GetGivenStep)
     {
-        const auto matches = stepRegistry.Query("This is a GIVEN step");
-
-        EXPECT_THAT(matches.stepRegexStr, testing::StrEq("^This is a GIVEN step$"));
-    }
-
-    TEST_F(TestSteps, GetWhenStep)
-    {
-        const auto matches = stepRegistry.Query("This is a WHEN step");
-
-        EXPECT_THAT(matches.stepRegexStr, testing::StrEq("^This is a WHEN step$"));
-    }
-
-    TEST_F(TestSteps, GetThenStep)
-    {
-        const auto matches = stepRegistry.Query("This is a THEN step");
-
-        EXPECT_THAT(matches.stepRegexStr, testing::StrEq("^This is a THEN step$"));
-    }
-
-    TEST_F(TestSteps, GetAnyStep)
-    {
-        const auto matches = stepRegistry.Query("This is a STEP step");
-
-        EXPECT_THAT(matches.stepRegexStr, testing::StrEq("^This is a STEP step$"));
+        EXPECT_THAT(stepRegistry.Query("This is a GIVEN step").stepRegexStr, testing::StrEq("^This is a GIVEN step$"));
+        EXPECT_THAT(stepRegistry.Query("This is a WHEN step").stepRegexStr, testing::StrEq("^This is a WHEN step$"));
+        EXPECT_THAT(stepRegistry.Query("This is a THEN step").stepRegexStr, testing::StrEq("^This is a THEN step$"));
+        EXPECT_THAT(stepRegistry.Query("This is a STEP step").stepRegexStr, testing::StrEq("^This is a STEP step$"));
     }
 
     TEST_F(TestSteps, GetStepWithMatches)