merged branch bschussek/testfix (PR #5051)
Commits
-------
b4b5408
[Form] Fixed failing tests
Discussion
----------
[Form] Fixed failing tests
Bug fix: yes
Feature addition: no
Backwards compatibility break:
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
This commit is contained in:
commit
af47e762c3
@ -186,8 +186,8 @@ class EntityChoiceListTest extends DoctrineOrmTestCase
|
||||
|
||||
$this->assertSame(array(1 => $entity1, 2 => $entity2), $choiceList->getChoices());
|
||||
$this->assertEquals(array(
|
||||
'group1' => array(1 => new ChoiceView('1', 'Foo')),
|
||||
'group2' => array(2 => new ChoiceView('2', 'Bar'))
|
||||
'group1' => array(1 => new ChoiceView($entity1, '1', 'Foo')),
|
||||
'group2' => array(2 => new ChoiceView($entity2, '2', 'Bar'))
|
||||
), $choiceList->getRemainingViews());
|
||||
}
|
||||
|
||||
@ -219,9 +219,9 @@ class EntityChoiceListTest extends DoctrineOrmTestCase
|
||||
|
||||
$this->assertEquals(array(1 => $item1, 2 => $item2, 3 => $item3, 4 => $item4), $choiceList->getChoices());
|
||||
$this->assertEquals(array(
|
||||
'Group1' => array(1 => new ChoiceView('1', 'Foo'), 2 => new ChoiceView('2', 'Bar')),
|
||||
'Group2' => array(3 => new ChoiceView('3', 'Baz')),
|
||||
4 => new ChoiceView('4', 'Boo!')
|
||||
'Group1' => array(1 => new ChoiceView($item1, '1', 'Foo'), 2 => new ChoiceView($item2, '2', 'Bar')),
|
||||
'Group2' => array(3 => new ChoiceView($item3, '3', 'Baz')),
|
||||
4 => new ChoiceView($item4, '4', 'Boo!')
|
||||
), $choiceList->getRemainingViews());
|
||||
}
|
||||
|
||||
|
@ -86,8 +86,8 @@ class ModelChoiceListTest extends Propel1TestCase
|
||||
|
||||
$this->assertSame(array(1 => $item1, 2 => $item2), $choiceList->getChoices());
|
||||
$this->assertEquals(array(
|
||||
'group1' => array(1 => new ChoiceView('1', 'Foo')),
|
||||
'group2' => array(2 => new ChoiceView('2', 'Bar'))
|
||||
'group1' => array(1 => new ChoiceView($item1, '1', 'Foo')),
|
||||
'group2' => array(2 => new ChoiceView($item2, '2', 'Bar'))
|
||||
), $choiceList->getRemainingViews());
|
||||
}
|
||||
|
||||
@ -113,9 +113,9 @@ class ModelChoiceListTest extends Propel1TestCase
|
||||
|
||||
$this->assertEquals(array(1 => $item1, 2 => $item2, 3 => $item3, 4 => $item4), $choiceList->getChoices());
|
||||
$this->assertEquals(array(
|
||||
'Group1' => array(1 => new ChoiceView('1', 'Foo'), 2 => new ChoiceView('2', 'Bar')),
|
||||
'Group2' => array(3 => new ChoiceView('3', 'Baz')),
|
||||
4 => new ChoiceView('4', 'Boo!')
|
||||
'Group1' => array(1 => new ChoiceView($item1, '1', 'Foo'), 2 => new ChoiceView($item2, '2', 'Bar')),
|
||||
'Group2' => array(3 => new ChoiceView($item3, '3', 'Baz')),
|
||||
4 => new ChoiceView($item4, '4', 'Boo!')
|
||||
), $choiceList->getRemainingViews());
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user