From 096b4db322c7a8591c907cae8b844ca3bd6f1d1a Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 10 Nov 2022 22:21:02 +0000 Subject: [PATCH] Improve micropub media tests --- tests/Feature/MicropubMediaTest.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/Feature/MicropubMediaTest.php b/tests/Feature/MicropubMediaTest.php index 0cff5a2b..e8eb24d0 100644 --- a/tests/Feature/MicropubMediaTest.php +++ b/tests/Feature/MicropubMediaTest.php @@ -93,14 +93,14 @@ class MicropubMediaTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); - $path = parse_url($response->getData()->location, PHP_URL_PATH); + $path = parse_url($response->headers->get('Location'), PHP_URL_PATH); $filename = substr($path, 7); $lastUploadResponse = $this->get( '/api/media?q=last', ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); - $lastUploadResponse->assertJson(['url' => $response->getData()->location]); + $lastUploadResponse->assertJson(['url' => $response->headers->get('Location')]); // now remove file unlink(storage_path('app/') . $filename); @@ -121,7 +121,7 @@ class MicropubMediaTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); - $path = parse_url($response->getData()->location, PHP_URL_PATH); + $path = parse_url($response->headers->get('Location'), PHP_URL_PATH); $filename = substr($path, 7); $sourceUploadResponse = $this->get( @@ -129,7 +129,7 @@ class MicropubMediaTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); $sourceUploadResponse->assertJson(['items' => [[ - 'url' => $response->getData()->location, + 'url' => $response->headers->get('Location'), ]]]); // now remove file @@ -151,7 +151,7 @@ class MicropubMediaTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); - $path = parse_url($response->getData()->location, PHP_URL_PATH); + $path = parse_url($response->headers->get('Location'), PHP_URL_PATH); $filename = substr($path, 7); $sourceUploadResponse = $this->get( @@ -159,7 +159,7 @@ class MicropubMediaTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); $sourceUploadResponse->assertJson(['items' => [[ - 'url' => $response->getData()->location, + 'url' => $response->headers->get('Location'), ]]]); // And given our limit of 1 there should only be one result $this->assertCount(1, json_decode($sourceUploadResponse->getContent(), true)['items']); @@ -257,7 +257,7 @@ class MicropubMediaTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); - $path = parse_url($response->getData()->location, PHP_URL_PATH); + $path = parse_url($response->headers->get('Location'), PHP_URL_PATH); $filename = substr($path, 7); Queue::assertPushed(ProcessMedia::class); Storage::disk('local')->assertExists($filename); @@ -280,7 +280,7 @@ class MicropubMediaTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); - $path = parse_url($response->getData()->location, PHP_URL_PATH); + $path = parse_url($response->headers->get('Location'), PHP_URL_PATH); $filename = substr($path, 7); Queue::assertPushed(ProcessMedia::class); Storage::disk('local')->assertExists($filename); @@ -303,7 +303,7 @@ class MicropubMediaTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); - $path = parse_url($response->getData()->location, PHP_URL_PATH); + $path = parse_url($response->headers->get('Location'), PHP_URL_PATH); $filename = substr($path, 7); Queue::assertPushed(ProcessMedia::class); Storage::disk('local')->assertExists($filename); @@ -325,7 +325,7 @@ class MicropubMediaTest extends TestCase ['HTTP_Authorization' => 'Bearer ' . $this->getToken()] ); - $path = parse_url($response->getData()->location, PHP_URL_PATH); + $path = parse_url($response->headers->get('Location'), PHP_URL_PATH); $filename = substr($path, 7); Queue::assertPushed(ProcessMedia::class); Storage::disk('local')->assertExists($filename);