tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

Fixed merge errors

Browse Source 
- HTML identifier changes in master breaking tests
- Regression from b6b3cd9889 in GridFieldSortableHeader (var capitalisation)
This commit is contained in:
Ingo Schommer 2013-12-06 14:11:00 +01:00
parent b1fa2d282e
commit 740560c487
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forms/gridfield/GridFieldSortableHeader.php
View File

@ -203,7 +203,7 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
$state = $gridField->State->GridFieldSortableHeader;
$sortColumn = $state->SortColumn();
if (empty($sortcolumn)) {
if (empty($sortColumn)) {
return $dataList;
}

4
tests/forms/gridfield/GridFieldDetailFormTest.php
View File

@ -238,8 +238,8 @@ class GridFieldDetailFormTest extends FunctionalTest {
$response = $this->get($addLink);
$parser = new CSSContentParser($response->getBody());
$title = $parser->getBySelector('#GroupID span');
$id = $parser->getBySelector('#GroupID input');
$title = $parser->getBySelector('#Form_ItemEditForm_GroupID_Holder span');
$id = $parser->getBySelector('#Form_ItemEditForm_GroupID_Holder input');
$this->assertEquals($group->Name, (string) $title[0]);
$this->assertEquals($group->ID, (string) $id[0]['value']);

2
tests/forms/gridfield/GridFieldSortableHeaderTest.php
View File

@ -31,7 +31,7 @@ class GridFieldSortableHeaderTest extends SapphireTest {
// Check that the output shows name and hat as sortable fields, but not city
$this->assertContains('<span class="non-sortable">City</span>', $htmlFragment['header']);
$this->assertContains('value="Name" class="action ss-gridfield-sort" id="action_SetOrderName"', $htmlFragment['header']);
$this->assertContains('value="Cheerleader Hat" class="action ss-gridfield-sort" id="action_SetOrderCheerleader-Hat-Colour"', $htmlFragment['header']);
$this->assertContains('value="Cheerleader Hat" class="action ss-gridfield-sort" id="action_SetOrderCheerleader.Hat.Colour"', $htmlFragment['header']);
// Check inverse of above
$this->assertNotContains('value="City" class="action ss-gridfield-sort" id="action_SetOrderCity"', $htmlFragment['header']);