Skip to content

TASK: Stabilise pure dbal repository truncations during behat tests #5673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mhsdesign wants to merge 2 commits into
base: 9.0
Choose a base branch
from
+9 −15
Draft

TASK: Stabilise pure dbal repository truncations during behat tests #5673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d2c527
TASK: Stabilise pure dbal repository truncations during behat tests
mhsdesign Nov 2, 2025
8796da1
TASK: Prune pure dbal repositories via their apis after createContent…
mhsdesign Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions Neos.Neos/Tests/Behavior/Features/Bootstrap/AssetUsageTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Behat\Gherkin\Node\TableNode;
use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
use Neos\ContentRepository\Core\NodeType\NodeTypeName;
use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
use Neos\Neos\AssetUsage\AssetUsageIndexingProcessor;
Expand All @@ -36,14 +37,9 @@ trait AssetUsageTrait
*/
abstract private function getObject(string $className): object;

/**
* @BeforeScenario
*/
final public function pruneAssetUsage(): void
final public function pruneAssetUsage(ContentRepositoryId $contentRepositoryId): void
{
foreach (static::$alreadySetUpContentRepositories as $contentRepositoryId) {
$this->getObject(\Neos\Neos\AssetUsage\Domain\AssetUsageRepository::class)->removeAll($contentRepositoryId);
}
$this->getObject(\Neos\Neos\AssetUsage\Domain\AssetUsageRepository::class)->removeAll($contentRepositoryId);
}

/**
Expand Down
2 changes: 2 additions & 0 deletions Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ protected function createContentRepository(
$contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);
FakeContentDimensionSourceFactory::reset();
FakeNodeTypeManagerFactory::reset();
$this->pruneAssetUsage($contentRepositoryId);
$this->pruneWorkspaceService($contentRepositoryId);

return $contentRepository;
}
Expand Down
12 changes: 4 additions & 8 deletions Neos.Neos/Tests/Behavior/Features/Bootstrap/WorkspaceServiceTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

use Behat\Gherkin\Node\TableNode;
use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateRootWorkspace;
use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
use Neos\ContentRepository\Core\SharedModel\Exception\WorkspaceDoesNotExist;
use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
Expand Down Expand Up @@ -49,15 +50,10 @@ trait WorkspaceServiceTrait
*/
abstract private function getObject(string $className): object;

/**
* @BeforeScenario
*/
final public function pruneWorkspaceService(): void
final public function pruneWorkspaceService(ContentRepositoryId $contentRepositoryId): void
{
foreach (static::$alreadySetUpContentRepositories as $contentRepositoryId) {
$this->getObject(\Neos\Neos\Domain\Repository\WorkspaceMetadataAndRoleRepository::class)->pruneWorkspaceMetadata($contentRepositoryId);
$this->getObject(\Neos\Neos\Domain\Repository\WorkspaceMetadataAndRoleRepository::class)->pruneRoleAssignments($contentRepositoryId);
}
$this->getObject(\Neos\Neos\Domain\Repository\WorkspaceMetadataAndRoleRepository::class)->pruneWorkspaceMetadata($contentRepositoryId);
$this->getObject(\Neos\Neos\Domain\Repository\WorkspaceMetadataAndRoleRepository::class)->pruneRoleAssignments($contentRepositoryId);
}

/**
Expand Down
Loading