1
0
mirror of https://github.com/flarum/core.git synced 2025-08-01 14:10:37 +02:00

Use latest version of settings package

This allows us to get rid of hacks for configuring settings and config
This commit is contained in:
Alexander Skvortsov
2021-05-03 01:35:46 -04:00
parent ad92d11cf9
commit d12d52918b
7 changed files with 14 additions and 69 deletions

View File

@@ -15,13 +15,11 @@ use Flarum\Http\SlugDriverInterface;
use Flarum\Http\SlugManager;
use Flarum\Testing\integration\RetrievesAuthorizedUsers;
use Flarum\Testing\integration\TestCase;
use Flarum\Testing\integration\UsesSettings;
use Flarum\User\User;
class ModelUrlTest extends TestCase
{
use RetrievesAuthorizedUsers;
use UsesSettings;
/**
* @inheritDoc
@@ -31,12 +29,12 @@ class ModelUrlTest extends TestCase
parent::setUp();
$userClass = User::class;
$this->setting("slug_driver_$userClass", 'testDriver');
$this->prepareDatabase([
'users' => [
$this->normalUser(),
],
'settings' => [
['key' => "slug_driver_$userClass", 'value' => 'testDriver'],
]
]);
}
@@ -46,8 +44,6 @@ class ModelUrlTest extends TestCase
*/
public function uses_default_driver_by_default()
{
$this->purgeSettingsCache();
$slugManager = $this->app()->getContainer()->make(SlugManager::class);
$testUser = User::find(1);
@@ -63,8 +59,6 @@ class ModelUrlTest extends TestCase
{
$this->extend((new Extend\ModelUrl(User::class))->addSlugDriver('testDriver', TestSlugDriver::class));
$this->purgeSettingsCache();
$slugManager = $this->app()->getContainer()->make(SlugManager::class);
$testUser = User::find(1);