Merge branch '7.0' into 7

silverstripe · Jan 22, 2025 · 14cec02 · 14cec02
2 parents 0916acc + e45687d
commit 14cec02
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/tests/php/Extension/Engine/SiteTreePublishingEngineTest.php b/tests/php/Extension/Engine/SiteTreePublishingEngineTest.php
@@ -26,6 +26,10 @@ class SiteTreePublishingEngineTest extends SapphireTest
 {
     protected static $fixture_file = 'SiteTreePublishingEngineTest.yml';
 
+    protected static $extra_dataobjects = [
+        DataObjectNoTrigger::class,
+    ];
+
     protected static $required_extensions = [
         SiteTree::class => [
             PublishableSiteTree::class,
@@ -246,7 +250,8 @@ public function testStaticPublishingTriggerOnExtension(): void
         /** @var QueuedJobsTestService $service */
         $service = QueuedJobService::singleton();
 
-        $dataObject = DataObjectNoTrigger::create()->write();
+        $dataObject = DataObjectNoTrigger::create();
+        $dataObject->write();
         $dataObject->publishRecursive();
 
         $jobs = $service->getJobs();

diff --git a/tests/php/StaticPublisherTest/Model/DataObjectNoTrigger.php b/tests/php/StaticPublisherTest/Model/DataObjectNoTrigger.php
@@ -7,9 +7,10 @@
 
 class DataObjectNoTrigger extends DataObject implements TestOnly
 {
+    private static $table_name = 'StaticPublishQueue_DataObjectNoTrigger';
+
     public function AbsoluteLink()
     {
         return 'http://example.com/subpage/dataobject-1';
     }
 }
-
diff --git a/tests/php/StaticPublisherTest/Model/ExtensionAddsTrigger.php b/tests/php/StaticPublisherTest/Model/ExtensionAddsTrigger.php
@@ -24,4 +24,3 @@ public function objectsToDelete($context)
         return [];
     }
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,3 @@ public function objectsToDelete($context)
		return [];
		}
		}