fix tests with bootstrap

HeahDude · HeahDude · commit d132bbe92afd · 2016-02-16T04:25:11.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -91,9 +91,11 @@
     {% if empty_choices is not defined -%}
         {{- parent() -}}
     {%- else -%}
-        {% set empty_choices = 'No choice available' %}
-        {% set choice_translation_domain = 'sf_form' -%}
-        {% set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
+        {%- if empty_choices is empty -%}
+            {%- set empty_choices = 'No choice available' %}
+            {%- set choice_translation_domain = 'sf_form' %}
+        {%- endif -%}
+        {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %}
         <div {{ block('widget_container_attributes') }}>
             <p>
                 {{- choice_translation_domain is same as(false) ? empty_choices : empty_choices|trans({}, choice_translation_domain) -}}
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
@@ -237,14 +237,14 @@ public function testSingleChoiceWithoutChoices()
             'choices' => array(),
             'multiple' => false,
             'expanded' => false,
+            'attr' => array('class' => 'my&class')
         ));
 
-        $this->assertWidgetMatchesXpath($form->createView(), array(),
+        $this->assertMatchesXpath($this->renderWidget($form->createView()),
 '/div
-    [@class="my&amp;class form-control"]
-    [not(@required)]
+    [@class="my&class form-control"]
     [
-        /p[.="[trans]No choice available[/trans]"]
+        ./p[.="[trans]No choice available[/trans]"]
     ]
 '
         );
@@ -693,6 +693,25 @@ public function testSingleChoiceExpanded()
         );
     }
 
+    public function testSingleChoiceExpandedWithoutChoices()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
+            'choices' => array(),
+            'multiple' => false,
+            'expanded' => true,
+        ));
+
+        $this->assertMatchesXpath($this->renderWidget($form->createView()),
+'/div
+    [@class="form-control"]
+    [not(@required)]
+    [
+        ./p[.="[trans]No choice available[/trans]"]
+    ]
+'
+        );
+    }
+
     public function testSingleChoiceExpandedWithoutTranslation()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -529,7 +529,6 @@ public function testSingleChoiceWithoutChoices()
 '/div
     [not(@required)]
     [.="[trans]No choice available[/trans]"]
-    [count(./div)=1]
 '
         );
     }
@@ -953,6 +952,22 @@ public function testSingleChoiceExpanded()
         );
     }
 
+    public function testSingleChoiceExpandedWithoutChoices()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', null, array(
+            'choices' => array(),
+            'multiple' => false,
+            'expanded' => true,
+        ));
+
+        $this->assertWidgetMatchesXpath($form->createView(), array(),
+'/div
+    [not(@required)]
+    [.="[trans]No choice available[/trans]"]
+'
+        );
+    }
+
     public function testSingleChoiceExpandedWithoutTranslation()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', array(
