diff --git a/Neos.Neos/Configuration/Settings.yaml b/Neos.Neos/Configuration/Settings.yaml index 1088eeee23..e0ff052e37 100755 --- a/Neos.Neos/Configuration/Settings.yaml +++ b/Neos.Neos/Configuration/Settings.yaml @@ -505,6 +505,14 @@ Neos: neos-site: Sites neos-plugin: Plugins + persistence: + doctrine: + migrations: + ignoredTables: + 'neos_asset_usage': true + 'neos_neos_workspace_metadata': true + 'neos_neos_workspace_role': true + Fusion: rendering: exceptionHandler: Neos\Fusion\Core\ExceptionHandlers\ThrowingHandler diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/AssetUsageTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/AssetUsageTrait.php index d798c5cae9..3f6fe3d319 100644 --- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/AssetUsageTrait.php +++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/AssetUsageTrait.php @@ -36,6 +36,16 @@ trait AssetUsageTrait */ abstract private function getObject(string $className): object; + /** + * @BeforeScenario + */ + final public function pruneAssetUsage(): void + { + foreach (static::$alreadySetUpContentRepositories as $contentRepositoryId) { + $this->getObject(\Neos\Neos\AssetUsage\Domain\AssetUsageRepository::class)->removeAll($contentRepositoryId); + } + } + /** * @Then I expect the AssetUsageService to have the following AssetUsages: */ diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/WorkspaceServiceTrait.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/WorkspaceServiceTrait.php index 938ce3f31a..8eca2a7113 100644 --- a/Neos.Neos/Tests/Behavior/Features/Bootstrap/WorkspaceServiceTrait.php +++ b/Neos.Neos/Tests/Behavior/Features/Bootstrap/WorkspaceServiceTrait.php @@ -49,6 +49,17 @@ trait WorkspaceServiceTrait */ abstract private function getObject(string $className): object; + /** + * @BeforeScenario + */ + final public function pruneWorkspaceService(): 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); + } + } + /** * @When the root workspace :workspaceName is created * @When the root workspace :workspaceName with title :title and description :description is created