1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-04 20:34:03 +00:00

Minor tweaks

This commit is contained in:
Samuel Štancl 2019-02-07 17:53:21 +01:00
parent 576ec1cf02
commit 7f0b2e1cd1
6 changed files with 12 additions and 15 deletions

View file

@ -1,2 +1,3 @@
# DB_DATABASE=travis_tenancy
# DB_USERNAME=foo # DB_USERNAME=foo
# DB_PASSWORD=bar # DB_PASSWORD=bar

View file

@ -1,3 +1,9 @@
env:
- DB_USERNAME=root
- DB_PASSWORD=root
- DB_DATABASE=travis_tenancy
- CODECOV_TOKEN="24382d15-84e7-4a55-bea4-c4df96a24a9b"
language: php language: php
php: php:
- '7.2' - '7.2'
@ -18,13 +24,9 @@ install:
- travis_retry composer install --no-interaction - travis_retry composer install --no-interaction
before_script: before_script:
- export DB_USERNAME=root
- export DB_PASSWORD=root
- mysql -e 'CREATE DATABASE travis_tenancy;' - mysql -e 'CREATE DATABASE travis_tenancy;'
- export DB_DATABASE=travis_tenancy
script: vendor/bin/phpunit -v --coverage-clover=coverage.xml script: vendor/bin/phpunit -v --coverage-clover=coverage.xml
after_success: after_success:
- export CODECOV_TOKEN="24382d15-84e7-4a55-bea4-c4df96a24a9b"
- bash <(curl -s https://codecov.io/bash) - bash <(curl -s https://codecov.io/bash)

View file

@ -37,10 +37,5 @@
"Stancl\\Tenancy\\TenancyServiceProvider" "Stancl\\Tenancy\\TenancyServiceProvider"
] ]
} }
},
"scripts": {
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
]
} }
} }

View file

@ -29,6 +29,5 @@
<env name="QUEUE_CONNECTION" value="sync"/> <env name="QUEUE_CONNECTION" value="sync"/>
<env name="SESSION_DRIVER" value="array"/> <env name="SESSION_DRIVER" value="array"/>
<env name="DB_CONNECTION" value="sqlite"/> <env name="DB_CONNECTION" value="sqlite"/>
<env name="DB_DATABASE" value=":memory:"/>
</php> </php>
</phpunit> </phpunit>

View file

@ -24,10 +24,7 @@ class DatabaseCreationTest extends TestCase
$this->markTestSkipped('As to not bloat your MySQL instance with test databases, this test is not run by default.'); $this->markTestSkipped('As to not bloat your MySQL instance with test databases, this test is not run by default.');
} }
config()->set([ config()->set('database.default', 'mysql');
'database.default' => 'mysql',
'database.connections.mysql.database' => 'travis_tenancy',
]);
$db_name = 'testdatabase' . $this->randomString(10); $db_name = 'testdatabase' . $this->randomString(10);
app(DatabaseManager::class)->create($db_name, 'mysql'); app(DatabaseManager::class)->create($db_name, 'mysql');

View file

@ -30,7 +30,9 @@ class TestCase extends \Orchestra\Testbench\TestCase
*/ */
protected function getEnvironmentSetUp($app) protected function getEnvironmentSetUp($app)
{ {
(new \Dotenv\Dotenv(__DIR__ . '/..'))->load(); if (file_exists(__DIR__ . '/../.env')) {
(new \Dotenv\Dotenv(__DIR__ . '/..'))->load();
}
$app['config']->set([ $app['config']->set([
'database.redis.client' => 'phpredis', 'database.redis.client' => 'phpredis',
@ -47,6 +49,7 @@ class TestCase extends \Orchestra\Testbench\TestCase
'prefix' => 'tenant', 'prefix' => 'tenant',
'suffix' => '.sqlite', 'suffix' => '.sqlite',
], ],
'database.connections.sqlite.database' => ':memory:',
]); ]);
} }