test: fix tests

Author: Andy Ford

tests/Discord/FlowMeasure/Helper/NotificationReissuerTest.php

@@ -53,7 +53,9 @@ public function testItHasAFlowMeasure()
 
     public function testItsAReissueIfItsNotifiedAndTheIdentifierHasChanged()
     {
-        $previousNotification = DivisionDiscordNotification::factory()->create();
+        $previousNotification = DivisionDiscordNotification::factory()
+            ->toDivisionWebhook($this->webhook)
+            ->create();
         $this->flowMeasure->divisionDiscordNotifications()->sync(
             [
                 $previousNotification->id => [
@@ -78,7 +80,9 @@ public function testItsAReissueIfItsNotifiedAndTheIdentifierHasChanged()
 
     public function testItsAReissueIfItsActivatedAndTheIdentifierHasChanged()
     {
-        $previousNotification = DivisionDiscordNotification::factory()->create();
+        $previousNotification = DivisionDiscordNotification::factory()
+            ->toDivisionWebhook($this->webhook)
+            ->create();
         $this->flowMeasure->divisionDiscordNotifications()->sync(
             [
                 $previousNotification->id => [
@@ -103,7 +107,9 @@ public function testItsAReissueIfItsActivatedAndTheIdentifierHasChanged()
 
     public function testItsAReissueIfItWasNotifiedAndTheIdentifierHasChangedForActivation()
     {
-        $previousNotification = DivisionDiscordNotification::factory()->create();
+        $previousNotification = DivisionDiscordNotification::factory()
+            ->toDivisionWebhook($this->webhook)
+            ->create();
         $this->flowMeasure->divisionDiscordNotifications()->sync(
             [
                 $previousNotification->id => [
@@ -206,7 +212,9 @@ public function testItsAReissueIfItsActivatedOnADifferentDivisionWebhook()
 
     public function testItIsNotAReissueIfItsNotifiedAndTheIdentifierHasNotChanged()
     {
-        $previousNotification = DivisionDiscordNotification::factory()->create();
+        $previousNotification = DivisionDiscordNotification::factory()
+            ->toDivisionWebhook($this->webhook)
+            ->create();
         $this->flowMeasure->divisionDiscordNotifications()->sync(
             [
                 $previousNotification->id => [
@@ -231,7 +239,9 @@ public function testItIsNotAReissueIfItsNotifiedAndTheIdentifierHasNotChanged()
 
     public function testItIsNotAReissueIfItsActivatedAndTheIdentifierHasNotChanged()
     {
-        $previousNotification = DivisionDiscordNotification::factory()->create();
+        $previousNotification = DivisionDiscordNotification::factory()
+            ->toDivisionWebhook($this->webhook)
+            ->create();
         $this->flowMeasure->divisionDiscordNotifications()->sync(
             [
                 $previousNotification->id => [
@@ -256,7 +266,9 @@ public function testItIsNotAReissueIfItsActivatedAndTheIdentifierHasNotChanged()
 
     public function testItIsNotAReissueIfItsNotifiedAndThenActivatedTheIdentifierHasNotChanged()
     {
-        $previousNotification = DivisionDiscordNotification::factory()->create();
+        $previousNotification = DivisionDiscordNotification::factory()
+            ->toDivisionWebhook($this->webhook)
+            ->create();
         $this->flowMeasure->divisionDiscordNotifications()->sync(
             [
                 $previousNotification->id => [
@@ -307,7 +319,9 @@ public function testItIsNotAReissueIfItsNotifiedAndNeverBeenActivated()
 
     public function testItIsNotAReissueIfItsWithdrawn()
     {
-        $previousNotification = DivisionDiscordNotification::factory()->create();
+        $previousNotification = DivisionDiscordNotification::factory()
+            ->toDivisionWebhook($this->webhook)
+            ->create();
         $this->flowMeasure->divisionDiscordNotifications()->sync(
             [
                 $previousNotification->id => [
@@ -332,7 +346,9 @@ public function testItIsNotAReissueIfItsWithdrawn()
 
     public function testItIsNotAReissueIfItsExpired()
     {
-        $previousNotification = DivisionDiscordNotification::factory()->create();
+        $previousNotification = DivisionDiscordNotification::factory()
+            ->toDivisionWebhook($this->webhook)
+            ->create();
         $this->flowMeasure->divisionDiscordNotifications()->sync(
             [
                 $previousNotification->id => [

tests/Discord/FlowMeasure/Webhook/WebhookMapperTest.php

@@ -89,7 +89,11 @@ function (FlightInformationRegion $flightInformationRegion) {
         $this->filter->shouldReceive('shouldUseWebhook')
             ->andReturnTrue();
 
-        $this->assertCount(3, $this->mapper->mapToWebhooks($flowMeasure));
+        $this->assertCount(2, $this->mapper->mapToWebhooks($flowMeasure));
+        $this->assertEquals(
+            DivisionDiscordWebhook::all()->pluck('id'),
+            $this->mapper->mapToWebhooks($flowMeasure)->map(fn (WebhookInterface $webhook) => $webhook->id())
+        );
     }
 
     public function testItDeduplicatesWebhooks()
@@ -129,9 +133,9 @@ function (FlightInformationRegion $flightInformationRegion) use ($webhook1) {
         $this->filter->shouldReceive('shouldUseWebhook')
             ->andReturnTrue();
 
-        $this->assertCount(3, $this->mapper->mapToWebhooks($flowMeasure));
+        $this->assertCount(2, $this->mapper->mapToWebhooks($flowMeasure));
         $this->assertEquals(
-            new Collection([null, $webhook1->id, $webhook2->id]),
+            new Collection([$webhook1->id, $webhook2->id]),
             $this->mapper->mapToWebhooks($flowMeasure)->map(fn (WebhookInterface $webhook) => $webhook->id())
         );
     }