Added more tests

EasyCorp · Jul 19, 2015 · a0edb9c · a0edb9c
1 parent cd2b770
commit a0edb9c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/DependencyInjection/EasyAdminExtension.php b/DependencyInjection/EasyAdminExtension.php
@@ -433,7 +433,7 @@ private function processEntityTemplates(array $backendConfiguration)
                         // template name should not contain the .html.twig extension
                         // however, for usability reasons, we silently fix this issue if needed
                         if ('.html.twig' === substr($templateName, -10)) {
-                            $templateName = substr($templateName, 0, 10);
+                            $templateName = substr($templateName, 0, -10);
                         }
 
                         // 1st level priority: app/Resources/views/easy_admin/<entityName>/<templateName>.html.twig

diff --git a/Tests/Controller/CustomFieldTemplateTest.php b/Tests/Controller/CustomFieldTemplateTest.php
@@ -29,6 +29,9 @@ public function testListViewCustomFieldTemplate()
 
         $this->assertContains('Custom template for "name" field in the "list" view.', $crawler->filter('#main table td[data-label="Name"]')->eq(0)->text());
         $this->assertContains('The value of the custom option is "custom_list_value".', $crawler->filter('#main table td[data-label="Name"]')->eq(0)->text());
+
+        $parsedConfiguration = $this->client->getKernel()->getContainer()->getParameter('easyadmin.config');
+        $this->assertEquals('easy_admin/custom_field_template.html.twig', $parsedConfiguration['entities']['Category']['list']['fields']['name']['template']);
     }
 
     public function testShowViewCustomFieldTemplate()
@@ -39,6 +42,23 @@ public function testShowViewCustomFieldTemplate()
         $this->assertContains('The value of the custom option is "custom_show_value".', $crawler->filter('#main .form-control')->eq(0)->text());
     }
 
+    public function testListViewCustomFieldTemplateWrongName()
+    {
+        $crawler = $this->requestListView();
+
+        $this->assertContains('Custom template for "id" field in the "list" view.', $crawler->filter('#main table td[data-label="ID"]')->eq(0)->text());
+
+        $parsedConfiguration = $this->client->getKernel()->getContainer()->getParameter('easyadmin.config');
+        $this->assertEquals('easy_admin/custom_field_template.html.twig', $parsedConfiguration['entities']['Category']['list']['fields']['id']['template']);
+    }
+
+    public function testShowViewCustomFieldTemplateWrongName()
+    {
+        $crawler = $this->requestShowView();
+
+        $this->assertContains('Custom template for "id" field in the "show" view.', $crawler->filter('#main .form-control')->eq(1)->text());
+    }
+
     /**
      * @return Crawler
      */

diff --git a/Tests/Fixtures/App/Resources/views/easy_admin/custom_field_template.html.twig b/Tests/Fixtures/App/Resources/views/easy_admin/custom_field_template.html.twig
@@ -1,3 +1,3 @@
 Custom template for "{{ field_options.property }}" field in the "{{ view }}" view.
 
-The value of the custom option is "{{ field_options.custom_option }}".
+The value of the custom option is "{{ field_options.custom_option|default('null') }}".
diff --git a/Tests/Fixtures/App/config/config_custom_field_template.yml b/Tests/Fixtures/App/config/config_custom_field_template.yml
@@ -13,6 +13,13 @@ easy_admin:
             list:
                 fields:
                     - { property: 'name', template: 'custom_field_template', custom_option: 'custom_list_value' }
+                    # Template name should NOT contain the .html.twig suffix. However, the
+                    # application should silently fix this error and work as expected
+                    - { property: 'id', template: 'custom_field_template.html.twig' }
+
             show:
                 fields:
                     - { property: 'name', template: 'custom_field_template', custom_option: 'custom_show_value' }
+                    # Template name should NOT contain the .html.twig suffix. However, the
+                    # application should silently fix this error and work as expected
+                    - { property: 'id', template: 'custom_field_template.html.twig' }