Skip to content

Commit 4a68021

Browse files
Merge branch 'MC-32940' into 2.4-develop-com-int-improve-pr2
2 parents d8c77f3 + abfdb46 commit 4a68021

File tree

1 file changed

+12
-4
lines changed
  • dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Fixture

1 file changed

+12
-4
lines changed

dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Fixture/Resolver.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ public function requireDataFixture(string $path): void
127127
*/
128128
public function applyConfigFixtures(TestCase $test, array $fixtures, string $fixtureType): array
129129
{
130-
return $this->getApplier($test, $fixtureType)->apply($fixtures);
130+
$skipConfig = $this->config->getSkipConfiguration($test);
131+
132+
return $skipConfig['skip']
133+
? []
134+
: $this->getApplier($test, $fixtureType)->apply($fixtures);
131135
}
132136

133137
/**
@@ -136,10 +140,14 @@ public function applyConfigFixtures(TestCase $test, array $fixtures, string $fix
136140
public function applyDataFixtures(TestCase $test, array $fixtures, string $fixtureType): array
137141
{
138142
$result = [];
139-
$fixtures = $this->getApplier($test, $fixtureType)->apply($fixtures);
143+
$skipConfig = $this->config->getSkipConfiguration($test);
144+
145+
if (!$skipConfig['skip']) {
146+
$fixtures = $this->getApplier($test, $fixtureType)->apply($fixtures);
140147

141-
foreach ($fixtures as $fixture) {
142-
$result[] = $this->processFixturePath($test, $fixture);
148+
foreach ($fixtures as $fixture) {
149+
$result[] = $this->processFixturePath($test, $fixture);
150+
}
143151
}
144152

145153
return $result;

0 commit comments

Comments
 (0)