Simplify and add test coverage

Author: chrispenny

src/Service/FixtureService.php

@@ -570,14 +570,6 @@ private function addDataObjectManyManyThroughFields(DataObject $dataObject): voi
             $relatedObjects = $dataObject->relField($relationFieldName);
 
             foreach ($relatedObjects as $relatedObject) {
-                // Check to see if this class has requested that it not be included in relationship maps
-                $excludeClass = Config::inst()->get($relatedObject->ClassName, 'exclude_from_fixture_relationships');
-
-                // Yup, exclude this class
-                if ($excludeClass) {
-                    continue;
-                }
-
                 // Add the related DataObject as one of our resolved relationships
                 $resolvedRelationships[] = sprintf('=>%s.%s', $relatedObject->ClassName, $relatedObject->ID);
 

tests/Service/FixtureServiceTest.php

@@ -172,6 +172,84 @@ public function testManyManyRelationship(): void
         $this->assertSame($expected, $parsed);
     }
 
+    public function testManyManyTagExcludeFromFixtureRelationships(): void
+    {
+        MockTag::config()->set('exclude_from_fixture_relationships', true);
+
+        $page = MockPage::create();
+        $page->Title = 'Page Excluding Tags';
+        $page->write();
+
+        $tag = MockTag::create();
+        $tag->Title = 'Excluded Tag';
+        $tag->write();
+
+        $page->Tags()->add($tag);
+
+        $service = new FixtureService();
+        $service->addDataObject($page);
+
+        $expected = [
+            MockPage::class => [
+                $page->ID => ['Title' => 'Page Excluding Tags'],
+            ],
+        ];
+
+        $this->assertSame($expected, Yaml::parse($service->outputFixture()));
+    }
+
+    public function testManyManyPageExcludedFromFixtureRelationships(): void
+    {
+        MockPage::config()->set('excluded_fixture_relationships', ['Tags']);
+
+        $page = MockPage::create();
+        $page->Title = 'Page Excluding Tags Relation';
+        $page->write();
+
+        $tag = MockTag::create();
+        $tag->Title = 'Excluded Via Relation';
+        $tag->write();
+
+        $page->Tags()->add($tag);
+
+        $service = new FixtureService();
+        $service->addDataObject($page);
+
+        $expected = [
+            MockPage::class => [
+                $page->ID => ['Title' => 'Page Excluding Tags Relation'],
+            ],
+        ];
+
+        $this->assertSame($expected, Yaml::parse($service->outputFixture()));
+    }
+
+    public function testManyManyThroughExcludedFixtureRelationships(): void
+    {
+        MockPage::config()->set('excluded_fixture_relationships', ['ThroughTargets']);
+
+        $page = MockPage::create();
+        $page->Title = 'Page Excluding Through';
+        $page->write();
+
+        $target = MockThroughTarget::create();
+        $target->Title = 'Excluded Through Target';
+        $target->write();
+
+        $page->ThroughTargets()->add($target);
+
+        $service = new FixtureService();
+        $service->addDataObject($page);
+
+        $expected = [
+            MockPage::class => [
+                $page->ID => ['Title' => 'Page Excluding Through'],
+            ],
+        ];
+
+        $this->assertSame($expected, Yaml::parse($service->outputFixture()));
+    }
+
     public function testManyManyThroughRelationship(): void
     {
         $page = MockPage::create();