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

[5.7] Fix for EventFake not returning responses #27430

Merged
merged 2 commits into from
Feb 7, 2019
Merged

[5.7] Fix for EventFake not returning responses #27430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44cccf2
Fix event fake dispatch method not returning
jasonvarga Feb 6, 2019
a7f7ee6
Add tests for other non-faked events with return values
jasonvarga Feb 6, 2019
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
2 changes: 1 addition & 1 deletion src/Illuminate/Support/Testing/Fakes/EventFake.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public function dispatch($event, $payload = [], $halt = false)
if ($this->shouldFakeEvent($name, $payload)) {
$this->events[$name][] = func_get_args();
} else {
$this->dispatcher->dispatch($event, $payload, $halt);
return $this->dispatcher->dispatch($event, $payload, $halt);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not an early return?

if ($this->shouldFakeEvent($name, $payload) === false) {
    return $this->dispatcher->dispatch($event, $payload, $halt);
}

$this->events[$name][] = func_get_args();

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to make as small a change as possible.

}
}

Expand Down
54 changes: 54 additions & 0 deletions tests/Integration/Events/EventFakeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,60 @@ public function testNonFakedEventGetsProperlyDispatched()

Event::assertNotDispatched(NonImportantEvent::class);
}

public function testNonFakedEventGetsProperlyDispatchedAndReturnsResponses()
{
Event::fake(NonImportantEvent::class);
Event::listen('test', function () {
// one
});
Event::listen('test', function () {
return 'two';
});
Event::listen('test', function () {
//
});

$this->assertEquals([null, 'two', null], Event::dispatch('test'));

Event::assertNotDispatched(NonImportantEvent::class);
}

public function testNonFakedEventGetsProperlyDispatchedAndCancelsFutureListeners()
{
Event::fake(NonImportantEvent::class);
Event::listen('test', function () {
// one
});
Event::listen('test', function () {
return false;
});
Event::listen('test', function () {
$this->fail('should not be called');
});

$this->assertEquals([null], Event::dispatch('test'));

Event::assertNotDispatched(NonImportantEvent::class);
}

public function testNonFakedHaltedEventGetsProperlyDispatchedAndReturnsResponse()
{
Event::fake(NonImportantEvent::class);
Event::listen('test', function () {
// one
});
Event::listen('test', function () {
return 'two';
});
Event::listen('test', function () {
$this->fail('should not be called');
});

$this->assertEquals('two', Event::until('test'));

Event::assertNotDispatched(NonImportantEvent::class);
}
}

class Post extends Model
Expand Down