Merge remote-tracking branch 'origin/9.0' into feature/conflict-resolution-03/rebase-during-publish

mhsdesign · mhsdesign · commit 68fdde5d0fdd · 2024-10-29T17:31:12.000+01:00
diff --git a/Tests/IntegrationTests/docker-compose.neos-dev-instance.yaml b/Tests/IntegrationTests/docker-compose.neos-dev-instance.yaml
@@ -14,12 +14,15 @@ services:
       # Enable GD
       PHP_EXTENSION_GD: 1
       COMPOSER_CACHE_DIR: /home/circleci/.composer/cache
+      DB_HOST: db
 
   db:
     image: mariadb:10.11
     environment:
       MYSQL_DATABASE: neos
       MYSQL_ROOT_PASSWORD: not_a_real_password
+    ports:
+      - 13309:3306
     command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
 volumes:
   composer_cache:
diff --git a/Tests/IntegrationTests/pageModel.js b/Tests/IntegrationTests/pageModel.js
@@ -59,7 +59,7 @@ export class PublishDropDown {
 
     static publishDropdownDiscardAll = ReactSelector('PublishDropDown ContextDropDownContents').find('button').withText('Discard all');
 
-    static publishDropdownPublishAll = ReactSelector('PublishDropDown ShallowDropDownContents').find('button').withText('Publish all');
+    static publishDropdownPublishAll = ReactSelector('PublishDropDown ContextDropDownContents').find('button').withText('Publish all');
 
     static async discardAll() {
         const $discardAllBtn = Selector(this.publishDropdownDiscardAll);
diff --git a/Tests/IntegrationTests/start-neos-dev-instance.sh b/Tests/IntegrationTests/start-neos-dev-instance.sh
@@ -41,6 +41,7 @@ dc exec -T php bash <<-'BASH'
     ./flow flow:cache:warmup
     ./flow doctrine:migrate
     ./flow user:create --username=admin --password=admin --first-name=John --last-name=Doe --roles=Administrator || true
+    ./flow user:create --username=editor --password=editor --first-name=Some --last-name=FooBarEditor --roles=Editor || true
 BASH
 
 echo ""
@@ -68,7 +69,11 @@ dc exec -T php bash <<-BASH
     if ./flow site:list | grep -q 'Node name'; then
         ./flow site:prune '*'
     fi
-    ./flow site:import --package-key=Neos.TestSite
+    ./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 resource:publish
 BASH
 
@@ -85,5 +90,5 @@ dc exec -T php bash <<-'BASH'
 
     # enable changes of the Neos.TestNodeTypes outside of the container to appear in the container via sym link to mounted volume
     rm -rf /usr/src/app/TestDistribution/Packages/Application/Neos.TestNodeTypes
-    ln -s /usr/src/neos-ui/Tests/IntegrationTests/SharedNodeTypesPackage/ /usr/src/app/TestDistribution/Packages/Application/Neos.TestNodeTypes
+    ln -s /usr/src/neos-ui/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestNodeTypes /usr/src/app/TestDistribution/Packages/Application/Neos.TestNodeTypes
 BASH
diff --git a/packages/neos-ui/src/Containers/PrimaryToolbar/DimensionSwitcher/DimensionSelector.js b/packages/neos-ui/src/Containers/PrimaryToolbar/DimensionSwitcher/DimensionSelector.js
@@ -16,7 +16,7 @@ const searchOptions = (searchTerm, processedSelectBoxOptions) =>
 }))
 export default class DimensionSelector extends PureComponent {
     static propTypes = {
-        icon: PropTypes.string.isRequired,
+        icon: PropTypes.string,
         dimensionLabel: PropTypes.string.isRequired,
         presets: PropTypes.object.isRequired,
         activePreset: PropTypes.string.isRequired,
