Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11.x] Constrain key when asserting database has a model #52464

Merged
merged 3 commits into from
Aug 16, 2024
Merged

[11.x] Constrain key when asserting database has a model #52464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35c75d5
Constrain key when asserting database has against a model
patrickomeara Aug 15, 2024
d9ac8f0
Use already constrained database has methods
patrickomeara Aug 13, 2024
424df65
Using a model instance that isn't saved to the database should fail
patrickomeara Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,15 @@ trait InteractsWithDatabase
* @param string|null $connection
* @return $this
*/
protected function assertDatabaseHas($table, array $data, $connection = null)
protected function assertDatabaseHas($table, array $data = [], $connection = null)
{
if ($table instanceof Model) {
$data = [
$table->getKeyName() => $table->getKey(),
...$data,
];
}

$this->assertThat(
$this->getTable($table), new HasInDatabase($this->getConnection($connection, $table), $data)
);
Expand All @@ -41,8 +48,15 @@ protected function assertDatabaseHas($table, array $data, $connection = null)
* @param string|null $connection
* @return $this
*/
protected function assertDatabaseMissing($table, array $data, $connection = null)
protected function assertDatabaseMissing($table, array $data = [], $connection = null)
{
if ($table instanceof Model) {
$data = [
$table->getKeyName() => $table->getKey(),
...$data,
];
}

$constraint = new ReverseConstraint(
new HasInDatabase($this->getConnection($connection, $table), $data)
);
Expand Down Expand Up @@ -157,11 +171,7 @@ protected function assertNotSoftDeleted($table, array $data = [], $connection =
*/
protected function assertModelExists($model)
{
return $this->assertDatabaseHas(
$model->getTable(),
[$model->getKeyName() => $model->getKey()],
$model->getConnectionName()
);
return $this->assertDatabaseHas($model);
}

/**
Expand All @@ -172,11 +182,7 @@ protected function assertModelExists($model)
*/
protected function assertModelMissing($model)
{
return $this->assertDatabaseMissing(
$model->getTable(),
[$model->getKeyName() => $model->getKey()],
$model->getConnectionName()
);
return $this->assertDatabaseMissing($model);
}

/**
Expand Down
34 changes: 30 additions & 4 deletions tests/Foundation/FoundationInteractsWithDatabaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,25 @@ public function testSeeInDatabaseFindsResults()
$this->assertDatabaseHas($this->table, $this->data);
}

public function testAssertDatabaseHasSupportModels()
public function testAssertDatabaseHasSupportsModelClass()
{
$this->mockCountBuilder(1);

$this->assertDatabaseHas(ProductStub::class, $this->data);
$this->assertDatabaseHas(new ProductStub, $this->data);
}

public function testAssertDatabaseHasConstrainsToModel()
{
$data = $this->data;

$this->data = [
'id' => 1,
...$this->data,
];

$this->mockCountBuilder(1);

$this->assertDatabaseHas(new ProductStub(['id' => 1]), $data);
}

public function testSeeInDatabaseDoesNotFindResults()
Expand Down Expand Up @@ -102,12 +115,25 @@ public function testDontSeeInDatabaseDoesNotFindResults()
$this->assertDatabaseMissing($this->table, $this->data);
}

public function testAssertDatabaseMissingSupportModels()
public function testAssertDatabaseMissingSupportsModelClass()
{
$this->mockCountBuilder(0);

$this->assertDatabaseMissing(ProductStub::class, $this->data);
$this->assertDatabaseMissing(new ProductStub, $this->data);
}

public function testAssertDatabaseMissingConstrainsToModel()
{
$data = $this->data;

$this->data = [
'id' => 1,
...$this->data,
];

$this->mockCountBuilder(0);

$this->assertDatabaseMissing(new ProductStub(['id' => 1]), $data);
}

public function testDontSeeInDatabaseFindsResults()
Expand Down