Skip to content

Commit

Permalink
TASK: Fix asset usage tests by removing obsolete rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhsdesign
mhsdesign committed Jan 27, 2025
1 parent 6f2ac2e commit a611996
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 130 deletions.
4 changes: 0 additions & 4 deletions ...tures/AssetUsage/01-NodeCreation/01-CreateNodeAggregateWithNode_WithoutDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions ...Features/AssetUsage/01-NodeCreation/02-CreateNodeAggregateWithNode_WithDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 0 additions & 12 deletions ...eatures/AssetUsage/W01-WorkspacePublication/01-PublishWorkspace_WithoutDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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 {}
Expand Down
16 changes: 1 addition & 15 deletions ...r/Features/AssetUsage/W01-WorkspacePublication/02-PublishWorkspace_WithDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"} |
| asset-3 | sir-nodeward-nodington-iii | text | live | {"language": "de"} |
12 changes: 0 additions & 12 deletions ...W01-WorkspacePublication/03-PublishIndividualNodesFromWorkspace_WithoutDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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 {}
Expand Down
14 changes: 0 additions & 14 deletions ...ge/W01-WorkspacePublication/04-PublishIndividualNodesFromWorkspace_WithDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"}
Expand Down Expand Up @@ -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:
Expand Down
15 changes: 0 additions & 15 deletions ...Features/AssetUsage/W02-WorkspaceDiscarding/01-DiscardWorkspace_WithoutDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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:
Expand All @@ -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."} |
Expand Down
20 changes: 1 addition & 19 deletions ...or/Features/AssetUsage/W02-WorkspaceDiscarding/02-DiscardWorkspace_WithDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"}
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"}

Expand All @@ -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"} |
| asset-1 | sir-david-nodenborough | asset | live | {"language": "de"} |
24 changes: 0 additions & 24 deletions .../W02-WorkspaceDiscarding/03-DiscardIndividualNodesFromWorkspace_WithoutDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand All @@ -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 {}
Expand Down Expand Up @@ -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 |
Expand All @@ -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 {}
Expand Down
11 changes: 0 additions & 11 deletions ...age/W02-WorkspaceDiscarding/04-DiscardIndividualNodesFromWorkspace_WithDimensions.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"}
Expand Down

0 comments on commit a611996

Please sign in to comment.