Merge branch 'model-support-for-database-assertions' into 8.x

Author: taylorotwell

src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php

@@ -17,15 +17,15 @@ trait InteractsWithDatabase
     /**
      * Assert that a given where condition exists in the database.
      *
-     * @param  string  $table
+     * @param  \Illuminate\Database\Eloquent\Model|string  $table
      * @param  array  $data
      * @param  string|null  $connection
      * @return $this
      */
     protected function assertDatabaseHas($table, array $data, $connection = null)
     {
         $this->assertThat(
-            $table, new HasInDatabase($this->getConnection($connection), $data)
+            $this->getTable($table), new HasInDatabase($this->getConnection($connection), $data)
         );
 
         return $this;
@@ -34,7 +34,7 @@ protected function assertDatabaseHas($table, array $data, $connection = null)
     /**
      * Assert that a given where condition does not exist in the database.
      *
-     * @param  string  $table
+     * @param  \Illuminate\Database\Eloquent\Model|string  $table
      * @param  array  $data
      * @param  string|null  $connection
      * @return $this
@@ -45,23 +45,23 @@ protected function assertDatabaseMissing($table, array $data, $connection = null
             new HasInDatabase($this->getConnection($connection), $data)
         );
 
-        $this->assertThat($table, $constraint);
+        $this->assertThat($this->getTable($table), $constraint);
 
         return $this;
     }
 
     /**
      * Assert the count of table entries.
      *
-     * @param  string  $table
+     * @param  \Illuminate\Database\Eloquent\Model|string  $table
      * @param  int  $count
      * @param  string|null  $connection
      * @return $this
      */
     protected function assertDatabaseCount($table, int $count, $connection = null)
     {
         $this->assertThat(
-            $table, new CountInDatabase($this->getConnection($connection), $count)
+            $this->getTable($table), new CountInDatabase($this->getConnection($connection), $count)
         );
 
         return $this;
@@ -81,7 +81,7 @@ protected function assertDeleted($table, array $data = [], $connection = null)
             return $this->assertDatabaseMissing($table->getTable(), [$table->getKeyName() => $table->getKey()], $table->getConnectionName());
         }
 
-        $this->assertDatabaseMissing($table, $data, $connection);
+        $this->assertDatabaseMissing($this->getTable($table), $data, $connection);
 
         return $this;
     }
@@ -102,7 +102,7 @@ protected function assertSoftDeleted($table, array $data = [], $connection = nul
         }
 
         $this->assertThat(
-            $table, new SoftDeletedInDatabase($this->getConnection($connection), $data, $deletedAtColumn)
+            $this->getTable($table), new SoftDeletedInDatabase($this->getConnection($connection), $data, $deletedAtColumn)
         );
 
         return $this;
@@ -152,6 +152,17 @@ protected function getConnection($connection = null)
         return $database->connection($connection);
     }
 
+    /**
+     * Get the table name from the given model or string.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model|string  $table
+     * @return string
+     */
+    protected function getTable($table)
+    {
+        return is_subclass_of($table, Model::class) ? (new $table)->getTable() : $table;
+    }
+
     /**
      * Seed a given database connection.
      *

tests/Foundation/FoundationInteractsWithDatabaseTest.php

@@ -41,6 +41,14 @@ public function testSeeInDatabaseFindsResults()
         $this->assertDatabaseHas($this->table, $this->data);
     }
 
+    public function testAssertDatabaseHasSupportModels()
+    {
+        $this->mockCountBuilder(1);
+
+        $this->assertDatabaseHas(ProductStub::class, $this->data);
+        $this->assertDatabaseHas(new ProductStub, $this->data);
+    }
+
     public function testSeeInDatabaseDoesNotFindResults()
     {
         $this->expectException(ExpectationFailedException::class);
@@ -91,6 +99,14 @@ public function testDontSeeInDatabaseDoesNotFindResults()
         $this->assertDatabaseMissing($this->table, $this->data);
     }
 
+    public function testAssertDatabaseMissingSupportModels()
+    {
+        $this->mockCountBuilder(0);
+
+        $this->assertDatabaseMissing(ProductStub::class, $this->data);
+        $this->assertDatabaseMissing(new ProductStub, $this->data);
+    }
+
     public function testDontSeeInDatabaseFindsResults()
     {
         $this->expectException(ExpectationFailedException::class);
@@ -110,6 +126,14 @@ public function testAssertTableEntriesCount()
         $this->assertDatabaseCount($this->table, 1);
     }
 
+    public function testAssertDatabaseCountSupportModels()
+    {
+        $this->mockCountBuilder(1);
+
+        $this->assertDatabaseCount(ProductStub::class, 1);
+        $this->assertDatabaseCount(new ProductStub, 1);
+    }
+
     public function testAssertTableEntriesCountWrong()
     {
         $this->expectException(ExpectationFailedException::class);
@@ -168,6 +192,13 @@ public function testAssertSoftDeletedInDatabaseFindsResults()
         $this->assertSoftDeleted($this->table, $this->data);
     }
 
+    public function testAssertSoftDeletedSupportModelStrings()
+    {
+        $this->mockCountBuilder(1);
+
+        $this->assertSoftDeleted(ProductStub::class, $this->data);
+    }
+
     public function testAssertSoftDeletedInDatabaseDoesNotFindResults()
     {
         $this->expectException(ExpectationFailedException::class);
@@ -208,6 +239,13 @@ public function testAssertSoftDeletedInDatabaseDoesNotFindModelWithCustomColumnR
         $this->assertSoftDeleted(new CustomProductStub($this->data));
     }
 
+    public function testGetTableNameFromModel()
+    {
+        $this->assertEquals($this->table, $this->getTable(ProductStub::class));
+        $this->assertEquals($this->table, $this->getTable(new ProductStub));
+        $this->assertEquals($this->table, $this->getTable($this->table));
+    }
+
     protected function mockCountBuilder($countResult, $deletedAtColumn = 'deleted_at')
     {
         $builder = m::mock(Builder::class);