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

Jump to bottom

[5.6] Fixes starting of two database transactions in tests #23132

Merged
merged 2 commits into from
Feb 12, 2018
Merged

[5.6] Fixes starting of two database transactions in tests #23132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9affff7
Fixes starting of two database transactions in tests
skollro Feb 12, 2018
45610d8
indentation fixed
skollro Feb 12, 2018
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
36 changes: 34 additions & 2 deletions src/Illuminate/Foundation/Testing/RefreshDatabase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

trait RefreshDatabase
{
use DatabaseTransactions;

/**
* Define hooks to migrate the database before and after each test.
*
Expand Down Expand Up @@ -61,4 +59,38 @@ protected function refreshTestDatabase()

$this->beginDatabaseTransaction();
}

/**
* Begin a database transaction on the testing database.
*
* @return void
*/
public function beginDatabaseTransaction()
{
$database = $this->app->make('db');

foreach ($this->connectionsToTransact() as $name) {
$database->connection($name)->beginTransaction();
}

$this->beforeApplicationDestroyed(function () use ($database) {
foreach ($this->connectionsToTransact() as $name) {
$connection = $database->connection($name);

$connection->rollBack();
$connection->disconnect();
}
});
}

/**
* The database connections that should have transactions.
*
* @return array
*/
protected function connectionsToTransact()
{
return property_exists($this, 'connectionsToTransact')
? $this->connectionsToTransact : [null];
}
}