minor symfony#32728 relax some assertions to make tests forward compatible (xabbuh)

xabbuh · xabbuh · commit da6aca66f5b8 · 2019-07-24T21:56:41.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- relax some assertions to make tests forward compatible | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- c0eed67 relax some assertions to make tests forward compatible
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -848,7 +848,8 @@ public function testPreferredChoices()
         ]);
 
         $this->assertEquals([3 => new ChoiceView($entity3, '3', 'Baz'), 2 => new ChoiceView($entity2, '2', 'Bar')], $field->createView()->vars['preferred_choices']);
-        $this->assertEquals([1 => new ChoiceView($entity1, '1', 'Foo')], $field->createView()->vars['choices']);
+        $this->assertArrayHasKey(1, $field->createView()->vars['choices']);
+        $this->assertEquals(new ChoiceView($entity1, '1', 'Foo'), $field->createView()->vars['choices'][1]);
     }
 
     public function testOverrideChoicesWithPreferredChoices()
@@ -868,7 +869,8 @@ public function testOverrideChoicesWithPreferredChoices()
         ]);
 
         $this->assertEquals([3 => new ChoiceView($entity3, '3', 'Baz')], $field->createView()->vars['preferred_choices']);
-        $this->assertEquals([2 => new ChoiceView($entity2, '2', 'Bar')], $field->createView()->vars['choices']);
+        $this->assertArrayHasKey(2, $field->createView()->vars['choices']);
+        $this->assertEquals(new ChoiceView($entity2, '2', 'Bar'), $field->createView()->vars['choices'][2]);
     }
 
     public function testDisallowChoicesThatAreNotIncludedChoicesSingleIdentifier()
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -404,7 +404,6 @@ public function testSingleChoiceWithPreferred()
         /following-sibling::option[@disabled="disabled"][not(@selected)][.="-- sep --"]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
     ]
-    [count(./option)=3]
 '
         );
     }
@@ -427,7 +426,6 @@ public function testSingleChoiceWithPreferredAndNoSeparator()
         ./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
     ]
-    [count(./option)=2]
 '
         );
     }
@@ -451,7 +449,6 @@ public function testSingleChoiceWithPreferredAndBlankSeparator()
         /following-sibling::option[@disabled="disabled"][not(@selected)][.=""]
         /following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
     ]
-    [count(./option)=3]
 '
         );
     }
@@ -468,7 +465,6 @@ public function testChoiceWithOnlyPreferred()
         $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
 '/select
     [@class="my&class form-control"]
-    [count(./option)=2]
 '
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,6 @@ public function testSingleChoiceWithPreferred()`
`404`	`404`	`/following-sibling::option[@disabled="disabled"][not(@selected)][.="-- sep --"]`
`405`	`405`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`406`	`406`	`]`
`407`		`- [count(./option)=3]`
`408`	`407`	`'`
`409`	`408`	`);`
`410`	`409`	`}`
`@@ -427,7 +426,6 @@ public function testSingleChoiceWithPreferredAndNoSeparator()`
`427`	`426`	`./option[@value="&b"][not(@selected)][.="[trans]Choice&B[/trans]"]`
`428`	`427`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`429`	`428`	`]`
`430`		`- [count(./option)=2]`
`431`	`429`	`'`
`432`	`430`	`);`
`433`	`431`	`}`
`@@ -451,7 +449,6 @@ public function testSingleChoiceWithPreferredAndBlankSeparator()`
`451`	`449`	`/following-sibling::option[@disabled="disabled"][not(@selected)][.=""]`
`452`	`450`	`/following-sibling::option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]`
`453`	`451`	`]`
`454`		`- [count(./option)=3]`
`455`	`452`	`'`
`456`	`453`	`);`
`457`	`454`	`}`
`@@ -468,7 +465,6 @@ public function testChoiceWithOnlyPreferred()`
`468`	`465`	`$this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],`
`469`	`466`	`'/select`
`470`	`467`	`[@class="my&class form-control"]`
`471`		`- [count(./option)=2]`
`472`	`468`	`'`
`473`	`469`	`);`
`474`	`470`	`}`