Merge pull request #116 from RonasIT/112_fix_assert_event_chain_method

fix: assertEventPushedChain method

Author: DenTray

tests/ControllerGeneratorTest.php

@@ -109,8 +109,8 @@ public function testRoutesStubNotExist()
         $this->assertGeneratedFileEquals('empty_api.php', 'routes/api.php');
 
         $this->assertEventPushedChain([
-            WarningEvent::class => 'Generation of routes has been skipped cause the view incorrect_stub from the config entity-generator.stubs.routes is not exists. Please check that config has the correct view name value.',
-            SuccessCreateMessage::class => 'Created a new Controller: PostController',
+            WarningEvent::class => ['Generation of routes has been skipped cause the view incorrect_stub from the config entity-generator.stubs.routes is not exists. Please check that config has the correct view name value.'],
+            SuccessCreateMessage::class => ['Created a new Controller: PostController'],
         ]);
     }
 
@@ -129,8 +129,8 @@ public function testUseRoutesStubNotExist()
         $this->assertGeneratedFileEquals('empty_api.php', 'routes/api.php');
 
         $this->assertEventPushedChain([
-            WarningEvent::class => 'Generation of use routes has been skipped cause the view incorrect_stub from the config entity-generator.stubs.use_routes is not exists. Please check that config has the correct view name value.',
-            SuccessCreateMessage::class => 'Created a new Controller: PostController',
+            WarningEvent::class => ['Generation of use routes has been skipped cause the view incorrect_stub from the config entity-generator.stubs.use_routes is not exists. Please check that config has the correct view name value.'],
+            SuccessCreateMessage::class => ['Created a new Controller: PostController'],
         ]);
     }
 
@@ -146,11 +146,15 @@ public function testSuccess()
         $this->assertGeneratedFileEquals('created_controller.php', 'app/Http/Controllers/PostController.php');
         $this->assertGeneratedFileEquals('api.php', 'routes/api.php');
 
-        $this->assertEventPushed(SuccessCreateMessage::class, "Created a new Route: Route::post('posts', 'create');");
-        $this->assertEventPushed(SuccessCreateMessage::class, "Created a new Route: Route::put('posts/{id}', 'update');");
-        $this->assertEventPushed(SuccessCreateMessage::class, "Created a new Route: Route::delete('posts/{id}', 'delete');");
-        $this->assertEventPushed(SuccessCreateMessage::class, "Created a new Route: Route::get('posts/{id}', 'get');");
-        $this->assertEventPushed(SuccessCreateMessage::class, "Created a new Route: Route::get('posts', 'search');");
-        $this->assertEventPushed(SuccessCreateMessage::class, 'Created a new Controller: PostController');
+        $this->assertEventPushedChain([
+            SuccessCreateMessage::class => [
+                "Created a new Route: Route::post('posts', 'create');",
+                "Created a new Route: Route::put('posts/{id}', 'update');",
+                "Created a new Route: Route::delete('posts/{id}', 'delete');",
+                "Created a new Route: Route::get('posts/{id}', 'get');",
+                "Created a new Route: Route::get('posts', 'search');",
+                'Created a new Controller: PostController',
+            ],
+        ]);
     }
 }

tests/TestCase.php

@@ -95,10 +95,16 @@ protected function assertEventPushed(string $className, string $message): void
         );
     }
 
-    protected function assertEventPushedChain(array $events): void
+    protected function assertEventPushedChain(array $expectedEvents): void
     {
-        foreach ($events as $className => $message) {
-            $this->assertEventPushed($className, $message);
+        $dispatchedEvents = Event::dispatchedEvents();
+
+        $this->assertEquals(array_keys($expectedEvents), array_keys($dispatchedEvents));
+
+        foreach ($dispatchedEvents as $event => $messages) {
+            $messages = array_map(fn ($message) => Arr::first($message)->message, $messages);
+
+            $this->assertEquals($expectedEvents[$event], $messages);
         }
     }