From 0e5426c0d7777748eab1e56d60434453e9ac76b1 Mon Sep 17 00:00:00 2001 From: jean Date: Mon, 11 Feb 2013 15:38:56 +1300 Subject: [PATCH] FIX Do not use hardcoded IDs in tests, as records from fixture might not start at 1 --- tests/forms/GridFieldSortableRowsTest.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/forms/GridFieldSortableRowsTest.php b/tests/forms/GridFieldSortableRowsTest.php index 42ecb5d..d803b79 100644 --- a/tests/forms/GridFieldSortableRowsTest.php +++ b/tests/forms/GridFieldSortableRowsTest.php @@ -27,21 +27,27 @@ class GridFieldSortableRowsTest extends SapphireTest { public function testSortActionWithoutCorrectPermission() { if(Member::currentUser()) { Member::currentUser()->logOut(); } $this->setExpectedException('ValidationException'); + $team1 = $this->objFromFixture('GridFieldAction_SortOrder_Team', 'team1'); + $team2 = $this->objFromFixture('GridFieldAction_SortOrder_Team', 'team2'); + $team3 = $this->objFromFixture('GridFieldAction_SortOrder_Team', 'team3'); $stateID = 'testGridStateActionField'; Session::set($stateID, array('grid'=>'', 'actionName'=>'saveGridRowSort', 'args'=>array('GridFieldSortableRows'=>array('sortableToggle'=>true)))); - $request = new SS_HTTPRequest('POST', 'url', array('ItemIDs'=>'1,3,2'), array('action_gridFieldAlterAction?StateID='.$stateID=>true)); + $request = new SS_HTTPRequest('POST', 'url', array('ItemIDs'=>"$team1->ID, $team3->ID, $team2->ID"), array('action_gridFieldAlterAction?StateID='.$stateID=>true)); $this->gridField->gridFieldAlterAction(array('StateID'=>$stateID), $this->form, $request); - $this->assertEquals(3, $this->list->last()->ID, 'User should\'t be able to sort records without correct permissions.'); + $this->assertEquals($team3->ID, $this->list->last()->ID, 'User should\'t be able to sort records without correct permissions.'); } public function testSortActionWithAdminPermission() { + $team1 = $this->objFromFixture('GridFieldAction_SortOrder_Team', 'team1'); + $team2 = $this->objFromFixture('GridFieldAction_SortOrder_Team', 'team2'); + $team3 = $this->objFromFixture('GridFieldAction_SortOrder_Team', 'team3'); $this->logInWithPermission('ADMIN'); $stateID = 'testGridStateActionField'; Session::set($stateID, array('grid'=>'', 'actionName'=>'saveGridRowSort', 'args'=>array('GridFieldSortableRows'=>array('sortableToggle'=>true)))); - $request = new SS_HTTPRequest('POST', 'url', array('ItemIDs'=>'1,3,2'), array('action_gridFieldAlterAction?StateID='.$stateID=>true)); + $request = new SS_HTTPRequest('POST', 'url', array('ItemIDs'=>"$team1->ID, $team3->ID, $team2->ID"), array('action_gridFieldAlterAction?StateID='.$stateID=>true)); $this->gridField->gridFieldAlterAction(array('StateID'=>$stateID), $this->form, $request); - $this->assertEquals(2, $this->list->last()->ID, 'User should be able to sort records with ADMIN permission.'); + $this->assertEquals($team2->ID, $this->list->last()->ID, 'User should be able to sort records with ADMIN permission.'); } }