Merge branch 'feature/async' into async-with-cn

lindyhopchris · lindyhopchris · commit c7f3474b3dd4 · 2018-11-02T16:58:27.000Z
diff --git a/src/Queue/ClientJob.php b/src/Queue/ClientJob.php
@@ -40,7 +40,6 @@ class ClientJob extends Model implements AsynchronousProcess
         'failed',
         'resource_type',
         'resource_id',
-        'status',
         'timeout',
         'timeout_at',
         'tries',
diff --git a/src/Queue/ClientJobSchema.php b/src/Queue/ClientJobSchema.php
@@ -43,7 +43,7 @@ public function getAttributes($resource)
             'created-at' => $resource->created_at->format($this->dateFormat),
             'completed-at' => $completedAt ? $completedAt->format($this->dateFormat) : null,
             'failed' => $resource->failed,
-            'resource' => $resource->resource_type,
+            'resource-type' => $resource->resource_type,
             'timeout' => $resource->timeout,
             'timeout-at' => $timeoutAt ? $timeoutAt->format($this->dateFormat) : null,
             'tries' => $resource->tries,
diff --git a/tests/lib/Integration/Queue/ClientDispatchTest.php b/tests/lib/Integration/Queue/ClientDispatchTest.php
@@ -59,7 +59,7 @@ public function testCreate()
                 'created-at' => Carbon::now()->format('Y-m-d\TH:i:s.uP'),
                 'completed-at' => null,
                 'failed' => false,
-                'resource' => 'downloads',
+                'resource-type' => 'downloads',
                 'timeout' => 60,
                 'timeout-at' => null,
                 'tries' => null,
@@ -112,7 +112,7 @@ public function testCreateWithClientGeneratedId()
         $this->doCreate($data)->assertAcceptedWithId('http://localhost/api/v1/downloads/queue-jobs', [
             'type' => 'queue-jobs',
             'attributes' => [
-                'resource' => 'downloads',
+                'resource-type' => 'downloads',
                 'timeout' => 60,
                 'timeout-at' => null,
                 'tries' => null,
@@ -152,7 +152,7 @@ public function testUpdate()
         $expected = [
             'type' => 'queue-jobs',
             'attributes' => [
-                'resource' => 'downloads',
+                'resource-type' => 'downloads',
                 'timeout' => null,
                 'timeout-at' => Carbon::now()->addSeconds(25)->format('Y-m-d\TH:i:s.uP'),
                 'tries' => null,
@@ -194,7 +194,7 @@ public function testDelete()
         $this->doDelete($download)->assertAcceptedWithId('http://localhost/api/v1/downloads/queue-jobs', [
             'type' => 'queue-jobs',
             'attributes' => [
-                'resource' => 'downloads',
+                'resource-type' => 'downloads',
                 'timeout' => null,
                 'timeout-at' => null,
                 'tries' => 5,
diff --git a/tests/lib/Integration/Queue/QueueJobsTest.php b/tests/lib/Integration/Queue/QueueJobsTest.php
@@ -20,7 +20,7 @@ public function testListAll()
         factory(ClientJob::class)->create(['resource_type' => 'foo']);
 
         $this->getJsonApi('/api/v1/downloads/queue-jobs')
-            ->assertSearchedIds($jobs);
+            ->assertFetchedMany($jobs);
     }
 
     public function testReadPending()
@@ -29,7 +29,7 @@ public function testReadPending()
         $expected = $this->serialize($job);
 
         $this->getJsonApi($expected['links']['self'])
-            ->assertRead($expected);
+            ->assertFetchedOneExact($expected);
     }
 
     /**
@@ -59,7 +59,7 @@ public function testReadNotPendingCannotSeeOther()
         $expected = $this->serialize($job);
 
         $this->getJsonApi($this->jobUrl($job))
-            ->assertRead($expected)
+            ->assertFetchedOneExact($expected)
             ->assertHeaderMissing('Location');
     }
 
@@ -102,7 +102,7 @@ private function serialize(ClientJob $job): array
                 'created-at' => $job->created_at->format($format),
                 'completed-at' => $job->completed_at ? $job->completed_at->format($format) : null,
                 'failed' => $job->failed,
-                'resource' => 'downloads',
+                'resource-type' => 'downloads',
                 'timeout' => $job->timeout,
                 'timeout-at' => $job->timeout_at ? $job->timeout_at->format($format) : null,
                 'tries' => $job->tries,
