TASK: Fix Fusion e3e tests

neos · Nov 2, 2023 · 6e9e6a2 · 6e9e6a2
1 parent f04cefd
commit 6e9e6a2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FusionTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FusionTrait.php
@@ -35,7 +35,6 @@
  */
 trait FusionTrait
 {
-
     use RoutingTrait;
     use ProjectedNodeTrait;
     use CRTestSuiteRuntimeVariables;
@@ -49,6 +48,14 @@ trait FusionTrait
 
     private ?\Throwable $lastRenderingException = null;
 
+    /**
+     * @template T of object
+     * @param class-string<T> $className
+     *
+     * @return T
+     */
+    abstract private function getObject(string $className): object;
+
     /**
      * @BeforeScenario
      */
@@ -94,7 +101,7 @@ public function theFusionContextNodeIs(string $nodeAggregateId): void
      */
     public function theFusionContextRequestIs(string $requestUri = null): void
     {
-        $httpRequest = $this->objectManager->get(ServerRequestFactoryInterface::class)->createServerRequest('GET', $requestUri);
+        $httpRequest = $this->getObject(ServerRequestFactoryInterface::class)->createServerRequest('GET', $requestUri);
         $httpRequest = $this->addRoutingParameters($httpRequest);
 
         $this->fusionGlobalContext['request'] = ActionRequest::fromHttpRequest($httpRequest);
@@ -108,7 +115,6 @@ public function iHaveTheFollowingFusionSetup(PyStringNode $fusionCode): void
         $this->fusionCode = $fusionCode->getRaw();
     }
 
-
     /**
      * @When I execute the following Fusion code:
      * @When I execute the following Fusion code on path :path:
@@ -126,7 +132,7 @@ public function iExecuteTheFollowingFusionCode(PyStringNode $fusionCode, string
         $fusionGlobals = FusionGlobals::fromArray($this->fusionGlobalContext);
 
         $fusionRuntime = (new RuntimeFactory())->createFromConfiguration($fusionAst, $fusionGlobals);
-        $fusionRuntime->overrideExceptionHandler($this->getObjectManager()->get(ThrowingHandler::class));
+        $fusionRuntime->overrideExceptionHandler($this->getObject(ThrowingHandler::class));
         $fusionRuntime->pushContextArray($this->fusionContext);
         try {
             $this->renderingResult = $fusionRuntime->render($path);

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/ContentCase.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/ContentCase.feature
@@ -1,4 +1,4 @@
-@fixtures
+@flowEntities
 Feature: Tests for the "Neos.Neos:ContentCase" Fusion prototype
 
   Background:

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/ContentCollection.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/ContentCollection.feature
@@ -1,4 +1,4 @@
-@fixtures
+@flowEntities
 Feature: Tests for the "Neos.Neos:ContentCollection" Fusion prototype
 
   Background:
@@ -72,13 +72,11 @@ Feature: Tests for the "Neos.Neos:ContentCollection" Fusion prototype
     include: resource://Neos.Fusion/Private/Fusion/Root.fusion
     include: resource://Neos.Neos/Private/Fusion/Root.fusion
 
-    test = Neos.Neos:ContentCollection {
-      @exceptionHandler = 'Neos\\Fusion\\Core\\ExceptionHandlers\\ThrowingHandler'
-    }
+    test = Neos.Neos:ContentCollection
     """
     Then I expect the following Fusion rendering error:
     """
-    No content collection of type Neos.Neos:ContentCollection could be found in the current node (/sites/a) or at the path "to-be-set-by-user". You might want to adjust your node type configuration and create the missing child node through the "./flow node:repair --node-type Neos.Neos:Test.DocumentType" command.
+    No content collection of type Neos.Neos:ContentCollection could be found in the current node (/[root]) or at the path "to-be-set-by-user". You might want to adjust your node type configuration and create the missing child node through the "flow structureadjustments:fix --node-type Neos.Neos:Site" command.
     """
 
   Scenario: invalid nodePath
@@ -89,12 +87,11 @@ Feature: Tests for the "Neos.Neos:ContentCollection" Fusion prototype
 
     test = Neos.Neos:ContentCollection {
       nodePath = 'invalid'
-      @exceptionHandler = 'Neos\\Fusion\\Core\\ExceptionHandlers\\ThrowingHandler'
     }
     """
     Then I expect the following Fusion rendering error:
     """
-    No content collection of type Neos.Neos:ContentCollection could be found in the current node (/sites/a) or at the path "invalid". You might want to adjust your node type configuration and create the missing child node through the "./flow node:repair --node-type Neos.Neos:Test.DocumentType" command.
+    No content collection of type Neos.Neos:ContentCollection could be found in the current node (/[root]) or at the path "invalid". You might want to adjust your node type configuration and create the missing child node through the "flow structureadjustments:fix --node-type Neos.Neos:Site" command.
     """
 
   Scenario: empty ContentCollection

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/ConvertUris.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/ConvertUris.feature
@@ -1,4 +1,4 @@
-@fixtures
+@flowEntities
 Feature: Tests for the "Neos.Neos:ConvertUris" Fusion prototype
 
   Background:

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/Menu.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/Menu.feature
@@ -1,4 +1,4 @@
-@fixtures @contentrepository
+@flowEntities @contentrepository
 Feature: Tests for the "Neos.Neos:Menu" and related Fusion prototypes
 
   Background: