From a611996acfe49e6e6984265a360eb8007b7efdfc Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:27:43 +0100 Subject: [PATCH] TASK: Fix asset usage tests by removing obsolete rebase --- ...ggregateWithNode_WithoutDimensions.feature | 4 ---- ...deAggregateWithNode_WithDimensions.feature | 4 ---- ...PublishWorkspace_WithoutDimensions.feature | 12 ---------- ...02-PublishWorkspace_WithDimensions.feature | 16 +------------ ...desFromWorkspace_WithoutDimensions.feature | 12 ---------- ...lNodesFromWorkspace_WithDimensions.feature | 14 ----------- ...DiscardWorkspace_WithoutDimensions.feature | 15 ------------ ...02-DiscardWorkspace_WithDimensions.feature | 20 +--------------- ...desFromWorkspace_WithoutDimensions.feature | 24 ------------------- ...lNodesFromWorkspace_WithDimensions.feature | 11 --------- 10 files changed, 2 insertions(+), 130 deletions(-) diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/01-NodeCreation/01-CreateNodeAggregateWithNode_WithoutDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/01-NodeCreation/01-CreateNodeAggregateWithNode_WithoutDimensions.feature index 276437c37de..e1078c44183 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/01-NodeCreation/01-CreateNodeAggregateWithNode_WithoutDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/01-NodeCreation/01-CreateNodeAggregateWithNode_WithoutDimensions.feature @@ -41,10 +41,6 @@ Feature: Create node aggregate with node without dimensions | workspaceName | "user-workspace" | | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in dimension space point {} Scenario: Nodes on live workspace have been created Given I am in workspace "live" diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/01-NodeCreation/02-CreateNodeAggregateWithNode_WithDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/01-NodeCreation/02-CreateNodeAggregateWithNode_WithDimensions.feature index bd793a4e12d..da50b77ce19 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/01-NodeCreation/02-CreateNodeAggregateWithNode_WithDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/01-NodeCreation/02-CreateNodeAggregateWithNode_WithDimensions.feature @@ -43,10 +43,6 @@ Feature: Create node aggregate with node with dimensions | workspaceName | "user-workspace" | | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in dimension space point {"language": "de"} Scenario: Nodes on live workspace have been created Given I am in workspace "live" diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/01-PublishWorkspace_WithoutDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/01-PublishWorkspace_WithoutDimensions.feature index 4b538399636..a81ce1ee2e2 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/01-PublishWorkspace_WithoutDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/01-PublishWorkspace_WithoutDimensions.feature @@ -43,10 +43,6 @@ Feature: Publish nodes without dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in dimension space point {} Then the following CreateNodeAggregateWithNode commands are executed: | nodeAggregateId | nodeName | parentNodeAggregateId | nodeTypeName | initialPropertyValues | @@ -79,20 +75,12 @@ Feature: Publish nodes without dimensions | baseWorkspaceName | "live" | | newContentStreamId | "review-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "review-workspace" | - And the command CreateWorkspace is executed with payload: | Key | Value | | workspaceName | "user-workspace" | | baseWorkspaceName | "review-workspace" | | newContentStreamId | "user-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in workspace "user-workspace" And I am in dimension space point {} diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/02-PublishWorkspace_WithDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/02-PublishWorkspace_WithDimensions.feature index d2b09329dcf..6da3ad7cae3 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/02-PublishWorkspace_WithDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/02-PublishWorkspace_WithDimensions.feature @@ -45,9 +45,6 @@ Feature: Publish nodes with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | Then I am in dimension space point {"language": "de"} And the following CreateNodeAggregateWithNode commands are executed: @@ -85,20 +82,12 @@ Feature: Publish nodes with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "review-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "review-workspace" | - And the command CreateWorkspace is executed with payload: | Key | Value | | workspaceName | "user-workspace" | | baseWorkspaceName | "review-workspace" | | newContentStreamId | "user-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in workspace "user-workspace" Then I am in dimension space point {"language": "de"} @@ -153,9 +142,6 @@ Feature: Publish nodes with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | Then I am in dimension space point {"language": "de"} And the following CreateNodeAggregateWithNode commands are executed: @@ -188,4 +174,4 @@ Feature: Publish nodes with dimensions | asset-1 | sir-david-nodenborough | asset | live | {"language": "de"} | | asset-1 | sir-david-nodenborough | asset | live | {"language": "en"} | | asset-2 | nody-mc-nodeface | assets | live | {"language": "de"} | - | asset-3 | sir-nodeward-nodington-iii | text | live | {"language": "de"} | \ No newline at end of file + | asset-3 | sir-nodeward-nodington-iii | text | live | {"language": "de"} | diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/03-PublishIndividualNodesFromWorkspace_WithoutDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/03-PublishIndividualNodesFromWorkspace_WithoutDimensions.feature index e6c292625a1..42c9c02e139 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/03-PublishIndividualNodesFromWorkspace_WithoutDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/03-PublishIndividualNodesFromWorkspace_WithoutDimensions.feature @@ -43,10 +43,6 @@ Feature: Publish nodes partially without dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in dimension space point {} Then the following CreateNodeAggregateWithNode commands are executed: | nodeAggregateId | nodeName | parentNodeAggregateId | nodeTypeName | initialPropertyValues | @@ -79,20 +75,12 @@ Feature: Publish nodes partially without dimensions | baseWorkspaceName | "live" | | newContentStreamId | "review-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "review-workspace" | - And the command CreateWorkspace is executed with payload: | Key | Value | | workspaceName | "user-workspace" | | baseWorkspaceName | "review-workspace" | | newContentStreamId | "user-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in workspace "user-workspace" And I am in dimension space point {} diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/04-PublishIndividualNodesFromWorkspace_WithDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/04-PublishIndividualNodesFromWorkspace_WithDimensions.feature index db01883e695..ff35bf1640e 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/04-PublishIndividualNodesFromWorkspace_WithDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W01-WorkspacePublication/04-PublishIndividualNodesFromWorkspace_WithDimensions.feature @@ -45,9 +45,6 @@ Feature: Publish nodes partially with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | Then I am in dimension space point {"language": "de"} And the following CreateNodeAggregateWithNode commands are executed: @@ -85,20 +82,12 @@ Feature: Publish nodes partially with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "review-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "review-workspace" | - And the command CreateWorkspace is executed with payload: | Key | Value | | workspaceName | "user-workspace" | | baseWorkspaceName | "review-workspace" | | newContentStreamId | "user-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in workspace "user-workspace" Then I am in dimension space point {"language": "de"} @@ -153,9 +142,6 @@ Feature: Publish nodes partially with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | Then I am in dimension space point {"language": "de"} And the following CreateNodeAggregateWithNode commands are executed: diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/01-DiscardWorkspace_WithoutDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/01-DiscardWorkspace_WithoutDimensions.feature index fd633631147..740b007f072 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/01-DiscardWorkspace_WithoutDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/01-DiscardWorkspace_WithoutDimensions.feature @@ -48,10 +48,6 @@ Feature: Discard workspace without dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in dimension space point {} Then the following CreateNodeAggregateWithNode commands are executed: | nodeAggregateId | nodeName | parentNodeAggregateId | nodeTypeName | initialPropertyValues | @@ -80,11 +76,6 @@ Feature: Discard workspace without dimensions | workspaceName | "review-workspace" | | baseWorkspaceName | "live" | | newContentStreamId | "review-workspace-cs-id" | - - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "review-workspace" | - And I am in workspace "review-workspace" Then the following CreateNodeAggregateWithNode commands are executed: @@ -96,14 +87,8 @@ Feature: Discard workspace without dimensions | workspaceName | "user-workspace" | | baseWorkspaceName | "review-workspace" | | newContentStreamId | "user-workspace-cs-id" | - - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in workspace "user-workspace" - And I am in dimension space point {} Then the following CreateNodeAggregateWithNode commands are executed: | nodeAggregateId | nodeName | parentNodeAggregateId | nodeTypeName | initialPropertyValues | | sir-nodeward-nodington-iii | esquire | lady-eleonode-rootford | Neos.ContentRepository.Testing:NodeWithAssetProperties | {"text": "Link to asset://asset-3."} | diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/02-DiscardWorkspace_WithDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/02-DiscardWorkspace_WithDimensions.feature index c3c6559a152..254a1dce3b2 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/02-DiscardWorkspace_WithDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/02-DiscardWorkspace_WithDimensions.feature @@ -49,9 +49,6 @@ Feature: Discard workspace with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | Then I am in dimension space point {"language": "de"} And the following CreateNodeAggregateWithNode commands are executed: @@ -85,20 +82,11 @@ Feature: Discard workspace with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "review-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "review-workspace" | - And the command CreateWorkspace is executed with payload: | Key | Value | | workspaceName | "user-workspace" | | baseWorkspaceName | "review-workspace" | | newContentStreamId | "user-workspace-cs-id" | - - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in workspace "user-workspace" Then I am in dimension space point {"language": "de"} @@ -148,9 +136,6 @@ Feature: Discard workspace with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | Then I am in dimension space point {"language": "de"} And the following CreateNodeAggregateWithNode commands are executed: @@ -188,9 +173,6 @@ Feature: Discard workspace with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | Then I am in dimension space point {"language": "de"} @@ -213,4 +195,4 @@ Feature: Discard workspace with dimensions And I expect the AssetUsageService to have the following AssetUsages: | assetId | nodeAggregateId | propertyName | workspaceName | originDimensionSpacePoint | - | asset-1 | sir-david-nodenborough | asset | live | {"language": "de"} | \ No newline at end of file + | asset-1 | sir-david-nodenborough | asset | live | {"language": "de"} | diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/03-DiscardIndividualNodesFromWorkspace_WithoutDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/03-DiscardIndividualNodesFromWorkspace_WithoutDimensions.feature index 94f90ccf63a..235420c06ea 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/03-DiscardIndividualNodesFromWorkspace_WithoutDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/03-DiscardIndividualNodesFromWorkspace_WithoutDimensions.feature @@ -47,10 +47,6 @@ Feature: Discard nodes partially without dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in dimension space point {} Then the following CreateNodeAggregateWithNode commands are executed: | nodeAggregateId | nodeName | parentNodeAggregateId | nodeTypeName | initialPropertyValues | @@ -84,10 +80,6 @@ Feature: Discard nodes partially without dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in dimension space point {} Then the following CreateNodeAggregateWithNode commands are executed: | nodeAggregateId | nodeName | parentNodeAggregateId | nodeTypeName | initialPropertyValues | @@ -120,10 +112,6 @@ Feature: Discard nodes partially without dimensions | baseWorkspaceName | "live" | | newContentStreamId | "review-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "review-workspace" | - And I am in workspace "review-workspace" Then the following CreateNodeAggregateWithNode commands are executed: | nodeAggregateId | nodeName | parentNodeAggregateId | nodeTypeName | initialPropertyValues | @@ -135,10 +123,6 @@ Feature: Discard nodes partially without dimensions | baseWorkspaceName | "review-workspace" | | newContentStreamId | "user-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in workspace "user-workspace" And I am in dimension space point {} @@ -173,10 +157,6 @@ Feature: Discard nodes partially without dimensions | baseWorkspaceName | "live" | | newContentStreamId | "review-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "review-workspace" | - And I am in workspace "review-workspace" Then the following CreateNodeAggregateWithNode commands are executed: | nodeAggregateId | nodeName | parentNodeAggregateId | nodeTypeName | initialPropertyValues | @@ -188,10 +168,6 @@ Feature: Discard nodes partially without dimensions | baseWorkspaceName | "review-workspace" | | newContentStreamId | "user-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in workspace "user-workspace" And I am in dimension space point {} diff --git a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/04-DiscardIndividualNodesFromWorkspace_WithDimensions.feature b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/04-DiscardIndividualNodesFromWorkspace_WithDimensions.feature index ce7811f4421..e9cc0bc847d 100644 --- a/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/04-DiscardIndividualNodesFromWorkspace_WithDimensions.feature +++ b/Neos.Neos/Tests/Behavior/Features/AssetUsage/W02-WorkspaceDiscarding/04-DiscardIndividualNodesFromWorkspace_WithDimensions.feature @@ -45,9 +45,6 @@ Feature: Discard nodes partially with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "user-cs-id" | And I am in workspace "user-workspace" - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | Then I am in dimension space point {"language": "de"} And the following CreateNodeAggregateWithNode commands are executed: @@ -84,20 +81,12 @@ Feature: Discard nodes partially with dimensions | baseWorkspaceName | "live" | | newContentStreamId | "review-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "review-workspace" | - And the command CreateWorkspace is executed with payload: | Key | Value | | workspaceName | "user-workspace" | | baseWorkspaceName | "review-workspace" | | newContentStreamId | "user-workspace-cs-id" | - And the command RebaseWorkspace is executed with payload: - | Key | Value | - | workspaceName | "user-workspace" | - And I am in workspace "user-workspace" Then I am in dimension space point {"language": "de"}