From 75d7de9aa6c7eb9d6f18ab22b87048a20586144c Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 14 Dec 2017 17:57:03 +1300
Subject: [PATCH] FIX Add extra DataObject stub to CommentsGridFieldActionTest
 and update expectations

---
 tests/CommentsGridFieldActionTest.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/tests/CommentsGridFieldActionTest.php b/tests/CommentsGridFieldActionTest.php
index 947aec7..126ae47 100644
--- a/tests/CommentsGridFieldActionTest.php
+++ b/tests/CommentsGridFieldActionTest.php
@@ -12,8 +12,10 @@ use SilverStripe\Control\Controller;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
+use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldDeleteAction;
 use SilverStripe\Forms\Tests\GridField\GridFieldTest\Team;
+use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 
@@ -21,6 +23,10 @@ class CommentsGridFieldActionTest extends SapphireTest
 {
     protected $usesDatabase = true;
 
+    protected static $extra_dataobjects = [
+        CommentableItem::class,
+    ];
+
     /** @var ArrayList */
     protected $list;
 
@@ -30,7 +36,7 @@ class CommentsGridFieldActionTest extends SapphireTest
     /** @var Form */
     protected $form;
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
         $this->list = new DataList(Team::class);
@@ -90,25 +96,26 @@ class CommentsGridFieldActionTest extends SapphireTest
         $recordID = $record->ID;
         $html = $action->getColumnContent($this->gridField, $record, Comment::class);
         $this->assertContains('data-url="admin/comments/mockform/field/testfield', $html);
-        $spamAction = 'value="Spam" class="action" id="action_CustomAction' . $recordID . 'Spam"';
-        $this->assertContains($spamAction, $html);
 
-        $approveAction = 'value="Approve" class="action" id="action_CustomAction' . $recordID . 'Approve"';
-        $this->assertContains($approveAction, $html);
+        $this->assertContains('value="Spam"', $html);
+        $this->assertContains('id="action_CustomAction' . $recordID . 'Spam"', $html);
+
+        $this->assertContains('value="Approve"', $html);
+        $this->assertContains('id="action_CustomAction' . $recordID . 'Approve"', $html);
 
         // If marked as spam, only the approve button should be available
         $record->markSpam();
         $record->write();
         $html = $action->getColumnContent($this->gridField, $record, Comment::class);
-        $this->assertContains($approveAction, $html);
-        $this->assertNotContains($spamAction, $html);
+        $this->assertContains('value="Approve"', $html);
+        $this->assertNotContains('value="Spam"', $html);
 
         // If marked as spam, only the approve button should be available
         $record->markApproved();
         $record->write();
         $html = $action->getColumnContent($this->gridField, $record, Comment::class);
-        $this->assertNotContains($approveAction, $html);
-        $this->assertContains($spamAction, $html);
+        $this->assertNotContains('value="Approve"', $html);
+        $this->assertContains('value="Spam"', $html);
     }
 
     public function testGetActions()