From 956df37c2c15e35833d34a7e10d04b0705fa8abb Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 12 Apr 2010 08:38:45 +0000 Subject: [PATCH] MINOR Fixed merge error (see r99654) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102464 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/model/ComponentSetTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/model/ComponentSetTest.php b/tests/model/ComponentSetTest.php index 586ecff89..5f91d3b6b 100644 --- a/tests/model/ComponentSetTest.php +++ b/tests/model/ComponentSetTest.php @@ -7,6 +7,11 @@ class ComponentSetTest extends SapphireTest { static $fixture_file = 'sapphire/tests/model/ComponentSetTest.yml'; + protected $extraDataObjects = array( + 'ComponentSetTest_Player', + 'ComponentSetTest_Team' + ); + function testSetByIDListManyMany() { $team1 = $this->objFromFixture('ComponentSetTest_Team', 'team1'); $player1_team1 = $this->objFromFixture('ComponentSetTest_Player', 'player1_team1');