feat: use simplified cucumber expressions (#1076)

Author: trivikr

features/autoscaling/step_definitions/autoscaling.js

@@ -18,11 +18,11 @@ Given("I create a launch configuration with name {string}", function(
   this.request(null, "createLaunchConfiguration", params, callback, false);
 });
 
-Given(/^I describe launch configurations$/, function(callback) {
+Given("I describe launch configurations", function(callback) {
   this.request(null, "describeLaunchConfigurations", {}, callback);
 });
 
-Then(/^the list should contain the launch configuration "([^"]*)"$/, function(
+Then("the list should contain the launch configuration {string}", function(
   name,
   callback
 ) {
@@ -32,7 +32,7 @@ Then(/^the list should contain the launch configuration "([^"]*)"$/, function(
   callback();
 });
 
-Then(/^I delete the launch configuration "([^"]*)"$/, function(name, callback) {
+Then("I delete the launch configuration {string}", function(name, callback) {
   const params = { LaunchConfigurationName: name };
   this.request(null, "deleteLaunchConfiguration", params, callback);
 });

features/cloudfront/step_definitions/cloudfront.js

@@ -1,5 +1,5 @@
 const { CloudFront } = require("../../../clients/client-cloudfront");
-const { Before, Given, Then, When } = require("cucumber");
+const { Before, Given } = require("cucumber");
 
 const createParams = {
   CallerReference: "",
@@ -75,6 +75,6 @@ Given("I create a CloudFront distribution with name prefix {string}", function(
   );
 });
 
