Merge branch '4.3' into 4

silverstripe · Aug 27, 2023 · 0e1ac38 · 0e1ac38
2 parents 5458790 + 868bf6a
commit 0e1ac38
Showing 1 changed file with 30 additions and 18 deletions.
diff --git a/tests/Schema/DataObject/InheritanceBuilderTest.php b/tests/Schema/DataObject/InheritanceBuilderTest.php
@@ -25,6 +25,7 @@
 use SilverStripe\GraphQL\Tests\Fake\Inheritance\MySubclass;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Core\Injector\SilverStripeServiceConfigurationLocator;
 
 class InheritanceBuilderTest extends SapphireTest
 {
@@ -323,24 +324,35 @@ private function assertFields(array $fields, Type $type)
 
     public function testFillAncestryInjectorSubclass()
     {
-        Config::modify()->merge(Injector::class, MyOrig::class, ['class' => MySubclass::class]);
-        $obj = MyOrig::create();
-        $this->assertSame(MySubclass::class, get_class($obj));
-        $schema = new TestSchema();
-        $schema->applyConfig([
-            'models' => [
-                MyOrig::class => [
-                    'fields' => [
-                        'MyField' => true,
-                        'MySubclassField' => true,
+        // Update configLocator of the Injector inst() in order to clear the cache in
+        // SilverStripeServiceConfigurationLocator() which has no API to clear the cache.
+        // This is done to fix bleed over from the unit test UsedOnTableTest::getUsage()
+        // which will cache the config for MyOrig::class as that test will automatically
+        // cache config for most DataObjects
+        Injector::inst()->setConfigLocator(new SilverStripeServiceConfigurationLocator());
+        try {
+            Config::modify()->set(Injector::class, MyOrig::class, ['class' => MySubclass::class]);
+            $obj = MyOrig::create();
+            $this->assertSame(MySubclass::class, get_class($obj));
+            $schema = new TestSchema();
+            $schema->applyConfig([
+                'models' => [
+                    MyOrig::class => [
+                        'fields' => [
+                            'MyField' => true,
+                            'MySubclassField' => true,
+                        ],
                     ],
-                ],
-            ]
-        ]);
-        $schema->createStoreableSchema();
-        $modelType = $schema->getModelByClassName(MySubclass::class);
-        $builder = new InheritanceBuilder($schema);
-        $builder->fillAncestry($modelType);
-        $this->assertFields(['id', 'MyField', 'MySubclassField'], $modelType);
+                ]
+            ]);
+            $schema->createStoreableSchema();
+            $modelType = $schema->getModelByClassName(MySubclass::class);
+            $builder = new InheritanceBuilder($schema);
+            $builder->fillAncestry($modelType);
+            $this->assertFields(['id', 'MyField', 'MySubclassField'], $modelType);
+        } finally {
+            // reset the cache again to prevent bleed over into any other tests
+            Injector::inst()->setConfigLocator(new SilverStripeServiceConfigurationLocator());
+        }
     }
 }