Test the renderHelp method in all Tests about help to skip them if necessary.

mpiot · mpiot · commit 32bf1f68ad3f · 2018-03-23T15:53:02.000+01:00
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Form\Tests;
 
+use PHPUnit\Framework\SkippedTestError;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
@@ -115,7 +116,7 @@ abstract protected function renderLabel(FormView $view, $label = null, array $va
 
     protected function renderHelp(FormView $view)
     {
-        $this->markTestSkipped(sprintf('Legacy %s::renderHelp() is not implemented.', get_class($this)));
+        $this->markTestSkipped(sprintf('%s::renderHelp() is not implemented.', get_class($this)));
     }
 
     abstract protected function renderErrors(FormView $view);
@@ -445,6 +446,15 @@ public function testHelpSetLinkFromWidget()
             'help' => 'Help text test!',
         ));
         $view = $form->createView();
+
+        // Test if renderHelp method is implemented
+        try {
+            $this->renderHelp($view);
+        }
+        catch (SkippedTestError $error) {
+            return $error;
+        }
+
         $html = $this->renderRow($view);
 
         $this->assertMatchesXpath($html,
@@ -458,6 +468,15 @@ public function testHelpNotSetNotLinkedFromWidget()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\TextType');
         $view = $form->createView();
+
+        // Test if renderHelp method is implemented
+        try {
+            $this->renderHelp($view);
+        }
+        catch (SkippedTestError $error) {
+            return $error;
+        }
+
         $html = $this->renderRow($view);
 
         $this->assertMatchesXpath($html,
