Merge pull request #760 from lucasgiovanny/toHaveProperties

Add possibility to check property name and value with toHaveProperties
pestphp · Apr 2, 2023 · cab6aa6 · cab6aa6
2 parents 9ff2f3b + 31726b5
commit cab6aa6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 14 deletions.
diff --git a/src/Mixins/Expectation.php b/src/Mixins/Expectation.php
@@ -296,8 +296,8 @@ public function toHaveProperty(string $name, mixed $value = new Any(), string $m
      */
     public function toHaveProperties(iterable $names, string $message = ''): self
     {
-        foreach ($names as $name) {
-            $this->toHaveProperty($name, message: $message);
+        foreach ($names as $name => $value) {
+            is_int($name) ? $this->toHaveProperty($value, message: $message) : $this->toHaveProperty($name, $value, $message);
         }
 
         return $this;

diff --git a/tests/.snapshots/success.txt b/tests/.snapshots/success.txt
@@ -1016,4 +1016,4 @@
    PASS  Tests\Visual\Version
   ✓ visual snapshot of help command output
 
-  Tests:    2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 14 skipped, 709 passed (1711 assertions)
+  Tests:    2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 14 skipped, 709 passed (1717 assertions)
diff --git a/tests/Features/Expect/toHaveProperties.php b/tests/Features/Expect/toHaveProperties.php
@@ -4,30 +4,49 @@
 
 test('pass', function () {
     $object = new stdClass();
-    $object->name = 'Jhon';
+    $object->name = 'John';
     $object->age = 21;
 
-    expect($object)->toHaveProperties(['name', 'age']);
+    expect($object)
+        ->toHaveProperties(['name', 'age'])
+        ->toHaveProperties([
+            'name' => 'John',
+            'age' => 21,
+        ]);
 });
 
 test('failures', function () {
     $object = new stdClass();
-    $object->name = 'Jhon';
-
-    expect($object)->toHaveProperties(['name', 'age']);
+    $object->name = 'John';
+
+    expect($object)
+        ->toHaveProperties(['name', 'age'])
+        ->toHaveProperties([
+            'name' => 'John',
+            'age' => 21,
+        ]);
 })->throws(ExpectationFailedException::class);
 
 test('failures with custom message', function () {
     $object = new stdClass();
-    $object->name = 'Jhon';
-
-    expect($object)->toHaveProperties(['name', 'age'], 'oh no!');
+    $object->name = 'John';
+
+    expect($object)
+        ->toHaveProperties(['name', 'age'], 'oh no!')
+        ->toHaveProperties([
+            'name' => 'John',
+            'age' => 21,
+        ], 'oh no!');
 })->throws(ExpectationFailedException::class, 'oh no!');
 
 test('not failures', function () {
     $object = new stdClass();
-    $object->name = 'Jhon';
+    $object->name = 'John';
     $object->age = 21;
 
-    expect($object)->not->toHaveProperties(['name', 'age']);
+    expect($object)->not->toHaveProperties(['name', 'age'])
+        ->not->toHaveProperties([
+            'name' => 'John',
+            'age' => 21,
+        ]);
 })->throws(ExpectationFailedException::class);
diff --git a/tests/Visual/Parallel.php b/tests/Visual/Parallel.php
@@ -18,7 +18,7 @@
 
 test('parallel', function () use ($run) {
     expect($run('--exclude-group=integration'))
-        ->toContain('Tests:    2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 11 skipped, 697 passed (1696 assertions)')
+        ->toContain('Tests:    2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 11 skipped, 697 passed (1702 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();