EWPP-1146: Update test coverage for template prefixes.

openeuropa · Jun 7, 2021 · 551b211 · 551b211
1 parent b64a65b
commit 551b211
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 18 deletions.
diff --git a/src/Loader/EuropaComponentLibraryLoader.php b/src/Loader/EuropaComponentLibraryLoader.php
@@ -45,16 +45,16 @@ class EuropaComponentLibraryLoader extends \Twig_Loader_Filesystem
      *    List of ECL admissible namespaces, without leading '@'.
      * @param array|string $paths
      *    A path or an array of paths where to look for templates.
-     * @param null|string  $root
+     * @param string|null $root
      *    The root path common to all relative paths (null for getcwd())
-     * @param string       $prefix
-     *    Component name prefix, defaults to "ec-component-".
-     * @param string       $templatePrefix
-     *    ECL template name prefix, defaults to "ecl-".
-     * @param string       $extension
+     * @param string $prefix
+     *    Component name prefix, defaults to "twig-component-".
+     * @param string $templatePrefix
+     *    ECL template name prefix, defaults to no prefix.
+     * @param string $extension
      *    Twig extension, defaults to ".html.twig".
      */
-    public function __construct($namespaces, $paths = [], $root = null, $prefix = 'twig-component-', $templatePrefix = '', $extension = '.html.twig')
+    public function __construct($namespaces, $paths = [], string $root = null, string $prefix = 'twig-component-', string $templatePrefix = '', string $extension = '.html.twig')
     {
         parent::__construct($paths, $root);
         $this->namespaces = $namespaces;

diff --git a/tests/EuropaComponentLibraryLoaderTest.php b/tests/EuropaComponentLibraryLoaderTest.php
@@ -17,14 +17,16 @@ class EuropaComponentLibraryLoaderTest extends TestCase
      *
      * @param string $name
      * @param string $expected
+     * @param string $prefix
+     * @param string $templatePrefix
      *
      * @dataProvider dataProvider
      */
-    public function testLoader($name, $expected, $prefix)
+    public function testLoader(string $name, string $expected, string $prefix, string $templatePrefix)
     {
         $namespaces = ['namespace1', 'namespace2'];
         $paths = ['tests/fixtures/components'];
-        $loader = new EuropaComponentLibraryLoader($namespaces, $paths, null, $prefix);
+        $loader = new EuropaComponentLibraryLoader($namespaces, $paths, null, $prefix, $templatePrefix);
         $twig = new Twig_Environment($loader);
         $actual = $twig->loadTemplate($name)->render([]);
         $actual = str_replace("\n", ' ', trim($actual));
@@ -41,19 +43,21 @@ public function dataProvider()
     {
         return [
             // Test without prefix.
-            ['@namespace1/component1', 'component1', ''],
+            ['@namespace1/component1', 'component1', '', ''],
             // Test without prefix and with inclusions.
-            ['@namespace2/component2', 'component2 component1', ''],
-            ['@namespace2/component3', 'component3 component2 component1', ''],
+            ['@namespace2/component2', 'component2 component1', '', ''],
+            ['@namespace2/component3', 'component3 component2 component1', '', ''],
             // Test without prefix and sub component.
-            ['@namespace2/component4/sub-component1', 'component4 sub-component1', ''],
-            // Test with prefix.
-            ['@namespace1/component5', 'component5', 'ecl-'],
-            ['@namespace1/component5/sub-component1', 'component5 sub-component1', 'ecl-'],
+            ['@namespace2/component4/sub-component1', 'component4 sub-component1', '', ''],
+            // Test with component prefix.
+            ['@namespace1/component5', 'component5', 'ecl-', ''],
+            ['@namespace1/component5/sub-component1', 'component5 sub-component1', 'ecl-', ''],
             // Test with prefix and with relative loading.
-            ['@namespace1/component6', 'component6 component5', 'ecl-'],
+            ['@namespace1/component6', 'component6 component5', 'ecl-', ''],
             // Test when using full name.
-            ['@namespace1/ec-component-full-name/ecl-full-name.html.twig', 'full-name', 'ec-component-'],
+            ['@namespace1/ec-component-full-name/ecl-full-name.html.twig', 'full-name', 'ec-component-', ''],
+            // Test when using template prefix.
+            ['@namespace1/component7', 'component7', '', 'ecl-'],
         ];
     }
 }
diff --git a/...nents/component1/ecl-component1.html.twig → ...omponents/component1/component1.html.twig b/...nents/component1/ecl-component1.html.twig → ...omponents/component1/component1.html.twig
diff --git a/...nents/component2/ecl-component2.html.twig → ...omponents/component2/component2.html.twig b/...nents/component2/ecl-component2.html.twig → ...omponents/component2/component2.html.twig
diff --git a/...nents/component3/ecl-component3.html.twig → ...omponents/component3/component3.html.twig b/...nents/component3/ecl-component3.html.twig → ...omponents/component3/component3.html.twig
diff --git a/...s/component4/ecl-sub-component1.html.twig → ...nents/component4/sub-component1.html.twig b/...s/component4/ecl-sub-component1.html.twig → ...nents/component4/sub-component1.html.twig
diff --git a/tests/fixtures/components/component7/ecl-component7.html.twig b/tests/fixtures/components/component7/ecl-component7.html.twig
@@ -0,0 +1 @@
+component7
diff --git a/...s/ecl-component5/ecl-component5.html.twig → ...nents/ecl-component5/component5.html.twig b/...s/ecl-component5/ecl-component5.html.twig → ...nents/ecl-component5/component5.html.twig
diff --git a/...l-component5/ecl-sub-component1.html.twig → ...s/ecl-component5/sub-component1.html.twig b/...l-component5/ecl-sub-component1.html.twig → ...s/ecl-component5/sub-component1.html.twig
diff --git a/...s/ecl-component6/ecl-component6.html.twig → ...nents/ecl-component6/component6.html.twig b/...s/ecl-component6/ecl-component6.html.twig → ...nents/ecl-component6/component6.html.twig