fix tests

mozex · Mar 14, 2024 · fb8283e · fb8283e
1 parent 264615f
commit fb8283e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/src/ModulesServiceProvider.php b/src/ModulesServiceProvider.php
@@ -294,9 +294,12 @@ protected function bootRoutes(): void
             );
 
         $this->callAfterResolving(Kernel::class, function (Kernel $kernel) use ($commands) {
-            $kernel->addCommandRoutePaths(
-                $commands->pluck('path')->all()
-            );
+            // Compatibility with Laravel 10
+            if (method_exists($kernel, 'addCommandRoutePaths')) {
+                $kernel->addCommandRoutePaths(
+                    $commands->pluck('path')->all()
+                );
+            }
         });
 
         $routes->each(function (array $asset): void {

diff --git a/tests/Feature/CommandsTest.php b/tests/Feature/CommandsTest.php
@@ -7,6 +7,7 @@
 use Modules\Second\Console\Commands\SecondValidCommand;
 use Mozex\Modules\Enums\AssetType;
 use Mozex\Modules\Scouts\CommandsScout;
+use Mozex\Modules\Tests\Kernel;
 
 test('scout will not collect when disabled', function () {
     config()->set(
@@ -65,9 +66,11 @@
             expect($commands)->toContain((new $asset['namespace'])->getName());
         });
 
-    expect($commands)
-        ->toContain('first:console-command-1')
-        ->toContain('second:console-command-1');
+    if (method_exists(Kernel::class, 'addCommandRoutePaths')) {
+        expect($commands)
+            ->toContain('first:console-command-1')
+            ->toContain('second:console-command-1');
+    }
 
     if ($cache) {
         $discoverer->clear();

diff --git a/tests/Feature/SchedulesTest.php b/tests/Feature/SchedulesTest.php
@@ -6,6 +6,7 @@
 use Modules\Second\Console\WrongKernel;
 use Mozex\Modules\Enums\AssetType;
 use Mozex\Modules\Scouts\SchedulesScout;
+use Mozex\Modules\Tests\Kernel;
 
 test('scout will not collect when disabled', function () {
     config()->set(
@@ -66,14 +67,18 @@
         ->toArray();
 
     expect($schedules)
-        ->toContain('first:console-command-1')
         ->toContain('first-scheduled-command-1')
-        ->toContain('first-scheduled-command-2')
-        ->toContain('first-scheduled-command-3')
-        ->toContain('second:console-command-1')
         ->toContain('second-scheduled-command-1')
-        ->toContain('second-scheduled-command-2')
-        ->toContain('second-scheduled-command-3');
+        ->toContain('second-scheduled-command-2');
+
+    if (method_exists(Kernel::class, 'addCommandRoutePaths')) {
+        expect($schedules)
+            ->toContain('first:console-command-1')
+            ->toContain('first-scheduled-command-2')
+            ->toContain('first-scheduled-command-3')
+            ->toContain('second:console-command-1')
+            ->toContain('second-scheduled-command-3');
+    }
 
     if ($cache) {
         $discoverer->clear();