From 3a5271330bc9c0eed1effa1871765600aee502e2 Mon Sep 17 00:00:00 2001
From: Mohammed Nassar <Mohammed.NASSAR@ext.ec.europa.eu>
Date: Mon, 23 Sep 2019 14:05:40 +0000
Subject: [PATCH 1/4] OPENEUROPA-2309: Add test for webtools snippet formatter.

---
 .../Kernel/WebtoolsSnippetFormatterTest.php   | 163 ++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php

diff --git a/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php b/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
new file mode 100644
index 00000000..e183a92a
--- /dev/null
+++ b/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
@@ -0,0 +1,163 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\Tests\oe_webtools_media\Kernel;
+
+use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\json_field\JsonMarkup;
+
+/**
+ * @coversDefaultClass \Drupal\oe_webtools_media\Plugin\Field\FieldFormatter\WebtoolsSnippetFormatter
+ *
+ * @group oe_webtools_media
+ */
+class WebtoolsSnippetFormatterTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'oe_webtools',
+    'oe_webtools_media',
+    'json_field',
+    'field',
+    'user',
+    'entity_test',
+    'system',
+  ];
+
+  /**
+   * The entity type.
+   *
+   * @var string
+   */
+  protected $entityType;
+
+  /**
+   * The bundle of the entity.
+   *
+   * @var string
+   */
+  protected $bundle;
+
+  /**
+   * The display to render the entity.
+   *
+   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
+   */
+  protected $display;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test');
+
+    $this->installConfig(['system', 'field']);
+
+    $this->entityType = 'entity_test';
+    $this->bundle = $this->entityType;
+
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => 'test_field_media_webtools',
+      'entity_type' => $this->entityType,
+      'type' => 'json',
+    ]);
+    $field_storage->save();
+
+    $field = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => $this->bundle,
+    ]);
+    $field->save();
+
+    // The display mode.
+    $this->display = EntityViewDisplay::create([
+      'targetEntityType' => $this->entityType,
+      'bundle' => $this->bundle,
+      'mode' => 'default',
+    ]);
+    $this->display->setComponent('test_field_media_webtools', [
+      'type' => 'webtools_snippet',
+    ]);
+    $this->display->save();
+  }
+
+  /**
+   * Tests that the formatter contains the necessary library.
+   */
+  public function testFormatterLibrary() {
+    $data = '{"service":"map","map":{"background":["osmec"]},"version":"2.0"}';
+    $entity = EntityTest::create([
+      'test_field_media_webtools' => $data,
+    ]);
+    $entity->save();
+
+    $build = $this->display->build($entity);
+    $html = $this->render($build);
+
+    // Assert the render contains the required library.
+    $this->assertContains('<script src="//europa.eu/webtools/load.js" defer></script>', $html);
+  }
+
+  /**
+   * Tests that the formatter is rendered correctly.
+   *
+   * @param string $data
+   *   The media webtools field value.
+   *
+   * @dataProvider providerFormatter
+   *
+   * @throws \Exception
+   */
+  public function testFormatter($data) {
+    $entity = EntityTest::create([
+      'test_field_media_webtools' => $data,
+    ]);
+    $entity->save();
+
+    $build = $this->display->build($entity);
+    $output = (string) $this->container->get('renderer')->renderRoot($build);
+
+    // Assert correct format.
+    $this->assertContains('<script type="application/json">' . JsonMarkup::create(Json::encode(Json::decode($data))) . '</script>', $output);
+
+    // Assert the output is Xss filtered.
+    $this->assertTrue($output === Xss::filter($output, ['script', 'div']), 'The output is Xss filtered');
+
+    // Assert the script tags were escaped.
+    $this->assertTrue(substr_count($output, '</script') === 1, 'Script tags were escaped');
+
+    // Assert the html comment tags were escaped.
+    $this->assertTrue(substr_count($output, '<!--') === 0, 'Comment tags were escaped');
+  }
+
+  /**
+   * Data provider for testFormatter().
+   *
+   * @see ::testFormatter()
+   *
+   * @return array
+   *   Data provider for the webtools snippet field.
+   */
+  public function providerFormatter() {
+    return [
+      ['{"service":"map","map":{"background":["osmec"]},"version":"2.0"}'],
+      ['{"service":"map","<!--map":{"background":["osmec"]},"version":"2.0"}'],
+      ['{"service":"map","custom":"</script>","map":{"background":["osmec"]},"version":"2.0"}'],
+      ['{"service":"smk","type":"user","screen_name":"EU_Commission","count":3,"include_rts":false,"rts_display_original":false,"exclude_replies":true,"display_user":true,"display_user_pic":true,"auto_expand_photo":false,"auto_expand_video":false,"tweet_more_btn":true}'],
+      ['{"service":"charts","data":{"webtools":{"jsonstat":{"url":"https://ec.europa.eu/eurostat/wdds/rest/data/v2.1/json/en/ttr00012?&geo=AT&geo=BE&geo=BG&geo=CY&geo=CZ&geo=DE&geo=DK&geo=EE&geo=EL&geo=ES&geo=FI&geo=FR&geo=HR&geo=HU&geo=IE&geo=IT&geo=LT&geo=LU&geo=LV&geo=MT&geo=NL&geo=NO&geo=PL&geo=PT&geo=RO&geo=SE&geo=SI&geo=SK&geo=UK&precision=1&time=2007&time=2008&time=2009&time=2010&time=2011&time=2012&time=2013&time=2014","options":{"series":"unit","categories":"time","sheets":"geo"}}},"xAxis":{"type":"category"}},"provider":"highcharts"'],
+    ];
+  }
+
+}

