Merge pull request #5830 from magento-tsg/MC-35305

[TSG] MC-35305: [Unit] Magento.Test.Workaround.Override.Fixture.Applier.ConfigFixtureTest failed

Author: zakdma

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Workaround/Override/Fixture/Applier/ConfigFixtureTest.php

@@ -23,7 +23,6 @@ class ConfigFixtureTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->markTestSkipped('MC-35305');
         parent::setUp();
 
         $this->object = new ConfigFixture();
@@ -485,6 +484,7 @@ private function processApply(array $existingFixtures, array $config): array
      */
     private function setConfig(array $config): void
     {
+        $this->object->setGlobalConfig([]);
         $this->object->setClassConfig([]);
         $this->object->setDataSetConfig([]);
         $this->object->setMethodConfig($config);

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Workaround/Override/Fixture/Applier/DataFixtureTest.php

@@ -23,7 +23,6 @@ class DataFixtureTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->markTestSkipped('MC-35305');
         parent::setUp();
 
         $this->object = new DataFixture();
@@ -35,8 +34,11 @@ protected function setUp(): void
     public function testGetPrioritizedConfig(): void
     {
         $this->object = $this->getMockBuilder(DataFixture::class)
-            ->setMethods(['getClassConfig', 'getMethodConfig', 'getDataSetConfig'])
+            ->setMethods(['getGlobalConfig','getClassConfig', 'getMethodConfig', 'getDataSetConfig'])
             ->getMock();
+        $this->object->expects($this->once())
+            ->method('getGlobalConfig')
+            ->willReturn(['global_config']);
         $this->object->expects($this->once())
             ->method('getClassConfig')
             ->willReturn(['class_config']);
@@ -47,6 +49,7 @@ public function testGetPrioritizedConfig(): void
             ->method('getDataSetConfig')
             ->willReturn(['data_set_config']);
         $expectedResult = [
+            ['global_config'],
             ['class_config'],
             ['method_config'],
             ['data_set_config'],
@@ -272,6 +275,7 @@ private function processApply(array $existingFixtures, array $config): array
      */
     private function setConfig(array $config): void
     {
+        $this->object->setGlobalConfig([]);
         $this->object->setClassConfig([]);
         $this->object->setDataSetConfig([]);
         $this->object->setMethodConfig($config);