From 94a927712f5b82ea3fad3871682f4c48189d3341 Mon Sep 17 00:00:00 2001
From: Sergii Pavlenko <sergii.pavlenko.v@gmail.com>
Date: Thu, 21 Feb 2019 17:11:28 +0100
Subject: [PATCH] OPENEUROPA-1577: Change approach for testing. Fix bug.

---
 .../src/TwigExtension/Filters.php             |  2 +-
 tests/Kernel/Patterns/ComponentsPageTest.php  | 51 -------------------
 tests/Kernel/RenderingTest.php                | 11 ----
 3 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 tests/Kernel/Patterns/ComponentsPageTest.php

diff --git a/modules/oe_theme_helper/src/TwigExtension/Filters.php b/modules/oe_theme_helper/src/TwigExtension/Filters.php
index ff877eb253..83574c7764 100644
--- a/modules/oe_theme_helper/src/TwigExtension/Filters.php
+++ b/modules/oe_theme_helper/src/TwigExtension/Filters.php
@@ -72,7 +72,7 @@ public function toNativeLanguageName($language_code): string {
       return $languages[$language_code]->getName();
     }
     // The fallback implemented in case we don't have enabled language.
-    $predefined = array_merge(self::getEuropeanUnionLanguageList(), LanguageManager::getStandardLanguageList());
+    $predefined = self::getEuropeanUnionLanguageList() + LanguageManager::getStandardLanguageList();
     if (!empty($predefined[$language_code][1])) {
       return $predefined[$language_code][1];
     }
diff --git a/tests/Kernel/Patterns/ComponentsPageTest.php b/tests/Kernel/Patterns/ComponentsPageTest.php
deleted file mode 100644
index cc54706f41..0000000000
--- a/tests/Kernel/Patterns/ComponentsPageTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\Tests\oe_theme\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\ui_patterns_library\Controller\PatternsLibraryController;
-
-/**
- * Class ComponentsPageTest.
- *
- * Purpose of this test class is to make sure
- * that all patterns will work without fatal errors with minimal dependencies.
- */
-class ComponentsPageTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'system',
-    'ui_patterns',
-    'ui_patterns_library',
-    'oe_theme_helper',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['system']);
-    $this->container->get('theme_installer')->install(['oe_theme']);
-    $this->container->get('theme_handler')->setDefault('oe_theme');
-    $this->container->set('theme.registry', NULL);
-  }
-
-  /**
-   * Test a components page rendering.
-   *
-   * @throws \Exception
-   */
-  public function testComponentsPageRendering(): void {
-    $controller = new PatternsLibraryController($this->container->get('plugin.manager.ui_patterns'));
-    $renderable_array = $controller->overview();
-    $this->container->get('renderer')->renderRoot($renderable_array);
-    $this->assertTrue(TRUE);
-  }
-
-}
diff --git a/tests/Kernel/RenderingTest.php b/tests/Kernel/RenderingTest.php
index bddf7d9fe2..a1e0490902 100644
--- a/tests/Kernel/RenderingTest.php
+++ b/tests/Kernel/RenderingTest.php
@@ -18,20 +18,9 @@ class RenderingTest extends AbstractKernelTestBase implements FormInterface {
    * {@inheritdoc}
    */
   public static $modules = [
-    'language',
-    'oe_multilingual',
     'oe_theme_patterns_render_test',
   ];
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(['language', 'oe_multilingual']);
-  }
-
   /**
    * {@inheritdoc}
    */