Multiple assertions per test case #16

Author: sebastiandedeyne

src/MatchesSnapshots.php

@@ -10,21 +10,28 @@
 
 trait MatchesSnapshots
 {
-    public function assertMatchesSnapshot($actual, Driver $driver = null)
+    /** @var int */
+    protected $snapshotIncrementor;
+
+    /** @before */
+    public function setUpSnapshotIncrementor()
     {
-        $snapshot = $this->createSnapshotWithDriver($driver ?? new VarDriver());
+        $this->snapshotIncrementor = 0;
+    }
 
-        $this->doSnapshotAssertion($snapshot, $actual);
+    public function assertMatchesSnapshot($actual)
+    {
+        $this->doSnapshotAssertion($actual, new VarDriver());
     }
 
     public function assertMatchesXmlSnapshot($actual)
     {
-        $this->assertMatchesSnapshot($actual, new XmlDriver());
+        $this->doSnapshotAssertion($actual, new XmlDriver());
     }
 
     public function assertMatchesJsonSnapshot($actual)
     {
-        $this->assertMatchesSnapshot($actual, new JsonDriver());
+        $this->doSnapshotAssertion($actual, new JsonDriver());
     }
 
     /**
@@ -35,7 +42,9 @@ public function assertMatchesJsonSnapshot($actual)
      */
     protected function getSnapshotId(): string
     {
-        return (new ReflectionClass($this))->getShortName().'__'.$this->getName();
+        return (new ReflectionClass($this))->getShortName().'__'.
+            $this->getName().'__'.
+            $this->snapshotIncrementor;
     }
 
     /**
@@ -66,17 +75,16 @@ protected function shouldUpdateSnapshots(): bool
         return in_array('--update-snapshots', $_SERVER['argv'], true);
     }
 
-    protected function createSnapshotWithDriver(Driver $driver): Snapshot
+    protected function doSnapshotAssertion($actual, Driver $driver)
     {
-        return Snapshot::forTestCase(
+        $this->snapshotIncrementor++;
+
+        $snapshot = Snapshot::forTestCase(
             $this->getSnapshotId(),
             $this->getSnapshotDirectory(),
             $driver
         );
-    }
 
-    protected function doSnapshotAssertion(Snapshot $snapshot, $actual)
-    {
         if (! $snapshot->exists()) {
             $snapshot->create($actual);
 

tests/Integration/AssertionTest.php

@@ -40,4 +40,11 @@ public function can_match_a_json_snapshot()
 
         $this->assertMatchesJsonSnapshot($data);
     }
+
+    /** @test */
+    public function can_do_multiple_snapshot_assertions()
+    {
+        $this->assertMatchesSnapshot('Foo');
+        $this->assertMatchesSnapshot('Bar');
+    }
 }

tests/Integration/MatchesSnapshotTest.php

@@ -34,7 +34,7 @@ public function it_can_create_a_snapshot_from_a_string()
         $mockTrait->assertMatchesSnapshot('Foo');
 
         $this->assertSnapshotMatchesExample(
-            'MatchesSnapshotTest__it_can_match_an_existing_string_snapshot.php',
+            'MatchesSnapshotTest__it_can_match_an_existing_string_snapshot__1.php',
             'snapshot.php'
         );
     }
@@ -49,7 +49,7 @@ public function it_can_create_a_snapshot_from_xml()
         $mockTrait->assertMatchesXmlSnapshot('<foo><bar>Baz</bar></foo>');
 
         $this->assertSnapshotMatchesExample(
-            'MatchesSnapshotTest__it_can_create_a_snapshot_from_xml.xml',
+            'MatchesSnapshotTest__it_can_create_a_snapshot_from_xml__1.xml',
             'snapshot.xml'
         );
     }
@@ -64,7 +64,7 @@ public function it_can_create_a_snapshot_from_json()
         $mockTrait->assertMatchesJsonSnapshot('{"foo":"foo","bar":"bar","baz":"baz"}');
 
         $this->assertSnapshotMatchesExample(
-            'MatchesSnapshotTest__it_can_create_a_snapshot_from_json.json',
+            'MatchesSnapshotTest__it_can_create_a_snapshot_from_json__1.json',
             'snapshot.json'
         );
     }
@@ -135,7 +135,7 @@ public function it_can_update_a_string_snapshot()
         $mockTrait->assertMatchesSnapshot('Foo');
 
         $this->assertSnapshotMatchesExample(
-            'MatchesSnapshotTest__it_can_update_a_string_snapshot.php',
+            'MatchesSnapshotTest__it_can_update_a_string_snapshot__1.php',
             'snapshot.php'
         );
     }
@@ -152,7 +152,7 @@ public function it_can_update_a_xml_snapshot()
         $mockTrait->assertMatchesXmlSnapshot('<foo><bar>Baz</bar></foo>');
 
         $this->assertSnapshotMatchesExample(
-            'MatchesSnapshotTest__it_can_update_a_xml_snapshot.xml',
+            'MatchesSnapshotTest__it_can_update_a_xml_snapshot__1.xml',
             'snapshot.xml'
         );
     }
@@ -169,7 +169,7 @@ public function it_can_update_a_json_snapshot()
         $mockTrait->assertMatchesJsonSnapshot('{"foo":"foo","bar":"bar","baz":"baz"}');
 
         $this->assertSnapshotMatchesExample(
-            'MatchesSnapshotTest__it_can_update_a_json_snapshot.json',
+            'MatchesSnapshotTest__it_can_update_a_json_snapshot__1.json',
             'snapshot.json'
         );
     }
@@ -201,7 +201,7 @@ protected function getMatchesSnapshotMock(): PHPUnit_Framework_MockObject_MockOb
         $matchesSnapshotMock
             ->expects($this->any())
             ->method('getSnapshotId')
-            ->willReturn('MatchesSnapshotTest__'.$this->getName());
+            ->willReturn('MatchesSnapshotTest__'.$this->getName().'__1');
 
         $matchesSnapshotMock
             ->expects($this->any())