Merge pull request #15 from generationtux/fix-queue-db-desc-tests

generationtux · Sep 15, 2020 · b533791 · b533791
2 parents 00984b4 + cc3e11f
commit b533791
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/src/Checks/Laravel/DatabaseHealthCheck.php b/src/Checks/Laravel/DatabaseHealthCheck.php
@@ -91,12 +91,6 @@ public function setConnection($connection): void
      */
     public function description(): string
     {
-        $description = $this->description;
-
-        if (!$description) {
-            $description = $this->connection() ?: 'default';
-        }
-
-        return $description;
+        return $this->connection() ?: $this->description;;
     }
 }
diff --git a/src/Checks/Laravel/QueueHealthCheck.php b/src/Checks/Laravel/QueueHealthCheck.php
@@ -124,8 +124,6 @@ public function setName($name): void
      */
     public function description(): ?string
     {
-        $description = $this->description ?: $this->name();
-
-        return $description;
+        return $this->name() ?: $this->description;
     }
 }
diff --git a/tests/Checks/Laravel/DatabaseHealthCheckTest.php b/tests/Checks/Laravel/DatabaseHealthCheckTest.php
@@ -40,7 +40,7 @@ public function sets_connection_name()
     }
 
     /** @test */
-    public function if_no_description_is_set_use_the_connection_name()
+    public function if_no_connection_is_set_use_the_description()
     {
         $description = $this->db->description();
         $this->assertSame('Check the database connection.', $description); # if connection is also null

diff --git a/tests/Checks/Laravel/QueueHealthCheckTest.php b/tests/Checks/Laravel/QueueHealthCheckTest.php
@@ -42,10 +42,10 @@ public function sets_queue_name()
     }
 
     /** @test */
-    public function if_no_description_is_set_use_the_connection_name()
+    public function if_no_connection_is_set_use_the_description()
     {
         $description = $this->queue->description();
-        $this->assertNull($description);
+        $this->assertSame('Check the queue connection.', $description);
 
         $this->queue->setName('sqs');
         $description = $this->queue->description();