Merge pull request #296 from openeuropa/EWPP-307

EWPP-307: Project content type fixes.
openeuropa · Sep 29, 2020 · 785fa45 · 785fa45
2 parents 73ba1aa + b228c03
commit 785fa45
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/...es/oe_content_project/config/install/field.field.node.oe_project.oe_project_locations.yml b/...es/oe_content_project/config/install/field.field.node.oe_project.oe_project_locations.yml
@@ -12,7 +12,7 @@ entity_type: node
 bundle: oe_project
 label: 'Project locations'
 description: ''
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/tests/Behat/Content/Contact/GeneralContactContext.php b/tests/Behat/Content/Contact/GeneralContactContext.php
@@ -6,12 +6,17 @@
 
 use Drupal\DrupalExtension\Context\RawDrupalContext;
 use Drupal\Tests\oe_content\Behat\Hook\Scope\BeforeParseEntityFieldsScope;
+use Drupal\Tests\oe_content\Traits\EntityLoadingTrait;
+use Drupal\Tests\oe_content\Traits\EntityReferenceTrait;
 
 /**
  * Context to create general contact corporate entities.
  */
 class GeneralContactContext extends RawDrupalContext {
 
+  use EntityReferenceTrait;
+  use EntityLoadingTrait;
+
   /**
    * Run before fields are parsed by Drupal Behat extension.
    *
@@ -28,6 +33,8 @@ public function alterGeneralContactFields(BeforeParseEntityFieldsScope $scope):
       'Organisation' => 'oe_organisation',
       'Address' => 'oe_address',
       'Email' => 'oe_email',
+      'Image' => 'oe_image',
+      'Image caption' => 'oe_image:caption',
       'Phone number' => 'oe_phone',
       'Mobile number' => 'oe_mobile',
       'Fax number' => 'oe_fax',
@@ -39,6 +46,12 @@ public function alterGeneralContactFields(BeforeParseEntityFieldsScope $scope):
 
     foreach ($scope->getFields() as $key => $value) {
       switch ($key) {
+        // Set Media entity reference fields.
+        case 'Image':
+          $fields = $this->getReferenceField($mapping[$key], 'media', $value);
+          $scope->addFields($fields)->removeField($key);
+          break;
+
         case 'Published':
           $scope->addFields([
             $mapping[$key] => (int) ($value === 'Yes'),

diff --git a/tests/Behat/Content/Contact/PressContactContext.php b/tests/Behat/Content/Contact/PressContactContext.php
@@ -6,12 +6,17 @@
 
 use Drupal\DrupalExtension\Context\RawDrupalContext;
 use Drupal\Tests\oe_content\Behat\Hook\Scope\BeforeParseEntityFieldsScope;
+use Drupal\Tests\oe_content\Traits\EntityLoadingTrait;
+use Drupal\Tests\oe_content\Traits\EntityReferenceTrait;
 
 /**
  * Context to create press contact corporate entities.
  */
 class PressContactContext extends RawDrupalContext {
 
+  use EntityReferenceTrait;
+  use EntityLoadingTrait;
+
   /**
    * Run before fields are parsed by Drupal Behat extension.
    *
@@ -28,6 +33,8 @@ public function alterPressContactFields(BeforeParseEntityFieldsScope $scope): vo
       'Organisation' => 'oe_organisation',
       'Address' => 'oe_address',
       'Email' => 'oe_email',
+      'Image' => 'oe_image',
+      'Image caption' => 'oe_image:caption',
       'Phone number' => 'oe_phone',
       'Mobile number' => 'oe_mobile',
       'Fax number' => 'oe_fax',
@@ -39,6 +46,12 @@ public function alterPressContactFields(BeforeParseEntityFieldsScope $scope): vo
 
     foreach ($scope->getFields() as $key => $value) {
       switch ($key) {
+        // Set Media entity reference fields.
+        case 'Image':
+          $fields = $this->getReferenceField($mapping[$key], 'media', $value);
+          $scope->addFields($fields)->removeField($key);
+          break;
+
         case 'Published':
           $scope->addFields([
             $mapping[$key] => (int) ($value === 'Yes'),