From 5474dff74aea9bffff70f9c5e12640370866bcdf Mon Sep 17 00:00:00 2001 From: stickevi Date: Thu, 16 Nov 2017 10:08:12 -0800 Subject: [PATCH] Update S3 link tests to reflect new S3Client default behavior and endpoints. --- tests/View/Helper/S3LinkTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/View/Helper/S3LinkTest.php b/tests/View/Helper/S3LinkTest.php index 95058ed..12b0909 100644 --- a/tests/View/Helper/S3LinkTest.php +++ b/tests/View/Helper/S3LinkTest.php @@ -34,7 +34,7 @@ public function setUp() public function testGenerateSimpleLink() { $link = $this->viewHelper->__invoke('my-object', 'my-bucket'); - $this->assertEquals('https://s3.amazonaws.com/my-bucket/my-object', $link); + $this->assertEquals('https://my-bucket.s3.amazonaws.com/my-object', $link); } public function testCanUseDefaultBucket() @@ -42,7 +42,7 @@ public function testCanUseDefaultBucket() $this->viewHelper->setDefaultBucket('my-default-bucket'); $link = $this->viewHelper->__invoke('my-object'); - $this->assertEquals('https://s3.amazonaws.com/my-default-bucket/my-object', $link); + $this->assertEquals('https://my-default-bucket.s3.amazonaws.com/my-object', $link); } public function testAssertGivenBucketOverrideDefaultBucket() @@ -50,7 +50,7 @@ public function testAssertGivenBucketOverrideDefaultBucket() $this->viewHelper->setDefaultBucket('my-default-bucket'); $link = $this->viewHelper->__invoke('my-object', 'my-overriden-bucket'); - $this->assertEquals('https://s3.amazonaws.com/my-overriden-bucket/my-object', $link); + $this->assertEquals('https://my-overriden-bucket.s3.amazonaws.com/my-object', $link); } public function testCreatesUrlsForRegionalBuckets() @@ -67,7 +67,7 @@ public function testCreatesUrlsForRegionalBuckets() $viewHelper = new S3Link($s3Client); $link = $viewHelper->__invoke('my-object', 'my-bucket'); - $this->assertEquals('https://s3-sa-east-1.amazonaws.com/my-bucket/my-object', $link); + $this->assertEquals('https://my-bucket.s3.sa-east-1.amazonaws.com/my-object', $link); } /** @@ -95,7 +95,7 @@ public function testGenerateSignedLink() $url = $viewHelper->__invoke('my-object', 'my-bucket', $expires); - $this->assertStringStartsWith('https://s3-sa-east-1.amazonaws.com/my-bucket/my-object?', $url); + $this->assertStringStartsWith('https://my-bucket.s3.sa-east-1.amazonaws.com/my-object?', $url); $this->assertContains('X-Amz-Security-Token=999', $url); $this->assertContains('X-Amz-Content-Sha256=', $url); $this->assertContains('X-Amz-Expires=', $url);