fix tests

blumilksoftware · Nov 25, 2024 · 7d0876b · 7d0876b
1 parent e62ec08
commit 7d0876b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/tests/Feature/QuizTest.php b/tests/Feature/QuizTest.php
@@ -50,9 +50,9 @@ public function testAdminCanViewQuizzes(): void
             ->assertInertia(
                 fn(Assert $page) => $page
                     ->component("Admin/Quizzes")
-                    ->has("quizzes", 2)
-                    ->has("quizzes.0.questions", 5)
-                    ->has("quizzes.1.questions", 5),
+                    ->has("quizzes.data", 2)
+                    ->has("quizzes.data.0.questions", 5)
+                    ->has("quizzes.data.1.questions", 5),
             );
     }
 

diff --git a/tests/Unit/RegonRuleTest.php b/tests/Unit/RegonRuleTest.php
@@ -6,7 +6,7 @@
 
 use App\Rules\Regon;
 use Illuminate\Support\Facades\Lang;
-use Tests\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class RegonRuleTest extends TestCase
 {

diff --git a/tests/Unit/SortHelperTest.php b/tests/Unit/SortHelperTest.php
@@ -5,21 +5,35 @@
 namespace Tests\Unit;
 
 use App\Helpers\SortHelper;
+use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\Lang;
 use Mockery;
+use Mockery\MockInterface;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Response as Status;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use Tests\TestCase;
 
 class SortHelperTest extends TestCase
 {
+    private Container $originalContainer;
+
+    /** @var MockInterface<Container> */
+    private MockInterface $container;
+
+    protected function setUp(): void
+    {
+        $this->originalContainer = Container::getInstance();
+        $this->container = Mockery::mock(Container::class);
+        Container::setInstance($this->container);
+    }
+
     protected function tearDown(): void
     {
         Mockery::close();
-        restore_error_handler();
-        restore_exception_handler();
+        Container::setInstance($this->originalContainer);
     }
 
     public function testGetSortParametersReturnsDefaultValues(): void
@@ -83,8 +97,10 @@ public function testSortAppliesOrderBy(): void
 
     public function testSortThrowsExceptionForUnsupportedField(): void
     {
+        $this->container->shouldReceive("abort")
+            ->with(Status::HTTP_BAD_REQUEST, "The field 'invalid_field' is not supported.", [])->andThrow(HttpException::class, Status::HTTP_BAD_REQUEST);
+
         $this->expectException(HttpException::class);
-        $this->expectExceptionMessage("The field 'invalid_field' is not supported.");
 
         Lang::shouldReceive("get")
             ->with("validation.sorting.unsupported_field", ["attribute" => "invalid_field"])