From afb48fbdb52b60188b1b7d734dd6844e0eb4dc9e Mon Sep 17 00:00:00 2001
From: Mohammed Nassar <Mohammed.NASSAR@ext.ec.europa.eu>
Date: Mon, 23 Sep 2019 14:17:17 +0000
Subject: [PATCH 2/4] OPENEUROPA-2309: Simple changes to webtools snippet
 formatter.

---
 .../tests/src/Kernel/WebtoolsSnippetFormatterTest.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php b/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
index e183a92a..13c4a742 100644
--- a/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
+++ b/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
@@ -14,6 +14,8 @@
 use Drupal\json_field\JsonMarkup;
 
 /**
+ * Test the webtools snippet formatter.
+ *
  * @coversDefaultClass \Drupal\oe_webtools_media\Plugin\Field\FieldFormatter\WebtoolsSnippetFormatter
  *
  * @group oe_webtools_media
@@ -117,8 +119,6 @@ public function testFormatterLibrary() {
    *   The media webtools field value.
    *
    * @dataProvider providerFormatter
-   *
-   * @throws \Exception
    */
   public function testFormatter($data) {
     $entity = EntityTest::create([
@@ -132,8 +132,8 @@ public function testFormatter($data) {
     // Assert correct format.
     $this->assertContains('<script type="application/json">' . JsonMarkup::create(Json::encode(Json::decode($data))) . '</script>', $output);
 
-    // Assert the output is Xss filtered.
-    $this->assertTrue($output === Xss::filter($output, ['script', 'div']), 'The output is Xss filtered');
+    // Assert the output is XSS filtered.
+    $this->assertTrue($output === Xss::filter($output, ['script', 'div']), 'The output is XSS filtered');
 
     // Assert the script tags were escaped.
     $this->assertTrue(substr_count($output, '</script') === 1, 'Script tags were escaped');

From 296d1091bac8af3f192a97cb239d238dfcfb0e11 Mon Sep 17 00:00:00 2001
From: Mohammed Nassar <Mohammed.NASSAR@ext.ec.europa.eu>
Date: Mon, 23 Sep 2019 15:37:38 +0000
Subject: [PATCH 3/4] OPENEUROPA-2309: Simple changes to webtools snippet
 formatter.

---
 .../tests/src/Kernel/WebtoolsSnippetFormatterTest.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php b/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
index 13c4a742..e712c2a7 100644
--- a/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
+++ b/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
@@ -59,7 +59,7 @@ class WebtoolsSnippetFormatterTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('user');
@@ -98,7 +98,7 @@ protected function setUp() {
   /**
    * Tests that the formatter contains the necessary library.
    */
-  public function testFormatterLibrary() {
+  public function testFormatterLibrary(): void {
     $data = '{"service":"map","map":{"background":["osmec"]},"version":"2.0"}';
     $entity = EntityTest::create([
       'test_field_media_webtools' => $data,
@@ -120,7 +120,7 @@ public function testFormatterLibrary() {
    *
    * @dataProvider providerFormatter
    */
-  public function testFormatter($data) {
+  public function testFormatter(string $data): void {
     $entity = EntityTest::create([
       'test_field_media_webtools' => $data,
     ]);
@@ -150,7 +150,7 @@ public function testFormatter($data) {
    * @return array
    *   Data provider for the webtools snippet field.
    */
-  public function providerFormatter() {
+  public function providerFormatter(): array {
     return [
       ['{"service":"map","map":{"background":["osmec"]},"version":"2.0"}'],
       ['{"service":"map","<!--map":{"background":["osmec"]},"version":"2.0"}'],

From 9968d2897b2a02fbc171d9817a71ab63469b51b6 Mon Sep 17 00:00:00 2001
From: Sergei Pavlenko <sergii.pavlenko.v@gmail.com>
Date: Thu, 7 Jan 2021 16:11:54 +0200
Subject: [PATCH 4/4] EWPP-428: Update and move test for snippet formatter.

---
 .../Kernel/WebtoolsSnippetFormatterTest.php   | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)
 rename {modules/oe_webtools_media/tests => tests}/src/Kernel/WebtoolsSnippetFormatterTest.php (83%)

diff --git a/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php b/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
similarity index 83%
rename from modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
rename to tests/src/Kernel/WebtoolsSnippetFormatterTest.php
index e712c2a7..3f676033 100644
--- a/modules/oe_webtools_media/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
+++ b/tests/src/Kernel/WebtoolsSnippetFormatterTest.php
@@ -2,11 +2,10 @@
 
 declare(strict_types = 1);
 
-namespace Drupal\Tests\oe_webtools_media\Kernel;
+namespace Drupal\Tests\oe_webtools\Kernel;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\Xss;
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -16,18 +15,15 @@
 /**
  * Test the webtools snippet formatter.
  *
- * @coversDefaultClass \Drupal\oe_webtools_media\Plugin\Field\FieldFormatter\WebtoolsSnippetFormatter
- *
- * @group oe_webtools_media
+ * @coversDefaultClass \Drupal\oe_webtools\Plugin\Field\FieldFormatter\WebtoolsSnippetFormatter
  */
 class WebtoolsSnippetFormatterTest extends KernelTestBase {
 
   /**
    * {@inheritdoc}
    */
-  public static $modules = [
+  protected static $modules = [
     'oe_webtools',
-    'oe_webtools_media',
     'json_field',
     'field',
     'user',
@@ -56,6 +52,13 @@ class WebtoolsSnippetFormatterTest extends KernelTestBase {
    */
   protected $display;
 
+  /**
+   * The field name.
+   *
+   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
+   */
+  protected $fieldName = 'test_field_media_webtools';
+
   /**
    * {@inheritdoc}
    */
@@ -71,7 +74,7 @@ protected function setUp(): void {
     $this->bundle = $this->entityType;
 
     $field_storage = FieldStorageConfig::create([
-      'field_name' => 'test_field_media_webtools',
+      'field_name' => $this->fieldName,
       'entity_type' => $this->entityType,
       'type' => 'json',
     ]);
@@ -83,25 +86,23 @@ protected function setUp(): void {
     ]);
     $field->save();
 
-    // The display mode.
-    $this->display = EntityViewDisplay::create([
-      'targetEntityType' => $this->entityType,
-      'bundle' => $this->bundle,
-      'mode' => 'default',
-    ]);
-    $this->display->setComponent('test_field_media_webtools', [
+    /** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
+    $display_repository = \Drupal::service('entity_display.repository');
+
+    // Create a display for the default view mode.
+    $this->display = $display_repository->getViewDisplay($this->entityType, $this->bundle);
+    $this->display->setComponent($this->fieldName, [
       'type' => 'webtools_snippet',
-    ]);
-    $this->display->save();
+    ])->save();
   }
 
   /**
-   * Tests that the formatter contains the necessary library.
+   * Assert presence of 'Smart loader' with formatter.
    */
   public function testFormatterLibrary(): void {
     $data = '{"service":"map","map":{"background":["osmec"]},"version":"2.0"}';
     $entity = EntityTest::create([
-      'test_field_media_webtools' => $data,
+      $this->fieldName => $data,
     ]);
     $entity->save();
 
@@ -122,7 +123,7 @@ public function testFormatterLibrary(): void {
    */
   public function testFormatter(string $data): void {
     $entity = EntityTest::create([
-      'test_field_media_webtools' => $data,
+      $this->fieldName => $data,
     ]);
     $entity->save();