mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Fix merge error
This commit is contained in:
parent
e592bed3e5
commit
fb09e0b65f
@ -25,18 +25,6 @@ class GridFieldAddNewButtonTest extends SapphireTest
|
|||||||
Category::class,
|
Category::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
public function setUp()
|
|
||||||
{
|
|
||||||
parent::setUp();
|
|
||||||
Injector::nest();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function tearDown()
|
|
||||||
{
|
|
||||||
parent::tearDown();
|
|
||||||
Injector::unnest();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testButtonPassesParentContextToSingletonWhenRelationListIsUsed()
|
public function testButtonPassesParentContextToSingletonWhenRelationListIsUsed()
|
||||||
{
|
{
|
||||||
$group = $this->objFromFixture(PeopleGroup::class, 'group');
|
$group = $this->objFromFixture(PeopleGroup::class, 'group');
|
||||||
|
Loading…
Reference in New Issue
Block a user