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

lindyhopchris · lindyhopchris · commit 04a4c936f600 · 2018-11-22T10:57:33.000Z
diff --git a/src/Http/Responses/Responses.php b/src/Http/Responses/Responses.php
@@ -315,7 +315,8 @@ public function accepted(AsynchronousProcess $job, array $links = [], $meta = nu
     public function process(AsynchronousProcess $job, array $links = [], $meta = null, array $headers = [])
     {
         if (!$job->isPending() && $location = $job->getLocation()) {
-            return response()->redirectTo($location, Response::HTTP_SEE_OTHER, $headers);
+            $headers['Location'] = $location;
+            return $this->createJsonApiResponse(null, Response::HTTP_SEE_OTHER, $headers);
         }
 
         return $this->getContentResponse($job, self::HTTP_OK, $links, $meta, $headers);
diff --git a/tests/lib/Integration/Queue/QueueJobsTest.php b/tests/lib/Integration/Queue/QueueJobsTest.php
@@ -34,16 +34,20 @@ public function testReadPending()
 
     /**
      * When job process is done, the request SHOULD return a status 303 See other
-     * with a link in Location header.
+     * with a link in Location header. The spec recommendation shows a response with
+     * a Content-Type header as `application/vnd.api+json` but no content in the response body.
      */
     public function testReadNotPending()
     {
        $job = factory(ClientJob::class)->states('success')->create();
-       $location = "http://localhost/api/v1/downloads/{$job->resource_id}";
 
-       $this->getJsonApi($this->jobUrl($job))
+       $response = $this
+           ->getJsonApi($this->jobUrl($job))
            ->assertStatus(303)
-           ->assertHeader('Location', $location);
+           ->assertLocation('/api/v1/downloads/' . $job->resource_id)
+           ->assertHeader('Content-Type', 'application/vnd.api+json');
+
+       $this->assertEmpty($response->getContent(), 'content is empty.');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,8 @@ public function accepted(AsynchronousProcess $job, array $links = [], $meta = nu`
`315`	`315`	`public function process(AsynchronousProcess $job, array $links = [], $meta = null, array $headers = [])`
`316`	`316`	`{`
`317`	`317`	`if (!$job->isPending() && $location = $job->getLocation()) {`
`318`		`- return response()->redirectTo($location, Response::HTTP_SEE_OTHER, $headers);`
	`318`	`+ $headers['Location'] = $location;`
	`319`	`+ return $this->createJsonApiResponse(null, Response::HTTP_SEE_OTHER, $headers);`
`319`	`320`	`}`
`320`	`321`
`321`	`322`	`return $this->getContentResponse($job, self::HTTP_OK, $links, $meta, $headers);`