TASK: Adjust e2e.sh test script for CI to match local setup for Neos 9.0

neos · Jul 11, 2023 · 58cfe98 · 58cfe98
1 parent 7b451a0
commit 58cfe98
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git 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
@@ -24,12 +24,20 @@ 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 '*'
     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