-Given(/^I list CloudFront distributions$/, function(callback) {
+Given("I list CloudFront distributions", function(callback) {
   this.request(null, "listDistributions", {}, callback);
 });

features/cloudtrail/step_definitions/cloudtrail.js

@@ -6,11 +6,11 @@ Before({ tags: "@cloudtrail" }, function(scenario, callback) {
   callback();
 });
 
-Given(/^I describe trails$/, function(callback) {
+Given("I describe trails", function(callback) {
   this.request(null, "describeTrails", {}, callback);
 });
 
-Given(/^I create a trail with an invalid name$/, function(callback) {
+Given("I create a trail with an invalid name", function(callback) {
   this.request(
     null,
     "createTrail",

features/cloudwatch/step_definitions/cloudwatch.js

@@ -52,23 +52,23 @@ Given("I create a CloudWatch alarm with name {string}", function(
   this.request(null, "putMetricAlarm", this.cloudWatchAlarm, callback, false);
 });
 
-Given(/^I list the CloudWatch alarms$/, function(callback) {
+Given("I list the CloudWatch alarms", function(callback) {
   const params = {
     MetricName: this.cloudWatchAlarm.MetricName,
     Namespace: this.cloudWatchAlarm.Namespace
   };
   this.request(null, "describeAlarmsForMetric", params, callback);
 });
 
-Then(/^the list should contain the CloudWatch alarm$/, function(callback) {
+Then("the list should contain the CloudWatch alarm", function(callback) {
   const name = this.cloudWatchAlarm.AlarmName;
   this.assert.contains(this.data.MetricAlarms, function(alarm) {
     return alarm.AlarmName === name;
   });
   callback();
 });
 
-Then(/^I delete the CloudWatch alarm$/, function(callback) {
+Then("I delete the CloudWatch alarm", function(callback) {
   this.request(
     null,
     "deleteAlarms",

features/cloudwatchlogs/step_definitions/cloudwatchlogs.js

@@ -21,19 +21,19 @@ Given("I create a CloudWatch logGroup with prefix {string}", function(
   );
 });
 
-Given(/^I list the CloudWatch logGroups$/, function(callback) {
+Given("I list the CloudWatch logGroups", function(callback) {
   this.request(null, "describeLogGroups", {}, callback);
 });
 
-Then(/^the list should contain the CloudWatch logGroup$/, function(callback) {
+Then("the list should contain the CloudWatch logGroup", function(callback) {
   const name = this.logGroupName;
   this.assert.contains(this.data.logGroups, function(alarm) {
     return alarm.logGroupName === name;
   });
   callback();
 });
 
-Then(/^I delete the CloudWatch logGroup$/, function(callback) {
+Then("I delete the CloudWatch logGroup", function(callback) {
   this.request(
     null,
     "deleteLogGroup",

features/cognitoidentity/step_definitions/cognitoidentity.js

@@ -18,7 +18,7 @@ Given("I create a Cognito identity pool with prefix {string}", function(
   this.request(null, "createIdentityPool", params, callback, expectError);
 });
 
-Given(/^I describe the Cognito identity pool ID$/, function(callback) {
+Given("I describe the Cognito identity pool ID", function(callback) {
   this.identityPoolId = this.data.IdentityPoolId;
   this.request(
     null,
@@ -28,7 +28,7 @@ Given(/^I describe the Cognito identity pool ID$/, function(callback) {
   );
 });
 
-Then(/^I delete the Cognito identity pool$/, function(callback) {
+Then("I delete the Cognito identity pool", function(callback) {
   this.request(
     null,
     "deleteIdentityPool",

features/cognitosync/step_definitions/cognitosync.js

@@ -6,12 +6,12 @@ Before({ tags: "@cognitosync" }, function(scenario, callback) {
   callback();
 });
 
-Given(/^I list Cognito identity pool usage$/, function(callback) {
+Given("I list Cognito identity pool usage", function(callback) {
   this.request(null, "listIdentityPoolUsage", {}, callback);
 });
 
 Given(
-  /^I list Cognito data sets with identity pool id "([^"]*)" and identity id "([^"]*)"$/,
+  "I list Cognito data sets with identity pool id {string} and identity id {string}",
   function(idpid, idid, callback) {
     const params = { IdentityPoolId: idpid, IdentityId: idid };
     this.request(null, "listDatasets", params, callback, false);

features/directconnect/step_definitions/directconnect.js

@@ -6,14 +6,13 @@ Before({ tags: "@directconnect" }, function(scenario, callback) {
   callback();
 });
 
-Given(
-  /^I create a Direct Connect connection with an invalid location$/,
-  function(callback) {
-    const params = {
-      bandwidth: "1Gbps",
-      location: "INVALID_LOCATION",
-      connectionName: this.uniqueName("aws-sdk-js")
-    };
-    this.request(null, "createConnection", params, callback, false);
-  }
-);
+Given("I create a Direct Connect connection with an invalid location", function(
+  callback
+) {
+  const params = {
+    bandwidth: "1Gbps",
+    location: "INVALID_LOCATION",
+    connectionName: this.uniqueName("aws-sdk-js")
+  };
+  this.request(null, "createConnection", params, callback, false);
+});

features/dynamodb/step_definitions/dynamodb.js

@@ -89,7 +89,7 @@ function createTable(world, callback) {
   });
 }
 
-Given(/^I have a table$/, function(callback) {
+Given("I have a table", function(callback) {
   const world = this;
   this.service.listTables({}, function(err, data) {
     for (let i = 0; i < data.TableNames.length; i++) {
@@ -102,7 +102,7 @@ Given(/^I have a table$/, function(callback) {
   });
 });
 
-When(/^I create a table$/, function(callback) {
+When("I create a table", function(callback) {
   const world = this;
   this.tableName = this.uniqueName("aws-sdk-js-integration");
   this.service.listTables({}, function(err, data) {
@@ -116,12 +116,12 @@ When(/^I create a table$/, function(callback) {
   });
 });
 
-When(/^I put the item:$/, function(string, next) {
+When("I put the item:", function(string, next) {
   const params = { TableName: this.tableName, Item: JSON.parse(string) };
   this.request(null, "putItem", params, next);
 });
 
-When(/^I put a recursive item$/, function(next) {
+When("I put a recursive item", function(next) {
   const params = {
     TableName: this.tableName,
     Item: {
@@ -146,12 +146,12 @@ When(/^I put a recursive item$/, function(next) {
   this.request(null, "putItem", params, next);
 });
 
-Then(/^the item with id "([^"]*)" should exist$/, function(key, next) {
+Then("the item with id {string} should exist", function(key, next) {
   const params = { TableName: this.tableName, Key: { id: { S: key } } };
   this.request(null, "getItem", params, next);
 });
 
-Then(/^it should have attribute "([^"]*)" containing "([^"]*)"$/, function(
+Then("it should have attribute {string} containing {string}", function(
   attr,
   value,
   next
@@ -160,20 +160,20 @@ Then(/^it should have attribute "([^"]*)" containing "([^"]*)"$/, function(
   next();
 });
 
-When(/^I delete the table$/, function(next) {
+When("I delete the table", function(next) {
   const params = { TableName: this.tableName };
   this.request(null, "deleteTable", params, next);
 });
 
-Then(/^the table should eventually exist$/, function(callback) {
+Then("the table should eventually exist", function(callback) {
   waitForTableExists(this, callback);
 });
 
-Then(/^the table should eventually not exist$/, function(callback) {
+Then("the table should eventually not exist", function(callback) {
   waitForTableNotExists(this, callback);
 });
 
-Given(/^my first request is corrupted with CRC checking (ON|OFF)$/, function(
+Given("my first request is corrupted with CRC checking (ON|OFF)", function(
   toggle,
   callback
 ) {
@@ -198,15 +198,15 @@ Given(/^my first request is corrupted with CRC checking (ON|OFF)$/, function(
   req.send();
 });
 
-Then(/^the request should( not)? be retried$/, function(retry, callback) {
+Then("the request should( not)? be retried", function(retry, callback) {
   if (retry && this.response.retryCount > 0)
     callback(new Error("Request was incorrectly retried"));
   if (!retry && this.response.retryCount == 0)
     callback(new Error("Request was incorrectly retried"));
   callback();
 });
 
-Given(/^all of my requests are corrupted with CRC checking ON$/, function(
+Given("all of my requests are corrupted with CRC checking ON", function(
   callback
 ) {
   const world = this;
@@ -223,15 +223,13 @@ Given(/^all of my requests are corrupted with CRC checking ON$/, function(
   req.send();
 });
 
-When(/^the request is retried the maximum number of times$/, function(
-  callback
-) {
+When("the request is retried the maximum number of times", function(callback) {
   if (this.response.retryCount != 2)
     callback(new Error("Incorrect retry count"));
   callback();
 });
 
-Then(/^the request should( not)? fail with a CRC checking error$/, function(
+Then("the request should( not)? fail with a CRC checking error", function(
   failed,
   callback
 ) {
@@ -241,15 +239,16 @@ Then(/^the request should( not)? fail with a CRC checking error$/, function(
   callback();
 });
 
-Given(
-  /^I try to delete an item with key "([^"]*)" from table "([^"]*)"$/,
-  function(key, table, callback) {
-    const params = { TableName: table, Key: { id: { S: key } } };
-    this.request(null, "deleteItem", params, callback, false);
-  }
-);
+Given("I try to delete an item with key {string} from table {string}", function(
+  key,
+  table,
+  callback
+) {
+  const params = { TableName: table, Key: { id: { S: key } } };
+  this.request(null, "deleteItem", params, callback, false);
+});
 
-Given(/^I try to delete a table with an empty table parameter$/, function(
+Given("I try to delete a table with an empty table parameter", function(
   callback
 ) {
   this.request(null, "deleteTable", { TableName: "" }, callback, false);

features/ec2/step_definitions/ec2.js

@@ -44,12 +44,12 @@ Before({ tags: "@ec2" }, function(scenario, callback) {
   callback();
 });
 
-Given(/^I describe EC2 regions "([^"]*)"$/, function(regions, callback) {
+Given("I describe EC2 regions {string}", function(regions, callback) {
   regions = regions.split(/\s*,\s*/);
   this.request(null, "describeRegions", { RegionNames: regions }, callback);
 });
 
-Then(/^the EC2 endpoint for "([^"]*)" should be "([^"]*)"$/, function(
+Then("the EC2 endpoint for {string} should be {string}", function(
   region,
   endpoint,
   callback
@@ -70,7 +70,7 @@ Given("I describe the EC2 instance {string}", function(instanceId, callback) {
   );
 });
 
-Given(/^I attempt to copy an encrypted snapshot across regions$/, function(
+Given("I attempt to copy an encrypted snapshot across regions", function(
   callback
 ) {
   const self = this;
@@ -128,7 +128,7 @@ Given(/^I attempt to copy an encrypted snapshot across regions$/, function(
   });
 });
 
-Then(/^the copy snapshot attempt should be successful$/, function(callback) {
+Then("the copy snapshot attempt should be successful", function(callback) {
   this.assert.equal(this.success, true);
   callback();
 });

features/elasticache/step_definitions/elasticache.js

@@ -19,26 +19,26 @@ Given("I create a cache parameter group with name prefix {string}", function(
   this.request(null, "createCacheParameterGroup", params, callback, false);
 });
 
-Given(/^the cache parameter group name is in the result$/, function(callback) {
+Given("the cache parameter group name is in the result", function(callback) {
   const name = this.data.CacheParameterGroup.CacheParameterGroupName;
   this.assert.equal(name, this.cacheGroupName);
   callback();
 });
 
-Given(/^I describe the cache parameter groups$/, function(callback) {
+Given("I describe the cache parameter groups", function(callback) {
   const params = {
     CacheParameterGroupName: this.cacheGroupName
   };
   this.request(null, "describeCacheParameterGroups", params, callback);
 });
 
-Then(/^the cache parameter group should be described$/, function(callback) {
+Then("the cache parameter group should be described", function(callback) {
   const item = this.data.CacheParameterGroups[0];
   this.assert.equal(item.CacheParameterGroupName, this.cacheGroupName);
   callback();
 });
 
-Then(/^I delete the cache parameter group$/, function(callback) {
+Then("I delete the cache parameter group", function(callback) {
   const params = {
     CacheParameterGroupName: this.cacheGroupName
   };

features/elasticbeanstalk/step_definitions/elasticbeanstalk.js

@@ -29,13 +29,13 @@ Given(
   }
 );
 
-Given(/^I describe the Elastic Beanstalk application$/, function(callback) {
+Given("I describe the Elastic Beanstalk application", function(callback) {
   const params = { ApplicationNames: [this.appName] };
   this.request(null, "describeApplications", params, callback);
 });
 
 Then(
-  /^the result should contain the Elastic Beanstalk application version$/,
+  "the result should contain the Elastic Beanstalk application version",
   function(callback) {
     this.assert.deepEqual(this.data.Applications[0].Versions, [
       this.appVersion
@@ -45,14 +45,14 @@ Then(
 );
 
 Then(
-  /^the result should contain the Elastic Beanstalk application name$/,
+  "the result should contain the Elastic Beanstalk application name",
   function(callback) {
     this.assert.equal(this.data.Applications[0].ApplicationName, this.appName);
     callback();
   }
 );
 
-Then(/^I delete the Elastic Beanstalk application$/, function(callback) {
+Then("I delete the Elastic Beanstalk application", function(callback) {
   const params = { ApplicationName: this.appName };
   this.request(null, "deleteApplication", params, callback);
 });