From e6f4a70ac290f8b78eee998209771024139d0ad8 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:07:08 +0100
Subject: [PATCH] TASK: Adjust to importer change `site:importall`

---
 Tests/IntegrationTests/e2e-docker.sh              | 10 ++--------
 Tests/IntegrationTests/start-neos-dev-instance.sh | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/Tests/IntegrationTests/e2e-docker.sh b/Tests/IntegrationTests/e2e-docker.sh
index 2dcd78bcc0..bd425b8bd4 100755
--- a/Tests/IntegrationTests/e2e-docker.sh
+++ b/Tests/IntegrationTests/e2e-docker.sh
@@ -57,16 +57,10 @@ dc exec -T php bash <<-'BASH'
     ./flow user:create --username=editor --password=editor --first-name=Editor --last-name=McEditworth --roles=Editor || true
 
     ./flow cr:setup --content-repository onedimension
-    ./flow cr:import --content-repository onedimension --path ./DistributionPackages/Neos.Test.OneDimension/Resources/Private/Content
-    # TODO: Fix when part of importer: Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
-    ./flow site:create neos-test-onedimension Neos.Test.OneDimension Neos.TestNodeTypes:Document.HomePage
-    ./flow domain:add neos-test-onedimension onedimension.localhost --port 8081
+    ./flow site:importall --content-repository onedimension --path ./DistributionPackages/Neos.Test.OneDimension/Resources/Private/Content
 
     ./flow cr:setup --content-repository twodimensions
-    ./flow cr:import --content-repository twodimensions --path ./DistributionPackages/Neos.Test.TwoDimensions/Resources/Private/Content
-    # TODO: Fix when part of importer: Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
-    ./flow site:create neos-test-twodimensions Neos.Test.TwoDimensions Neos.TestNodeTypes:Document.HomePage
-    ./flow domain:add neos-test-twodimensions twodimensions.localhost --port 8081
+    ./flow site:importall --content-repository twodimensions --path ./DistributionPackages/Neos.Test.TwoDimensions/Resources/Private/Content
 
     ./flow resource:publish
 BASH
diff --git a/Tests/IntegrationTests/start-neos-dev-instance.sh b/Tests/IntegrationTests/start-neos-dev-instance.sh
index 0733f3f266..8cc2af7761 100644
--- a/Tests/IntegrationTests/start-neos-dev-instance.sh
+++ b/Tests/IntegrationTests/start-neos-dev-instance.sh
@@ -59,21 +59,15 @@ dc exec -T php bash <<-BASH
     rm -rf ./TestDistribution/DistributionPackages/Neos.TestSite
     ln -s "../../Fixtures/1Dimension/SitePackage" ./TestDistribution/DistributionPackages/Neos.TestSite
 
-    # TODO: optimize this
     cd TestDistribution
     composer reinstall neos/test-site
     ./flow flow:cache:flush --force
     ./flow flow:cache:warmup
     ./flow configuration:show --path Neos.ContentRepository.contentDimensions
 
-    if ./flow site:list | grep -q 'Node name'; then
-        ./flow site:prune '*'
-    fi
-    ./flow cr:setup
     ./flow cr:setup --content-repository onedimension
-    ./flow cr:setup --content-repository twodimensions
-    ./flow cr:import --content-repository onedimension Packages/Sites/Neos.Test.OneDimension/Resources/Private/Content
-    ./flow site:create neos-test-onedimension Neos.Test.OneDimension Neos.TestNodeTypes:Document.HomePage
+    ./flow site:pruneAll --content-repository onedimension --force --verbose
+    ./flow site:importAll --content-repository onedimension --package-key Neos.Test.OneDimension --verbose
     ./flow resource:publish
 BASH