Skip to content
This repository was archived by the owner on Nov 26, 2024. It is now read-only.

Commit a415fc0

Browse files
committed
Merge branch 'develop'
2 parents 8ffc54b + 1edf7b1 commit a415fc0

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ before_script:
1111
script:
1212
- cp .env.example .env
1313
- php artisan key:generate
14-
- vendor/bin/phpunit -v --coverage-text --colors=never --stderr
14+
- vendor/bin/phpunit

phpunit.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@
2828
<env name="CACHE_DRIVER" value="array"/>
2929
<env name="SESSION_DRIVER" value="array"/>
3030
<env name="QUEUE_DRIVER" value="sync"/>
31+
<env name="DB_CONNECTION" value="sqlite"/>
32+
<env name="DB_DATABASE" value=":memory:"/>
3133
</php>
3234
</phpunit>

tests/CreatesApplication.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,6 @@ public function setUp()
1717
$this->artisan('reload:db');
1818
}
1919

20-
/**
21-
* Define environment setup.
22-
*
23-
* @param \Illuminate\Foundation\Application $app
24-
* @return void
25-
*/
26-
protected function getEnvironmentSetUp($app)
27-
{
28-
// Setup default database to use sqlite :memory:
29-
$app['config']->set('database.default', 'testbench');
30-
$app['config']->set('database.connections.testbench', [
31-
'driver' => 'sqlite',
32-
'database' => ':memory:',
33-
'prefix' => '',
34-
]);
35-
}
36-
3720
/**
3821
* Creates the application.
3922
*

0 commit comments

Comments
 (0)