Permalink
Browse files

Merge pull request #229 from halkyon/master

Renamed test GridFieldToolbarHeaderTest classes (sorry for so many commits!)
  • Loading branch information...
sminnee committed Mar 9, 2012
2 parents 0c93d31 + 033a1e5 commit 193288a021c60fdba04ec382390fe2030457fc74
@@ -4,7 +4,7 @@ class GridFieldToolbarHeaderTest extends SapphireTest {
static $fixture_file = 'GridFieldToolbarHeaderTest.yml';
protected $extraDataObjects = array(
- 'GridFieldDetailFormTest_Company',
+ 'GridFieldToolbarHeaderTest_Company',
);
public function testGridTitleAddNewEnabled() {
@@ -13,7 +13,7 @@ public function testGridTitleAddNewEnabled() {
$config = new GridFieldConfig();
$config->addComponent($titleField = new GridFieldToolbarHeader());
$actions = new FieldList();
- $grid = new GridField('TestField', 'Test Field', new DataList('GridFieldDetailFormTest_Company'),$config);
+ $grid = new GridField('TestField', 'Test Field', new DataList('GridFieldToolbarHeaderTest_Company'),$config);
$fields = new FieldList($rootTab = new TabSet("Root",$tabMain = new Tab('Main',$grid)));
$form = new Form(Controller::curr(), "TestForm", $fields, $actions);
@@ -28,7 +28,7 @@ public function testGridTitleAddNewDisabled() {
$config = new GridFieldConfig();
$config->addComponent($titleField = new GridFieldToolbarHeader());
$actions = new FieldList();
- $grid = new GridField('TestField', 'Test Field', new DataList('GridFieldDetailFormTest_Company'),$config);
+ $grid = new GridField('TestField', 'Test Field', new DataList('GridFieldToolbarHeaderTest_Company'),$config);
$fields = new FieldList($rootTab = new TabSet("Root",$tabMain = new Tab('Main',$grid)));
$form = new Form(Controller::curr(), "TestForm", $fields, $actions);
@@ -41,15 +41,15 @@ public function testGridTitleAddNewWithoutPermission() {
if(Member::currentUser()) { Member::currentUser()->logOut(); }
$config = new GridFieldConfig();
$config->addComponent($titleField = new GridFieldToolbarHeader());
- $grid = new GridField('TestField', 'Test Field', new DataList('GridFieldDetailFormTest_Company'),$config);
+ $grid = new GridField('TestField', 'Test Field', new DataList('GridFieldToolbarHeaderTest_Company'),$config);
$fields = new FieldList(new TabSet("Root",$tabMain = new Tab('Main',$grid)));
$form = new Form(Controller::curr(), "TestForm", $fields, new FieldList());
$html = $form->forTemplate();
$this->assertNotContains('data-icon="add"', $html, "HTML should not contain the 'add new' button");
}
}
-class GridFieldDetailFormTest_Company extends DataObject implements TestOnly {
+class GridFieldToolbarHeaderTest_Company extends DataObject implements TestOnly {
public static $db = array(
'Name' => 'Varchar(100)'
@@ -1,4 +1,4 @@
-GridFieldDetailFormTest_Company:
+GridFieldToolbarHeaderTest_Company:
test-company-1:
Name: Test company 1
test-company-2:

0 comments on commit 193288a

Please sign in to comment.