Skip to content

Commit 2d4e1f0

Browse files
committed
working on formatting
1 parent 81187d5 commit 2d4e1f0

File tree

3 files changed

+6
-108
lines changed

3 files changed

+6
-108
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use PHPUnit_Framework_Constraint_Not as ReverseConstraint;
66
use Illuminate\Foundation\Testing\Constraints\HasInDatabase;
7-
use Illuminate\Foundation\Testing\Constraints\HasSoftDeletedInDatabase;
7+
use Illuminate\Foundation\Testing\Constraints\SoftDeletedInDatabase;
88

99
trait InteractsWithDatabase
1010
{
@@ -45,17 +45,17 @@ protected function assertDatabaseMissing($table, array $data, $connection = null
4545
}
4646

4747
/**
48-
* Assert that a given where condition exists in the database.
48+
* Assert the given record has been deleted.
4949
*
5050
* @param string $table
5151
* @param array $data
5252
* @param string $connection
5353
* @return $this
5454
*/
55-
protected function assertDatabaseHasSoftDelete($table, array $data, $connection = null)
55+
protected function assertSoftDeleted($table, array $data, $connection = null)
5656
{
5757
$this->assertThat(
58-
$table, new HasSoftDeletedInDatabase($this->getConnection($connection), $data)
58+
$table, new SoftDeletedInDatabase($this->getConnection($connection), $data)
5959
);
6060

6161
return $this;

src/Illuminate/Foundation/Testing/Constraints/HasSoftDeletedInDatabase.php

Lines changed: 0 additions & 102 deletions
This file was deleted.

tests/Foundation/FoundationInteractsWithDatabaseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function testSeeSoftDeletedInDatabaseFindsResults()
105105
{
106106
$this->mockCountBuilder(1);
107107

108-
$this->assertDatabaseHasSoftDelete($this->table, $this->data);
108+
$this->assertSoftDeleted($this->table, $this->data);
109109
}
110110

111111
/**
@@ -118,7 +118,7 @@ public function testSeeSoftDeletedInDatabaseDoesNotFindResults()
118118

119119
$builder->shouldReceive('get')->andReturn(collect());
120120

121-
$this->assertDatabaseHasSoftDelete($this->table, $this->data);
121+
$this->assertSoftDeleted($this->table, $this->data);
122122
}
123123

124124
protected function mockCountBuilder($countResult)

0 commit comments

Comments
 (0)