diff --git a/pkg/sqs/Tests/Spec/SqsProducerTest.php b/pkg/sqs/Tests/Spec/SqsProducerTest.php index cd61b9d2a..19e55383b 100644 --- a/pkg/sqs/Tests/Spec/SqsProducerTest.php +++ b/pkg/sqs/Tests/Spec/SqsProducerTest.php @@ -2,7 +2,7 @@ namespace Enqueue\Sqs\Tests\Spec; -use Enqueue\Sqs\SqsConnectionFactory; +use Enqueue\Test\SqsExtension; use Interop\Queue\Spec\PsrProducerSpec; /** @@ -10,17 +10,13 @@ */ class SqsProducerTest extends PsrProducerSpec { + use SqsExtension; + /** * {@inheritdoc} */ protected function createProducer() { - $factory = new SqsConnectionFactory([ - 'key' => getenv('AWS__SQS__KEY'), - 'secret' => getenv('AWS__SQS__SECRET'), - 'region' => getenv('AWS__SQS__REGION'), - ]); - - return $factory->createContext()->createProducer(); + return $this->buildSqsContext()->createProducer(); } } diff --git a/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php b/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php index 8c1391915..2623969f4 100644 --- a/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php +++ b/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php @@ -2,10 +2,10 @@ namespace Enqueue\Sqs\Tests\Spec; -use Enqueue\Sqs\SqsConnectionFactory; use Enqueue\Sqs\SqsContext; use Enqueue\Sqs\SqsDestination; use Enqueue\Test\RetryTrait; +use Enqueue\Test\SqsExtension; use Interop\Queue\PsrContext; use Interop\Queue\Spec\SendAndReceiveDelayedMessageFromQueueSpec; @@ -16,6 +16,7 @@ class SqsSendAndReceiveDelayedMessageFromQueueTest extends SendAndReceiveDelayedMessageFromQueueSpec { use RetryTrait; + use SqsExtension; /** * @var SqsContext @@ -41,13 +42,7 @@ protected function tearDown() */ protected function createContext() { - $factory = new SqsConnectionFactory([ - 'key' => getenv('AWS__SQS__KEY'), - 'secret' => getenv('AWS__SQS__SECRET'), - 'region' => getenv('AWS__SQS__REGION'), - ]); - - return $this->context = $factory->createContext(); + return $this->context = $this->buildSqsContext(); } /** diff --git a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php index 9bfb753f4..e694e88aa 100644 --- a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php +++ b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php @@ -2,9 +2,9 @@ namespace Enqueue\Sqs\Tests\Spec; -use Enqueue\Sqs\SqsConnectionFactory; use Enqueue\Sqs\SqsContext; use Enqueue\Sqs\SqsDestination; +use Enqueue\Test\SqsExtension; use Interop\Queue\PsrContext; use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec; @@ -13,6 +13,8 @@ */ class SqsSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec { + use SqsExtension; + /** * @var SqsContext */ @@ -37,13 +39,7 @@ protected function tearDown() */ protected function createContext() { - $factory = new SqsConnectionFactory([ - 'key' => getenv('AWS__SQS__KEY'), - 'secret' => getenv('AWS__SQS__SECRET'), - 'region' => getenv('AWS__SQS__REGION'), - ]); - - return $this->context = $factory->createContext(); + return $this->context = $this->buildSqsContext(); } /** diff --git a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php index cb611d6df..831b23775 100644 --- a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php +++ b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php @@ -2,9 +2,9 @@ namespace Enqueue\Sqs\Tests\Spec; -use Enqueue\Sqs\SqsConnectionFactory; use Enqueue\Sqs\SqsContext; use Enqueue\Sqs\SqsDestination; +use Enqueue\Test\SqsExtension; use Interop\Queue\PsrContext; use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec; @@ -13,6 +13,8 @@ */ class SqsSendToAndReceiveFromTopicTest extends SendToAndReceiveFromTopicSpec { + use SqsExtension; + /** * @var SqsContext */ @@ -37,13 +39,7 @@ protected function tearDown() */ protected function createContext() { - $factory = new SqsConnectionFactory([ - 'key' => getenv('AWS__SQS__KEY'), - 'secret' => getenv('AWS__SQS__SECRET'), - 'region' => getenv('AWS__SQS__REGION'), - ]); - - return $this->context = $factory->createContext(); + return $this->context = $this->buildSqsContext(); } /**