Move deletion of SQS queues to After call (#4207)

Author: trivikr

features/sqs/messages.feature

@@ -10,12 +10,10 @@ Feature: SQS Messages
     Then the result should include a message ID
     And the result should have an MD5 digest of "eb61eead90e3b899c6bcbe27ac581660"
     And I should eventually be able to receive "HELLO" from the queue
-    Then I delete the SQS queue
 
   Scenario: Binary payloads
     Given I create a queue with the prefix name "aws-js-sdk"
     When I send the message "HELLO" with a binary attribute
     Then the result should include a message ID
     And the result should have an MD5 digest of "eb61eead90e3b899c6bcbe27ac581660"
     And I should eventually be able to receive "HELLO" from the queue with a binary attribute
-    Then I delete the SQS queue

features/sqs/queues.feature

@@ -8,11 +8,8 @@ Feature: SQS Queues
     Given I create a queue with the prefix name "aws-js-sdk"
     And I create a queue with the prefix name "aws-js-sdk"
     Then list queues should eventually return the queue urls
-    Then I delete the SQS queue
-    Then I delete the SQS queue
 
   Scenario: Making a queue request across regions
     Given I have a "SQS" service in the "us-west-1" region
     And I create a queue with the prefix name "aws-js-sdk"
     When I have a "SQS" service in the "us-east-1" region
-    Then I delete the SQS queue

features/sqs/step_definitions/queues.js

@@ -24,10 +24,4 @@ module.exports = function () {
       this.request(null, 'listQueues', {}, next);
     }, { maxTime: 60 });
   });
-
-  this.Then(/^I delete the SQS queue$/, function (callback) {
-    var url = this.createdQueues.pop();
-    this.request(null, 'deleteQueue', { QueueUrl: url }, callback);
-  });
-
 };

features/sqs/step_definitions/sqs.js

@@ -4,4 +4,10 @@ module.exports = function() {
     this.createdQueues = [];
     callback();
   });
+
+  this.After("@sqs", async function () {
+    for (var queueUrl of this.createdQueues) {
+      await this.service.deleteQueue({QueueUrl: queueUrl}).promise();
+    }
+  });
 };