From c41f1d5e7bf1c3355326af1b15e30785d0539c06 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Tue, 20 Feb 2024 09:51:24 +0100
Subject: [PATCH] TASK: Remove generic
 `theEventWasPublishedToStreamWithPayload` in tests

Related: #4336
---
 .../ForkContentStreamWithoutDimensions.feature         |  6 +++---
 .../Features/StructureAdjustment/Properties.feature    |  2 +-
 .../GenericCommandExecutionAndEventPublication.php     | 10 ----------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/ContentStreamForking/ForkContentStreamWithoutDimensions.feature b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/ContentStreamForking/ForkContentStreamWithoutDimensions.feature
index 93c328df0fc..77bb43da3c4 100644
--- a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/ContentStreamForking/ForkContentStreamWithoutDimensions.feature
+++ b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/ContentStreamForking/ForkContentStreamWithoutDimensions.feature
@@ -39,7 +39,7 @@ Feature: ForkContentStream Without Dimensions
       | parentNodeAggregateId       | "lady-eleonode-rootford"                 |
       | nodeName                    | "child"                                  |
       | nodeAggregateClassification | "regular"                                |
-    And the Event "NodePropertiesWereSet" was published to stream "ContentStream:cs-identifier" with payload:
+    And the event NodePropertiesWereSet was published with payload:
       | Key                          | Value                                                   |
       | contentStreamId              | "cs-identifier"                                         |
       | nodeAggregateId              | "nody-mc-nodeface"                                      |
@@ -62,7 +62,7 @@ Feature: ForkContentStream Without Dimensions
       | Key                   | Value                |
       | contentStreamId       | "user-cs-identifier" |
       | sourceContentStreamId | "cs-identifier"      |
-    And the Event "NodePropertiesWereSet" was published to stream "ContentStream:user-cs-identifier" with payload:
+    And the event NodePropertiesWereSet was published with payload:
       | Key                          | Value                                                   |
       | contentStreamId              | "user-cs-identifier"                                    |
       | nodeAggregateId              | "nody-mc-nodeface"                                      |
@@ -91,7 +91,7 @@ Feature: ForkContentStream Without Dimensions
       | Key                   | Value                |
       | contentStreamId       | "user-cs-identifier" |
       | sourceContentStreamId | "cs-identifier"      |
-    And the Event "NodePropertiesWereSet" was published to stream "ContentStream:cs-identifier" with payload:
+    And the event NodePropertiesWereSet was published with payload:
       | Key                          | Value                                                   |
       | contentStreamId              | "cs-identifier"                                         |
       | nodeAggregateId              | "nody-mc-nodeface"                                      |
diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/StructureAdjustment/Properties.feature b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/StructureAdjustment/Properties.feature
index 19aed834eae..aa377e82ecf 100644
--- a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/StructureAdjustment/Properties.feature
+++ b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/StructureAdjustment/Properties.feature
@@ -119,7 +119,7 @@ Feature: Properties
           type: string
     """
 
-    And the Event "NodePropertiesWereSet" was published to stream "ContentStream:cs-identifier" with payload:
+    And the event NodePropertiesWereSet was published with payload:
       | Key                          | Value                                                                       |
       | contentStreamId              | "cs-identifier"                                                             |
       | nodeAggregateId              | "sir-david-nodenborough"                                                    |
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php
index df2a0c56aa1..d0ce2e32de6 100644
--- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php
+++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php
@@ -116,16 +116,6 @@ protected static function resolveShortCommandName(string $shortCommandName): str
         };
     }
 
-    /**
-     * @Given /^the Event "([^"]*)" was published to stream "([^"]*)" with payload:$/
-     * @throws \Exception
-     */
-    public function theEventWasPublishedToStreamWithPayload(string $eventType, string $streamName, TableNode $payloadTable): void
-    {
-        $eventPayload = $this->readPayloadTable($payloadTable);
-        $this->publishEvent($eventType, StreamName::fromString($streamName), $eventPayload);
-    }
-
     /**
      * @throws \Exception
      * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface