wip

Author: freekmurze

phpunit.xml.dist

@@ -15,7 +15,7 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="QUEUE_DRIVER" value="9000"/>
+        <env name="QUEUE_CONNECTION" value="database"/>
     </php>
     <filter>
         <whitelist>

src/CallWebhookJob.php

@@ -81,6 +81,7 @@ public function handle()
             $waitInSeconds = $backoffStrategy->waitInSecondsAfterAttempt($this->attempts());
 
             $this->dispatchEvent(WebhookCallFailedEvent::class);
+
             $this->release($waitInSeconds);
         }
 

tests/CallWebhookJobTest.php

@@ -4,6 +4,8 @@
 
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Event;
+use Spatie\WebhookServer\Events\FinalWebhookCallFailedEvent;
+use Spatie\WebhookServer\Events\WebhookCallFailedEvent;
 use Spatie\WebhookServer\Tests\TestClasses\TestClient;
 use Spatie\WebhookServer\Webhook;
 
@@ -30,6 +32,8 @@ public function it_can_make_a_webhook_call()
     {
         $this->baseWebhook()->call();
 
+        $this->artisan('queue:work --once');
+
         $this
             ->testClient
             ->assertRequestsMade([$this->baseRequest()]);
@@ -45,6 +49,9 @@ public function it_can_use_a_different_http_verb()
 
         $baseResponse = $this->baseRequest(['method' => 'get']);
 
+        $this->artisan('queue:work --once');
+
+
         $this
             ->testClient
             ->assertRequestsMade([$baseResponse]);
@@ -69,6 +76,8 @@ public function it_can_add_extra_headers()
             $extraHeaders,
         );
 
+        $this->artisan('queue:work --once');
+
         $this
             ->testClient
             ->assertRequestsMade([$baseRequest]);
@@ -82,18 +91,37 @@ public function it_can_disable_verifying_ssl()
         $baseRequest = $this->baseRequest();
         $baseRequest['options']['verify'] = false;
 
+        $this->artisan('queue:work --once');
+
         $this
             ->testClient
             ->assertRequestsMade([$baseRequest]);
     }
 
     /** @test */
-    public function it_will_try_the_amount_of_times()
+    public function by_default_it_will_retry_3_times_with_the_exponential_backoff_strategy()
     {
         $this->testClient->letEveryRequestFail();
 
         $this->baseWebhook()->call();
 
+        $this->artisan('queue:work --once');
+        Event::assertDispatched(WebhookCallFailedEvent::class, 1);
+
+        $this->progressSeconds(10);
+        $this->artisan('queue:work --once');
+        Event::assertDispatched(WebhookCallFailedEvent::class, 2);
+
+        $this->progressSeconds(100);
+        $this->artisan('queue:work --once');
+        Event::assertDispatched(WebhookCallFailedEvent::class, 3);
+        Event::assertDispatched(FinalWebhookCallFailedEvent::class, 1);
+        $this->testClient->assertRequestCount(3);
+
+        $this->progressSeconds(1000);
+        $this->artisan('queue:work --once');
+        Event::assertDispatched(WebhookCallFailedEvent::class, 3);
+        Event::assertDispatched(FinalWebhookCallFailedEvent::class, 1);
         $this->testClient->assertRequestCount(3);
     }
 

tests/TestCase.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\WebhookServer\Tests;
 
+use Carbon\Carbon;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 use Orchestra\Testbench\TestCase as Orchestra;
@@ -25,7 +26,6 @@ protected function getPackageProviders($app)
 
     protected function getEnvironmentSetUp($app)
     {
-        // Setup default database to use sqlite :memory:
         $app['config']->set('database.default', 'testbench');
         $app['config']->set('database.connections.testbench', [
             'driver'   => 'sqlite',
@@ -46,5 +46,18 @@ protected function setUpDatabase()
             $table->unsignedInteger('created_at');
         });
     }
-}
 
+    protected function setNow(string $time, $format = 'Y-m-d H:i:s')
+    {
+        $now = Carbon::createFromFormat($format, $time);
+
+        Carbon::setTestNow($now);
+    }
+
+    public function progressSeconds(int $seconds)
+    {
+        $newNow = now()->addSeconds($seconds);
+
+        Carbon::setTestNow($newNow);
+    }
+}