[5.6] Queue::bulk() fake now properly pushes expected jobs (#23294)

* bulk() now properly pushes expected jobs * Now also passes queue onto the fake * Added tests to assert bulk() actually pushes jobs to the queue * StyleCI adjustment
laravel · Feb 26, 2018 · 894492d · 894492d
1 parent 2d1364d
commit 894492d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Illuminate/Support/Testing/Fakes/QueueFake.php b/src/Illuminate/Support/Testing/Fakes/QueueFake.php
@@ -239,8 +239,8 @@ public function pop($queue = null)
      */
     public function bulk($jobs, $data = '', $queue = null)
     {
-        foreach ($this->jobs as $job) {
-            $this->push($job);
+        foreach ($jobs as $job) {
+            $this->push($job, $data, $queue);
         }
     }
 

diff --git a/tests/Support/SupportTestingQueueFakeTest.php b/tests/Support/SupportTestingQueueFakeTest.php
@@ -87,6 +87,20 @@ public function testAssertNothingPushed()
             $this->assertThat($e, new ExceptionMessage('Jobs were pushed unexpectedly.'));
         }
     }
+
+    public function testAssertPushedUsingBulk()
+    {
+        $this->fake->assertNothingPushed();
+
+        $queue = 'my-test-queue';
+        $this->fake->bulk([
+            $this->job,
+            new JobStub(),
+        ], null, $queue);
+
+        $this->fake->assertPushedOn($queue, JobStub::class);
+        $this->fake->assertPushed(JobStub::class, 2);
+    }
 }
 
 class JobStub