[Bridge\Twig] fix bootstrap checkbox_row to render properly & remove spaceless

Author: arkste

Tests/AbstractBootstrap3HorizontalLayoutTest.php

@@ -154,4 +154,13 @@ public function testStartTagWithExtraAttributes()
 
         $this->assertSame('<form name="form" method="get" action="http://example.com/directory" class="foobar form-horizontal">', $html);
     }
+
+    public function testCheckboxRow()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType');
+        $view = $form->createView();
+        $html = $this->renderRow($view, array('label' => 'foo'));
+
+        $this->assertMatchesXpath($html, '/div[@class="form-group"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2);
+    }
 }

Tests/AbstractBootstrap4HorizontalLayoutTest.php

@@ -26,8 +26,8 @@ public function testLabelOnForm()
         $html = $this->renderLabel($view);
 
         $this->assertMatchesXpath($html,
-'/label
-    [@class="col-form-label col-sm-2 form-control-label required"]
+'/legend
+    [@class="col-form-label col-sm-2 col-form-legend required"]
     [.="[trans]Name[/trans]"]
 '
         );
@@ -118,7 +118,7 @@ public function testLegendOnExpandedType()
 
         $this->assertMatchesXpath($html,
 '/legend
-    [@class="col-sm-2 col-form-legend form-control-label required"]
+    [@class="col-sm-2 col-form-legend required"]
     [.="[trans]Custom label[/trans]"]
 '
         );
@@ -178,4 +178,13 @@ public function testStartTagWithExtraAttributes()
 
         $this->assertSame('<form name="form" method="get" action="http://example.com/directory" class="foobar">', $html);
     }
+
+    public function testCheckboxRow()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType');
+        $view = $form->createView();
+        $html = $this->renderRow($view, array('label' => 'foo'));
+
+        $this->assertMatchesXpath($html, '/div[@class="form-group row"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2);
+    }
 }

Tests/AbstractBootstrap4LayoutTest.php

@@ -28,8 +28,8 @@ public function testLabelOnForm()
         $html = $this->renderLabel($view);
 
         $this->assertMatchesXpath($html,
-'/label
-    [@class="form-control-label required"]
+'/legend
+    [@class="col-form-legend required"]
     [.="[trans]Name[/trans]"]
 '
         );
@@ -120,7 +120,7 @@ public function testLegendOnExpandedType()
 
         $this->assertMatchesXpath($html,
 '/legend
-    [@class="col-form-legend form-control-label required"]
+    [@class="col-form-legend required"]
     [.="[trans]Custom label[/trans]"]
 '
         );