Merge pull request #701 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Sep 19, 2023 · 84e687c · 84e687c
2 parents cc80466 + 5059de3
commit 84e687c
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 40 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -84,8 +84,8 @@ content:
     third_party_settings: {  }
   contacts:
     type: readonly_field_widget
-    region: content
     weight: 36
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -176,8 +176,8 @@ content:
     third_party_settings: {  }
   highlights:
     type: readonly_field_widget
-    region: content
     weight: 33
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -203,8 +203,8 @@ content:
     third_party_settings: {  }
   links:
     type: readonly_field_widget
-    region: content
     weight: 31
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -241,8 +241,8 @@ content:
     third_party_settings: {  }
   opening_hours:
     type: readonly_field_widget
-    region: content
     weight: 32
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -251,8 +251,8 @@ content:
     third_party_settings: {  }
   other_info:
     type: readonly_field_widget
-    region: content
     weight: 34
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -294,8 +294,8 @@ content:
     third_party_settings: {  }
   price_info:
     type: readonly_field_widget
-    region: content
     weight: 35
+    region: content
     settings:
       label: above
       formatter_type: null

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -3,13 +3,13 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: XBOd0Lfy5FpXJkeuZi75vBaT7ffFCENINrui5kCVygo
+  default_config_hash: zY_1slrvSjIWdILbI-0OWc8A1RRz0fRVj4Gtz4m6zS0
 id: helfi_announcements
 label: 'Helfi: Announcements'
 label_plural: 'Helfi: Announcements'
 description: ''
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:
@@ -39,7 +39,7 @@ field_mapper_config:
       value: '$.attributes["field_announcement_link"]["uri"]'
 storage_client_id: helfi_announcements
 storage_client_config: {  }
-persistent_cache_max_age: 600
+persistent_cache_max_age: -1
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

diff --git a/conf/cmi/helfi_api_base.delete_revisions.yml b/conf/cmi/helfi_api_base.delete_revisions.yml
@@ -0,0 +1,6 @@
+entity_types:
+  - node
+  - paragraph
+  - tpr_unit
+  - tpr_service
+  - tpr_errand_service
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -16,7 +16,7 @@
   <env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"chromeOptions":{"w3c": false }}, "http://127.0.0.1:4444"]'/>
   <env name="DTT_API_OPTIONS" value='{"socketTimeout": 360, "domWaitTimeout": 3600000}' />
   <env name="DTT_API_URL" value="http://127.0.0.1:9222"/>
-  <env name="DTT_BASE_URL" value="http://127.0.0.1:8080"/>
+  <env name="DTT_BASE_URL" value="http://127.0.0.1:8888"/>
 </php>
 <testsuites>
   <testsuite name="unit">
@@ -41,9 +41,13 @@
   </testsuite>
   <testsuite name="existing-site">
     <directory>./tests/dtt/src/ExistingSite</directory>
+    <directory>./public/modules/custom/*/tests/src/ExistingSite</directory>
+    <directory>./public/modules/contrib/*/tests/src/ExistingSite</directory>
   </testsuite>
   <testsuite name="existing-site-javascript">
     <directory>./tests/dtt/src/ExistingSiteJavascript</directory>
+    <directory>./public/modules/custom/*/tests/src/ExistingSiteJavascript</directory>
+    <directory>./public/modules/contrib/*/tests/src/ExistingSiteJavascript</directory>
   </testsuite>
 </testsuites>
 <listeners>