Skip to content

Commit a31cfef

Browse files
committed
fix(tests): purged iris may be in random order
1 parent f1fbc1c commit a31cfef

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/Symfony/Doctrine/EventListener/PurgeHttpCacheListener.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ private function gatherResourceAndItemTags(object $entity, bool $purgeItem): voi
133133
$this->addTagForItem($entity);
134134
}
135135
} catch (OperationNotFoundException|InvalidArgumentException $e) {
136-
dd($e);
137136
}
138137
}
139138
}

src/Symfony/Tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testOnFlush(): void
7373
$iriConverterProphecy->getIriFromResource($toUpdate2)->willReturn('/dummies/2')->shouldBeCalled();
7474
$iriConverterProphecy->getIriFromResource($toDelete1)->willReturn('/dummies/3')->shouldBeCalled();
7575
$iriConverterProphecy->getIriFromResource($toDelete2)->willReturn('/dummies/4')->shouldBeCalled();
76-
$iriConverterProphecy->getIriFromResource(Argument::type(DummyNoGetOperation::class), UrlGeneratorInterface::ABS_PATH, new GetCollection())->willThrow(new InvalidArgumentException())->shouldBeCalled();
76+
$iriConverterProphecy->getIriFromResource(Argument::type(DummyNoGetOperation::class), UrlGeneratorInterface::ABS_PATH, new GetCollection())->willThrow(new InvalidArgumentException('lulz'))->shouldBeCalled();
7777
$iriConverterProphecy->getIriFromResource(Argument::any())->willThrow(new ItemNotFoundException());
7878

7979
$resourceClassResolverProphecy = $this->prophesize(ResourceClassResolverInterface::class);
@@ -232,7 +232,7 @@ public function testAddTagsForCollection(): void
232232
$collection = [$dummy1, $dummy2];
233233

234234
$purgerProphecy = $this->prophesize(PurgerInterface::class);
235-
$purgerProphecy->purge(['/dummies', '/dummies/1', '/dummies/2'])->shouldBeCalled();
235+
$purgerProphecy->purge(['/dummies/1', '/dummies/2', '/dummies'])->shouldBeCalled();
236236

237237
$iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
238238
$iriConverterProphecy->getIriFromResource(Argument::type(Dummy::class), UrlGeneratorInterface::ABS_PATH, new GetCollection())->willReturn('/dummies')->shouldBeCalled();

tests/Behat/HttpCacheContext.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,14 @@ public function irisShouldBePurged(string $iris): void
5050
{
5151
$purger = $this->driverContainer->get('test.api_platform.http_cache.purger');
5252

53-
$purgedIris = implode(',', $purger->getIris());
53+
$iris = explode(',', $iris);
54+
sort($iris);
55+
$iris = implode(',', $iris);
56+
57+
$purgedIris = $purger->getIris();
58+
sort($purgedIris);
59+
$purgedIris = implode(',', $purgedIris);
60+
5461
$purger->clear();
5562

5663
if ($iris !== $purgedIris) {

0 commit comments

Comments
 (0)