Strengthen assertions

Author: jasonmccreary

src/Generators/PestTestGenerator.php

@@ -375,8 +375,13 @@ protected function buildTestCases(Controller $controller): string
                     $view_assertions[] = sprintf('$response->assertViewIs(\'%s\');', $statement->view());
 
                     foreach ($statement->data() as $data) {
-                        // TODO: if data references locally scoped var, strengthen assertion...
-                        $view_assertions[] = sprintf('$response->assertViewHas(\'%s\');', $data);
+                        $assertion = sprintf('$response->assertViewHas(\'%s\'', $data);
+                        if ($this->hasLocalVariable($setup['data'], $data)) {
+                            $assertion .= sprintf(', $%s', $data);
+                        }
+
+                        $assertion .= ');';
+                        $view_assertions[] = $assertion;
                     }
 
                     array_unshift($assertions['response'], ...$view_assertions);
@@ -708,4 +713,9 @@ private function importAdditionalAssertionsToBaseTest(): void
 
         $this->filesystem->put($fullPath, $updatedContent);
     }
+
+    private function hasLocalVariable(array $locals, string $name): bool
+    {
+        return collect($locals)->contains(fn ($local) => str_starts_with($local, '$' . $name . ' = '));
+    }
 }

src/Generators/PhpUnitTestGenerator.php

@@ -371,8 +371,13 @@ protected function buildTestCases(Controller $controller): string
                     $view_assertions[] = sprintf('$response->assertViewIs(\'%s\');', $statement->view());
 
                     foreach ($statement->data() as $data) {
-                        // TODO: if data references locally scoped var, strengthen assertion...
-                        $view_assertions[] = sprintf('$response->assertViewHas(\'%s\');', $data);
+                        $assertion = sprintf('$response->assertViewHas(\'%s\'', $data);
+                        if ($this->hasLocalVariable($setup['data'], $data)) {
+                            $assertion .= sprintf(', $%s', $data);
+                        }
+
+                        $assertion .= ');';
+                        $view_assertions[] = $assertion;
                     }
 
                     array_unshift($assertions['response'], ...$view_assertions);
@@ -581,6 +586,11 @@ private function addFakerTrait(Controller $controller): void
         $this->addTrait($controller, 'WithFaker');
     }
 
+    private function hasLocalVariable(array $locals, string $name): bool
+    {
+        return collect($locals)->contains(fn ($local) => str_starts_with($local, '$' . $name . ' = '));
+    }
+
     private function splitField($field): array
     {
         if (Str::contains($field, '.')) {

tests/fixtures/tests/pest/call-to-a-member-function-columns-on-null-SubscriptionControllerTest.php

@@ -12,7 +12,7 @@
 
     $response->assertOk();
     $response->assertViewIs('subscription.index');
-    $response->assertViewHas('subscriptions');
+    $response->assertViewHas('subscriptions', $subscriptions);
 });
 
 
@@ -23,5 +23,5 @@
 
     $response->assertOk();
     $response->assertViewIs('subscription.show');
-    $response->assertViewHas('subscription');
+    $response->assertViewHas('subscription', $subscription);
 });

tests/fixtures/tests/pest/crud-show-only.php

@@ -12,5 +12,5 @@
 
     $response->assertOk();
     $response->assertViewIs('posts.show');
-    $response->assertViewHas('post');
+    $response->assertViewHas('post', $post);
 });

tests/fixtures/tests/pest/date-formats.php

@@ -18,7 +18,7 @@
 
     $response->assertOk();
     $response->assertViewIs('date.index');
-    $response->assertViewHas('dates');
+    $response->assertViewHas('dates', $dates);
 });
 
 
@@ -68,7 +68,7 @@
 
     $response->assertOk();
     $response->assertViewIs('date.show');
-    $response->assertViewHas('date');
+    $response->assertViewHas('date', $date);
 });
 
 
@@ -79,7 +79,7 @@
 
     $response->assertOk();
     $response->assertViewIs('date.edit');
-    $response->assertViewHas('date');
+    $response->assertViewHas('date', $date);
 });
 
 

tests/fixtures/tests/pest/full-crud-example.php

@@ -17,7 +17,7 @@
 
     $response->assertOk();
     $response->assertViewIs('posts.index');
-    $response->assertViewHas('posts');
+    $response->assertViewHas('posts', $posts);
 });
 
 
@@ -64,7 +64,7 @@
 
     $response->assertOk();
     $response->assertViewIs('posts.show');
-    $response->assertViewHas('post');
+    $response->assertViewHas('post', $post);
 });
 
 
@@ -75,7 +75,7 @@
 
     $response->assertOk();
     $response->assertViewIs('posts.edit');
-    $response->assertViewHas('post');
+    $response->assertViewHas('post', $post);
 });
 
 

tests/fixtures/tests/pest/readme-example-notification.php

@@ -20,7 +20,7 @@
 
     $response->assertOk();
     $response->assertViewIs('post.index');
-    $response->assertViewHas('posts');
+    $response->assertViewHas('posts', $posts);
 });
 
 

tests/fixtures/tests/pest/readme-example.php

@@ -21,7 +21,7 @@
 
     $response->assertOk();
     $response->assertViewIs('post.index');
-    $response->assertViewHas('posts');
+    $response->assertViewHas('posts', $posts);
 });
 
 

tests/fixtures/tests/phpunit/call-to-a-member-function-columns-on-null-SubscriptionControllerTest.php

@@ -23,7 +23,7 @@ public function index_displays_view(): void
 
         $response->assertOk();
         $response->assertViewIs('subscription.index');
-        $response->assertViewHas('subscriptions');
+        $response->assertViewHas('subscriptions', $subscriptions);
     }
 
 
@@ -36,6 +36,6 @@ public function show_displays_view(): void
 
         $response->assertOk();
         $response->assertViewIs('subscription.show');
-        $response->assertViewHas('subscription');
+        $response->assertViewHas('subscription', $subscription);
     }
 }

tests/fixtures/tests/phpunit/crud-show-only.php

@@ -20,6 +20,6 @@ public function show_displays_view(): void
 
         $response->assertOk();
         $response->assertViewIs('posts.show');
-        $response->assertViewHas('post');
+        $response->assertViewHas('post', $post);
     }
 }