github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-10 20:31:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak event extender (tests)

Browse Source 
- Inject contract, not implementation
- Do not dispatch event in test, let the core do that
- Ensure the relevant database tables are reset prior to the test
- Use correct parameter order for assertions

Refs #2097.
This commit is contained in:
Franz Liedke 2020-04-13 11:37:03 +02:00
parent cde69480bf
commit 8b30734ffb
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Extend/Event.php
View File

@ -11,7 +11,7 @@ namespace Flarum\Extend;
use Flarum\Extension\Extension; use Flarum\Extension\Extension;
use Illuminate\Contracts\Container\Container; use Illuminate\Contracts\Container\Container;
use Illuminate\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class Event implements ExtenderInterface class Event implements ExtenderInterface
{ {

38
framework/core/tests/integration/extenders/EventTest.php
View File

@ -10,24 +10,38 @@
namespace Flarum\Tests\integration\extenders; namespace Flarum\Tests\integration\extenders;
use Flarum\Extend; use Flarum\Extend;
use Flarum\Group\Command\CreateGroup;
use Flarum\Group\Event\Created; use Flarum\Group\Event\Created;
use Flarum\Group\Group; use Flarum\Tests\integration\RetrievesAuthorizedUsers;
use Flarum\Tests\integration\TestCase; use Flarum\Tests\integration\TestCase;
use Illuminate\Contracts\Events\Dispatcher; use Flarum\User\User;
use Illuminate\Contracts\Bus\Dispatcher;
use Illuminate\Contracts\Translation\Translator; use Illuminate\Contracts\Translation\Translator;
class EventTest extends TestCase class EventTest extends TestCase
{ {
use RetrievesAuthorizedUsers;
protected function buildGroup() protected function buildGroup()
{ {
$events = $this->app()->getContainer()->make(Dispatcher::class); $this->prepareDatabase([
'groups' => [
$this->adminGroup(),
],
'users' => [
$this->adminUser(),
],
]);
$group = Group::build('test group', 'test groups', '#000000', 'fas fa-crown'); $bus = $this->app()->getContainer()->make(Dispatcher::class);
$group->save(); return $bus->dispatch(
new CreateGroup(User::find(1), ['attributes' => [
$events->dispatch(new Created($group)); 'nameSingular' => 'test group',
'namePlural' => 'test groups',
return $group; 'color' => '#000000',
'icon' => 'fas fa-crown',
]])
);
} }
/** /**
@ -37,7 +51,7 @@ class EventTest extends TestCase
{ {
$group = $this->buildGroup(); $group = $this->buildGroup();
$this->assertEquals($group->name_singular, 'test group'); $this->assertEquals('test group', $group->name_singular);
} }
/** /**
@ -51,7 +65,7 @@ class EventTest extends TestCase
$group = $this->buildGroup(); $group = $this->buildGroup();
$this->assertEquals($group->name_singular, 'modified group'); $this->assertEquals('modified group', $group->name_singular);
} }
/** /**
@ -64,7 +78,7 @@ class EventTest extends TestCase
$group = $this->buildGroup(); $group = $this->buildGroup();
$this->assertEquals($group->name_singular, 'core.group.admin'); $this->assertEquals('core.group.admin', $group->name_singular);
} }
} }