TASK: Make E2E tests work for 2Dimension fixture

This includes the replacement of the 2Dimension site export with an equivalent ESCR event export. Also, as a temporary fix, neos/neos-development-collection#4395 was added as a patch.
neos · Jul 10, 2023 · ad36bc7 · ad36bc7
1 parent f692333
commit ad36bc7
Show file tree

Hide file tree

Showing 7 changed files with 153 additions and 416 deletions.
diff --git a/Tests/IntegrationTests/Fixtures/2Dimension/SitePackage/Configuration/Settings.yaml b/Tests/IntegrationTests/Fixtures/2Dimension/SitePackage/Configuration/Settings.yaml
@@ -1,103 +1,91 @@
 Neos:
-  ContentRepository:
-    contentDimensions:
-      'country':
-        default: 'deu'
-        defaultPreset: 'deu'
-        label: 'Country'
-        icon: 'icon-globe'
-        presets:
-          'deu':
-            label: 'Germany'
-            values: ['deu']
-            uriSegment: 'deu'
-          'aut':
-            label: 'Austria'
-            values: ['aut', 'deu']
-            uriSegment: 'aut'
-          'lux':
-            label: 'Luxembourg'
-            values: ['lux', 'deu']
-            uriSegment: 'lux'
-          'dnk':
-            label: 'Denmark'
-            values: ['dnk']
-            uriSegment: 'dnk'
-      'language':
-        label: 'Language'
-        icon: icon-language
-        default: en_US
-        defaultPreset: en_US
-        presets:
-          en_US:
-            label: 'English (US)'
+  ContentRepositoryRegistry:
+    contentRepositories:
+      default:
+        contentDimensions:
+          country:
+            label: 'Country'
+            icon: 'icon-globe'
             values:
-              - en_US
-            uriSegment: en
-            constraints:
-              country:
-                '*': false
-                'deu': true
-                'aut': true
-          en_UK:
-            label: 'English (UK)'
+              'deu':
+                label: 'Germany'
+                specializations:
+                  'aut':
+                    label: 'Austria'
+                  'lux':
+                    label: 'Luxembourg'
+              'dnk':
+                label: 'Denmark'
+
+          'language':
+            label: 'Language'
+            icon: icon-language
             values:
-              - en_UK
-              - en_US
-            uriSegment: uk
-            constraints:
-              country:
-                '*': false
-                'deu': true
-                'aut': true
-          de:
-            label: German
-            values:
-              - de
-            uriSegment: de
-            constraints:
-              country:
-                '*': false
-                'deu': true
-                'aut': true
-                'lux': true
-          fr:
-            label: French
-            values:
-              - fr
-            uriSegment: fr
-            constraints:
-              country:
-                '*': false
-                'deu': true
-                'aut': true
-          nl:
-            label: Dutch
-            values:
-              - nl
-              - de
-            uriSegment: nl
-            constraints:
-              country:
-                '*': false
-                'deu': true
-                'aut': true
-          da:
-            label: Danish
-            values:
-              - da
-            uriSegment: da
-            constraints:
-              country:
-                '*': false
-                'dnk': true
-          lv:
-            label: Latvian
-            values:
-              - lv
-            uriSegment: lv
-            constraints:
-              country:
-                '*': false
-                'deu': true
-                'aut': true
+              'en_US':
+                label: 'English (US)'
+                constraints:
+                  'country':
+                    '*': false
+                    'deu': true
+                    'aut': true
+                specializations:
+                  'en_UK':
+                    label: 'English (UK)'
+              'de':
+                label: German
+                constraints:
+                  'country':
+                    '*': false
+                    'deu': true
+                    'aut': true
+                    'lux': true
+              'fr':
+                label: French
+                constraints:
+                  'country':
+                    '*': false
+                    'deu': true
+                    'aut': true
+              'nl':
+                label: Dutch
+                constraints:
+                  'country':
+                    '*': false
+                    'deu': true
+                    'aut': true
+              'da':
+                label: Danish
+                constraints:
+                  'country':
+                    '*': false
+                    'dnk': true
+              'lv':
+                label: Latvian
+                constraints:
+                  'country':
+                    '*': false
+                    'deu': true
+                    'aut': true
+  Neos:
+    sites:
+      '*':
+        contentDimensions:
+          resolver:
+            factoryClassName: Neos\Neos\FrontendRouting\DimensionResolution\Resolver\UriPathResolverFactory
+            options:
+              segments:
+                - dimensionIdentifier: 'country'
+                  dimensionValueMapping:
+                    'deu': 'deu'
+                    'aut': 'aut'
+                    'lux': 'lux'
+                    'dnk': 'dnk'
+                - dimensionIdentifier: 'language'
+                  dimensionValueMapping:
+                    'en_US': 'en'
+                    'en_UK': 'uk'
+                    'de': 'de'
+                    'fr': 'fr'
+                    'nl': 'nl'
+                    'da': 'da'
+                    'lv': 'lv'
diff --git a/...on/SitePackage/Resources/Private/Content/Assets/ee3d239e-48b0-4f99-90be-054301b91792.json b/...on/SitePackage/Resources/Private/Content/Assets/ee3d239e-48b0-4f99-90be-054301b91792.json
@@ -0,0 +1,14 @@
+{
+    "identifier": "ee3d239e-48b0-4f99-90be-054301b91792",
+    "type": "IMAGE",
+    "title": "",
+    "copyrightNotice": "",
+    "caption": "",
+    "assetSourceIdentifier": "neos",
+    "resource": {
+        "filename": "neos_primary.png",
+        "collectionName": "persistent",
+        "mediaType": "image\/png",
+        "sha1": "aac28f51e5ca842e2646e88e7d242ac3c27e1f25"
+    }
+}
diff --git a/...Package/Resources/Private/Content/ImageVariants/50cd4a3e-1cc3-4bbb-b2ab-919abb4011f1.json b/...Package/Resources/Private/Content/ImageVariants/50cd4a3e-1cc3-4bbb-b2ab-919abb4011f1.json
@@ -0,0 +1,20 @@
+{
+    "identifier": "50cd4a3e-1cc3-4bbb-b2ab-919abb4011f1",
+    "originalAssetIdentifier": "ee3d239e-48b0-4f99-90be-054301b91792",
+    "name": "",
+    "width": 126,
+    "height": 126,
+    "presetIdentifier": null,
+    "presetVariantName": null,
+    "imageAdjustments": [
+        {
+            "type": "CROP_IMAGE",
+            "properties": {
+                "x": 328,
+                "y": 0,
+                "width": 126,
+                "height": 126
+            }
+        }
+    ]
+}
diff --git a/.../SitePackage/Resources/Private/Content/Resources/6791d1beca5fa4ab78f1b2b1a44d43692f99b5dc b/.../SitePackage/Resources/Private/Content/Resources/6791d1beca5fa4ab78f1b2b1a44d43692f99b5dc