Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded to Symfony 2.6 compatible form types (#374) #376

Merged
merged 3 commits into from
Jun 4, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated tests
  • Loading branch information
althaus committed Jun 4, 2015
commit 1b6eaa3d4e14f8ba208aabc1444c04288dea9492
8 changes: 4 additions & 4 deletions Tests/Form/Type/BootstrapCollectionTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ public function testBuildView()
}

/**
* @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\BootstrapCollectionType::setDefaultOptions()
* @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\BootstrapCollectionType::configureOptions()
*/
public function testSetDefaultOptions()
public function testConfigureOptions()
{
$resolver = m::mock('Symfony\Component\OptionsResolver\OptionsResolverInterface');
$resolver = m::mock('Symfony\Component\OptionsResolver\OptionsResolver');
$resolver->shouldReceive('setDefaults');
$resolver->shouldReceive('setNormalizers');

$this->type->setDefaultOptions($resolver);
$this->type->configureOptions($resolver);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions Tests/Form/Type/FormActionsTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function testBuildViewWithBadField()
$this->type->buildView($view, $form, $options);
}

public function testSetDefaultOptions()
public function testConfigureOptions()
{

$defaults = array(
Expand All @@ -99,10 +99,10 @@ public function testSetDefaultOptions()
'mapped' => false,
);

$resolver = m::mock('Symfony\Component\OptionsResolver\OptionsResolverInterface');
$resolver = m::mock('Symfony\Component\OptionsResolver\OptionsResolver');
$resolver->shouldReceive('setDefaults')->with($defaults)->once();

$this->type->setDefaultOptions($resolver);
$this->type->configureOptions($resolver);
}

public function testGetName()
Expand Down