Fix delay when a job is not pushed to disk (#3)

Author: harrygulliford

src/SqsDiskQueue.php

@@ -92,21 +92,24 @@ public function __construct(
      */
     public function pushRaw($payload, $queue = null, array $options = [], $delay = 0)
     {
-        $payloadLength = strlen($payload);
+        $message = [
+            'QueueUrl' => $this->getQueue($queue),
+            'MessageBody' => $payload,
+        ];
 
-        if ($payloadLength >= self::MAX_SQS_LENGTH || Arr::get($this->diskOptions, 'always_store')) {
+        if (strlen($payload) >= self::MAX_SQS_LENGTH || Arr::get($this->diskOptions, 'always_store')) {
             $uuid = json_decode($payload)->uuid;
             $filepath = Arr::get($this->diskOptions, 'prefix', '') . "/{$uuid}.json";
             $this->resolveDisk()->put($filepath, $payload);
 
-            return $this->sqs->sendMessage([
-                'QueueUrl' => $this->getQueue($queue),
-                'MessageBody' => json_encode(['pointer' => $filepath]),
-                'DelaySeconds' => $this->secondsUntil($delay),
-            ])->get('MessageId');
+            $message['MessageBody'] = json_encode(['pointer' => $filepath]);
         }
 
-        return parent::pushRaw($payload, $queue, $options);
+        if ($delay) {
+            $message['DelaySeconds'] = $this->secondsUntil($delay);
+        }
+
+        return $this->sqs->sendMessage($message)->get('MessageId');
     }
 
     /**

tests/SqsDiskQueueTest.php

@@ -82,7 +82,6 @@ public function testItPushesLargePayloadsToADisk()
             ->with([
                 'QueueUrl' => '/default',
                 'MessageBody' => $this->mockedPointerPayload,
-                'DelaySeconds' => 0,
             ])
             ->once()
             ->andReturnSelf();
@@ -120,7 +119,6 @@ public function testItAlwaysPushesPayloadsToADiskIfAlwaysPushIsEnabled()
             ->with([
                 'QueueUrl' => '/default',
                 'MessageBody' => $this->mockedPointerPayload,
-                'DelaySeconds' => 0,
             ])
             ->once()
             ->andReturnSelf();
@@ -140,7 +138,7 @@ public function testItAlwaysPushesPayloadsToADiskIfAlwaysPushIsEnabled()
         $sqsDiskQueue->pushRaw($this->mockedPayload);
     }
 
-    public function testItDelaysAJob()
+    public function testItCanDelayAJobWhenPushedToDisk()
     {
         $this->mockedFilesystemAdapter->shouldReceive('disk')
             ->with('s3')
@@ -175,6 +173,33 @@ public function testItDelaysAJob()
         $sqsDiskQueue->later(10, 'foo');
     }
 
+    public function testItCanDelayAJobWhenNotPushedToDisk()
+    {
+        $this->mockedFilesystemAdapter->shouldReceive('disk')
+            ->never();
+
+        $this->mockedSqsClient->shouldReceive('sendMessage')
+            ->with(Mockery::on(function ($arguments) {
+                return $arguments['DelaySeconds'] === 10;
+            }))
+            ->once()
+            ->andReturnSelf();
+
+        $this->mockedSqsClient->shouldReceive('get')
+            ->once();
+
+        $diskOptions = [
+            'always_store' => false,
+            'cleanup' => true,
+            'disk' => 's3',
+            'prefix' => 'prefix',
+        ];
+
+        $sqsDiskQueue = new SqsDiskQueue($this->mockedSqsClient, 'default', $diskOptions);
+        $sqsDiskQueue->setContainer($this->mockedContainer);
+        $sqsDiskQueue->later(10, 'foo');
+    }
+
     public function testItCreatesANewSqsDiskJobWhenPopped()
     {
         $this->mockedSqsClient->shouldReceive('receiveMessage')