OPENEUROPA-1577: Change approach for testing. Fix bug.

openeuropa · Feb 21, 2019 · 94a9277 · 94a9277
1 parent 8fcdbc8
commit 94a9277
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 63 deletions.
diff --git 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
diff --git 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}
    */