chore: aligns expected/asserted grammar in Gherkin suites

apiaryio · Jul 3, 2019 · 50883ae · 50883ae
1 parent f77395e
commit 50883ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/test/cucumber/steps/fields.js b/test/cucumber/steps/fields.js
@@ -5,7 +5,10 @@ chai.config.truncateThreshold = 0;
 const { expect } = chai;
 
 module.exports = function() {
-  this.Then(/^field "([^"]*)" equals:$/, function(fieldName, expectedJson) {
+  this.Then(/^result field "([^"]*)" equals:$/, function(
+    fieldName,
+    expectedJson
+  ) {
     const expected = jhp.parse(expectedJson);
     expect(this.result.fields[fieldName]).to.deep.equal(expected);
   });

diff --git a/test/cucumber/steps/general.js b/test/cucumber/steps/general.js
@@ -17,21 +17,21 @@ module.exports = function() {
     this.actual = jhp.parse(actualMessage);
   });
 
-  this.Given(/^actual "([^"]*)" field equals "([^"]*)"/, function(
+  this.Given(/^actual field "([^"]*)" equals "([^"]*)"/, function(
     fieldName,
     value
   ) {
     this.actual[fieldName] = value;
   });
 
-  this.Given(/^you expect "([^"]*)" field to equal "([^"]*)"$/, function(
+  this.Given(/^you expect field "([^"]*)" to equal "([^"]*)"$/, function(
     fieldName,
     expectedValue
   ) {
     this.expected[fieldName] = expectedValue;
   });
 
-  this.Given(/^you expect "([^"]*)" field to equal:$/, function(
+  this.Given(/^you expect field "([^"]*)" to equal:$/, function(
     fieldName,
     codeBlock
   ) {
@@ -40,7 +40,7 @@ module.exports = function() {
   });
 
   this.Given(
-    /^you expect "body" field to match the following "([^"]*)":$/,
+    /^you expect field "body" to match the following "([^"]*)":$/,
     function(bodyType, value) {
       switch (bodyType.toLowerCase()) {
         case 'json schema':
@@ -53,7 +53,7 @@ module.exports = function() {
     }
   );
 
-  this.Given(/^actual "([^"]*)" field equals:$/, function(
+  this.Given(/^actual field "([^"]*)" equals:$/, function(
     fieldName,
     codeBlock
   ) {
@@ -93,7 +93,10 @@ ${dmp.patch_toText(dmp.patch_make(stringifiedActual, expectedResult))}
     );
   });
 
-  this.Then(/^field "(\w+)" is( NOT)? valid$/i, function(fieldName, isInvalid) {
+  this.Then(/^result field "(\w+)" is( NOT)? valid$/i, function(
+    fieldName,
+    isInvalid
+  ) {
     expect(this.result).to.have.nested.property(
       `fields.${fieldName}.valid`,
       !isInvalid