EWPP-164: Refactor tests.

openeuropa · Jan 19, 2021 · 4d3d620 · 4d3d620
1 parent 845d656
commit 4d3d620
Show file tree

Hide file tree

Showing 9 changed files with 266 additions and 372 deletions.
diff --git a/modules/oe_theme_content_event/src/Plugin/ExtraField/Display/DescriptionExtraField.php b/modules/oe_theme_content_event/src/Plugin/ExtraField/Display/DescriptionExtraField.php
@@ -15,6 +15,7 @@
 use Drupal\media\MediaInterface;
 use Drupal\oe_content_event\EventNodeWrapper;
 use Drupal\oe_theme\ValueObject\ImageValueObject;
+use Drupal\oe_theme\ValueObject\MediaValueObject;
 use Drupal\oe_time_caching\Cache\TimeBasedCacheTagGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

diff --git a/modules/oe_theme_helper/src/TwigExtension/TwigExtension.php b/modules/oe_theme_helper/src/TwigExtension/TwigExtension.php
@@ -18,6 +18,7 @@
 use Drupal\oe_theme_helper\EuropeanUnionLanguages;
 use Drupal\smart_trim\Truncate\TruncateHTML;
 use Drupal\Core\Template\TwigExtension as CoreTwigExtension;
+use Drupal\oe_theme\ValueObject\MediaValueObject;
 
 /**
  * Collection of extra Twig extensions as filters and functions.
@@ -69,6 +70,7 @@ public function getFilters(): array {
       new \Twig_SimpleFilter('smart_trim', [$this, 'smartTrim'], ['needs_environment' => TRUE]),
       new \Twig_SimpleFilter('is_external_url', [UrlHelper::class, 'isExternal']),
       new \Twig_SimpleFilter('filter_empty', [$this, 'filterEmpty']),
+      new \Twig_SimpleFilter('validate_ratio', [MediaValueObject::class, 'validateRatio']),
     ];
   }
 

diff --git a/templates/patterns/media_container/pattern-media-container.html.twig b/templates/patterns/media_container/pattern-media-container.html.twig
@@ -4,11 +4,13 @@
  * Media container pattern.
  */
 #}
+{% set _ratio = media.ratio|default('16-9') %}
+
 {% include '@ecl-twig/media-container' with {
   'image': media.image.src,
   'alt': media.image.alt,
   'embedded_media': media.video,
-  'ratio': media.ratio,
+  'ratio': _ratio|validate_ratio,
   'description': description,
   'sources': media.sources,
   'tracks': media.tracks

diff --git a/templates/patterns/text_featured_media/pattern-text-featured-media.html.twig b/templates/patterns/text_featured_media/pattern-text-featured-media.html.twig
@@ -12,7 +12,6 @@
     {% if media.image or media.video %}
       <div class="ecl-col-md-6 ecl-u-order-md-last ecl-u-mb-m ecl-u-mb-md-none">
         {{ pattern('media_container', {
-          'compliance': compliance,
           'description': caption,
           'media': media
         }) }}

diff --git a/tests/Kernel/Patterns/MediaContainerPatternRenderingTest.php b/tests/Kernel/Patterns/MediaContainerPatternRenderingTest.php
diff --git a/tests/Kernel/Patterns/TextFeaturedMediaPatternTest.php b/tests/Kernel/Patterns/TextFeaturedMediaPatternTest.php
diff --git a/tests/Kernel/fixtures/patterns/media_container_pattern.yml b/tests/Kernel/fixtures/patterns/media_container_pattern.yml
diff --git a/tests/Kernel/fixtures/patterns/text_featured_media.yml b/tests/Kernel/fixtures/patterns/text_featured_media.yml