[5.3] expectsEvents fired from ModelEvents (#15052)

* WithoutEvents can fire ModelEvents to Test events fired ot of a Model event. * added unit test * fixed ci
laravel · Aug 26, 2016 · dcfe40f · dcfe40f
1 parent 3af7e70
commit dcfe40f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Illuminate/Foundation/Testing/Concerns/MocksApplicationServices.php b/src/Illuminate/Foundation/Testing/Concerns/MocksApplicationServices.php
@@ -98,8 +98,6 @@ public function doesntExpectEvents($events)
      */
     protected function withoutEvents()
     {
-        $this->withoutModelEvents();
-
         $mock = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
 
         $mock->shouldReceive('fire')->andReturnUsing(function ($called) {

diff --git a/tests/Foundation/FoundationExpectsModelEventsTest.php b/tests/Foundation/FoundationExpectsModelEventsTest.php
@@ -105,6 +105,18 @@ public function expects_model_events_can_take_a_string_as_the_event_name()
         EloquentTestModel::create(['field' => 1]);
     }
 
+    /** @test */
+    public function expects_events_fires_on_model_events()
+    {
+        EloquentTestModel::created(function () {
+            event(ExampleEvent::class);
+        });
+
+        $this->expectsEvents(ExampleEvent::class);
+
+        EloquentTestModel::create(['field' => 1]);
+    }
+
     /** @test */
     public function unfired_events_can_be_checked_for()
     {