From e018877cb52fb4500a0a267528fac44d24c90fd7 Mon Sep 17 00:00:00 2001 From: Wilhelm Behncke Date: Tue, 11 Jul 2023 13:29:58 +0200 Subject: [PATCH] TASK: Adjust e2e.sh test script for CI to match local setup for Neos 9.0 --- Tests/IntegrationTests/e2e-docker.sh | 6 +++--- Tests/IntegrationTests/e2e.sh | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Tests/IntegrationTests/e2e-docker.sh b/Tests/IntegrationTests/e2e-docker.sh index 1034a64817..69afda63b5 100755 --- a/Tests/IntegrationTests/e2e-docker.sh +++ b/Tests/IntegrationTests/e2e-docker.sh @@ -81,16 +81,16 @@ for fixture in $(pwd)/Tests/IntegrationTests/Fixtures/*/; do # TODO: optimize this cd TestDistribution + composer reinstall neos/test-nodetypes composer reinstall neos/test-site ./flow flow:cache:flush --force ./flow flow:cache:warmup - ./flow configuration:show --path Neos.ContentRepositoryRegistry.contentRepositories.default.contentDimensions - if ./flow site:list | grep -q 'Node name'; then ./flow site:prune '*' fi - #./flow site:import --package-key=Neos.TestSite + ./flow configuration:show --path Neos.ContentRepositoryRegistry.contentRepositories.default.contentDimensions + ./flow cr:setup ./flow site:create neos-test-site Neos.TestSite Neos.TestNodeTypes:Document.Page # TODO: Replace with "--assume-yes" flag once "./flow cr:prune" has one diff --git a/Tests/IntegrationTests/e2e.sh b/Tests/IntegrationTests/e2e.sh index fef89eb20c..f31d501e30 100755 --- a/Tests/IntegrationTests/e2e.sh +++ b/Tests/IntegrationTests/e2e.sh @@ -24,12 +24,21 @@ for fixture in Packages/Application/Neos.Neos.Ui/Tests/IntegrationTests/Fixtures composer reinstall neos/test-site ./flow flow:cache:flush --force ./flow flow:cache:warmup - ./flow configuration:show --path Neos.ContentRepository.contentDimensions + ./flow configuration:show --path Neos.ContentRepositoryRegistry.contentRepositories.default.contentDimensions if ./flow site:list | grep -q 'Node name'; then - ./flow site:prune '*' + # TODO: Remove "|| true" - This is currently only needed to prevent CircleCI from exiting + ./flow site:prune '*' || true fi - ./flow site:import --package-key=Neos.TestSite + + ./flow cr:setup + # TODO: Remove "|| true" - This is currently only needed to prevent CircleCI from exiting + ./flow site:create neos-test-site Neos.TestSite Neos.TestNodeTypes:Document.Page || true + # TODO: Replace with "--assume-yes" flag once "./flow cr:prune" has one + printf "y\n" | ./flow cr:prune + echo ./flow cr:import --path ./DistributionPackages/Neos.TestSite/Resources/Private/Content + ./flow cr:import --path ./DistributionPackages/Neos.TestSite/Resources/Private/Content + echo Done ./flow resource:publish cd Packages/Application/Neos.Neos.Ui