Fixed form abstract layout tests to consider that empty placeholders ('empty_value' option) are no longer translated.

Restless-ET · Restless-ET · commit d68c8cd2f0fa · 2015-06-27T16:41:35.000+01:00
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -505,7 +505,7 @@ public function testSingleChoiceNonRequired()
     [@name="name"]
     [not(@required)]
     [
-        ./option[@value=""][.="[trans][/trans]"]
+        ./option[@value=""][.=""]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
     ]
@@ -528,7 +528,7 @@ public function testSingleChoiceNonRequiredNoneSelected()
     [@name="name"]
     [not(@required)]
     [
-        ./option[@value=""][.="[trans][/trans]"]
+        ./option[@value=""][.=""]
         /following-sibling::option[@value="&a"][not(@selected)][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
     ]
@@ -605,7 +605,7 @@ public function testSingleChoiceRequiredWithEmptyValueViaView()
     [@name="name"]
     [@required="required"]
     [
-        ./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]
+        ./option[@value=""][not(@selected)][not(@disabled)][.=""]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
         /following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
     ]
@@ -1233,15 +1233,15 @@ public function testBirthDayWithEmptyValue()
     [
         ./select
             [@id="name_month"]
-            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
             [./option[@value="1"][@selected="selected"]]
         /following-sibling::select
             [@id="name_day"]
-            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
             [./option[@value="1"][@selected="selected"]]
         /following-sibling::select
             [@id="name_year"]
-            [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]
+            [./option[@value=""][not(@selected)][not(@disabled)][.=""]]
             [./option[@value="1950"][@selected="selected"]]
     ]
     [count(./select)=3]

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ public function testSingleChoiceNonRequired()`
`505`	`505`	`[@name="name"]`
`506`	`506`	`[not(@required)]`
`507`	`507`	`[`
`508`		`- ./option[@value=""][.="[trans][/trans]"]`
	`508`	`+ ./option[@value=""][.=""]`
`509`	`509`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`510`	`510`	`/following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`511`	`511`	`]`
`@@ -528,7 +528,7 @@ public function testSingleChoiceNonRequiredNoneSelected()`
`528`	`528`	`[@name="name"]`
`529`	`529`	`[not(@required)]`
`530`	`530`	`[`
`531`		`- ./option[@value=""][.="[trans][/trans]"]`
	`531`	`+ ./option[@value=""][.=""]`
`532`	`532`	`/following-sibling::option[@value="&a"][not(@selected)][.="[trans]Choice&A[/trans]"]`
`533`	`533`	`/following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`534`	`534`	`]`
`@@ -605,7 +605,7 @@ public function testSingleChoiceRequiredWithEmptyValueViaView()`
`605`	`605`	`[@name="name"]`
`606`	`606`	`[@required="required"]`
`607`	`607`	`[`
`608`		`- ./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]`
	`608`	`+ ./option[@value=""][not(@selected)][not(@disabled)][.=""]`
`609`	`609`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`610`	`610`	`/following-sibling::option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`611`	`611`	`]`
`@@ -1233,15 +1233,15 @@ public function testBirthDayWithEmptyValue()`
`1233`	`1233`	`[`
`1234`	`1234`	`./select`
`1235`	`1235`	`[@id="name_month"]`
`1236`		`- [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]`
	`1236`	`+ [./option[@value=""][not(@selected)][not(@disabled)][.=""]]`
`1237`	`1237`	`[./option[@value="1"][@selected="selected"]]`
`1238`	`1238`	`/following-sibling::select`
`1239`	`1239`	`[@id="name_day"]`
`1240`		`- [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]`
	`1240`	`+ [./option[@value=""][not(@selected)][not(@disabled)][.=""]]`
`1241`	`1241`	`[./option[@value="1"][@selected="selected"]]`
`1242`	`1242`	`/following-sibling::select`
`1243`	`1243`	`[@id="name_year"]`
`1244`		`- [./option[@value=""][not(@selected)][not(@disabled)][.="[trans][/trans]"]]`
	`1244`	`+ [./option[@value=""][not(@selected)][not(@disabled)][.=""]]`
`1245`	`1245`	`[./option[@value="1950"][@selected="selected"]]`
`1246`	`1246`	`]`
`1247`	`1247`	`[count(./select)=3]`