diff --git a/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.Test.OneDimension/Resources/Private/Content/sites.json b/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.Test.OneDimension/Resources/Private/Content/sites.json new file mode 100644 index 0000000000..483b580c36 --- /dev/null +++ b/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.Test.OneDimension/Resources/Private/Content/sites.json @@ -0,0 +1,17 @@ +[ + { + "name": "Neos.Test.OneDimension", + "nodeName": "neos-test-onedimension", + "siteResourcesPackageKey": "Neos.Test.OneDimension", + "online": true, + "domains": [ + { + "hostname": "onedimension.localhost", + "scheme": null, + "port": 8081, + "active": true, + "primary": true + } + ] + } +] diff --git a/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.Test.TwoDimensions/Resources/Private/Content/sites.json b/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.Test.TwoDimensions/Resources/Private/Content/sites.json new file mode 100644 index 0000000000..e9f8af6712 --- /dev/null +++ b/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.Test.TwoDimensions/Resources/Private/Content/sites.json @@ -0,0 +1,17 @@ +[ + { + "name": "Neos.Test.TwoDimensions", + "nodeName": "neos-test-twodimensions", + "siteResourcesPackageKey": "Neos.Test.TwoDimensions", + "online": true, + "domains": [ + { + "hostname": "twodimensions.localhost", + "scheme": null, + "port": 8081, + "active": true, + "primary": true + } + ] + } +] diff --git a/Tests/IntegrationTests/e2e.sh b/Tests/IntegrationTests/e2e.sh index 15bba7c8bd..eb2b918e90 100755 --- a/Tests/IntegrationTests/e2e.sh +++ b/Tests/IntegrationTests/e2e.sh @@ -79,16 +79,10 @@ function run_tests() { cd ../../.. ./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