fix: uses implementation-agnostic phrasing for field validity definition

apiaryio · Jun 5, 2019 · 808ad9e · 808ad9e
1 parent bd7b258
commit 808ad9e
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 24 deletions.
diff --git a/features/expectations/body_json_example.feature b/features/expectations/body_json_example.feature
@@ -74,7 +74,7 @@ Feature: Body - JSON example
     }
     """
     Then Gavel will NOT set any errors for "body"
-    And Gavel will set "isValid" to "true" for "body"
+    And field "body" is valid
     And Request or Response is valid
 
   Scenario: Extra array member in real JSON body

diff --git a/features/expectations/body_json_schema.feature b/features/expectations/body_json_schema.feature
@@ -45,7 +45,7 @@ Feature: Body - JSON schema draft v4
     }
     """
     Then Gavel will NOT set any errors for "body"
-    And Gavel will set "isValid" to "true" for "body"
+    And field "body" is valid
     And Request or Response is valid
 
   Scenario: Payload body not valid against schema

diff --git a/features/expectations/body_json_schemav3.feature b/features/expectations/body_json_schemav3.feature
@@ -48,7 +48,7 @@ Feature: Body - JSON schema draft v3
     }
     """
     Then Gavel will NOT set any errors for "body"
-    And Gavel will set "isValid" to "true" for "body"
+    And field "body" is valid
     And Request or Response is valid
 
   Scenario: Payload body not valid against schema

diff --git a/features/expectations/body_text_example.feature b/features/expectations/body_text_example.feature
@@ -28,7 +28,7 @@ Feature: Body - text example
     Dog, cat, mouse!
     """
     Then Gavel will set some error for "body"
-    And Gavel will set "isValid" to "false" for "body"
+    And field "body" is NOT valid
     And Request or Response is NOT valid
 
   Scenario: Line is changed in real textual body
@@ -39,7 +39,7 @@ Feature: Body - text example
     Dog, cat, mouse!
     """
     Then Gavel will set some error for "body"
-    And Gavel will set "isValid" to "false" for "body"
+    And field "body" is NOT valid
     And Request or Response is NOT valid
 
   Scenario: Text in body equals defined example
@@ -50,6 +50,6 @@ Feature: Body - text example
     Dog, cat, mouse!
     """
     Then Gavel will NOT set any errors for "body"
-    And Gavel will set "isValid" to "true" for "body"
+    And field "body" is valid
     And Request or Response is valid
 
diff --git a/features/expectations/headers.feature b/features/expectations/headers.feature
@@ -18,7 +18,7 @@ Feature: Headers
     Content-Type: text/plain
     """
     Then Gavel will set some error for "headers"
-    And Gavel will set "isValid" to "false" for "headers"
+    And field "headers" is NOT valid
     And Request or Response is NOT valid
 
   @stable
@@ -32,7 +32,7 @@ Feature: Headers
     ETag: 68b329da9893e34099c7d8ad5cb9c940
     """
     Then Gavel will NOT set any errors for "headers"
-    And Gavel will set "isValid" to "true" for "headers"
+    And field "headers" is valid
     And Request or Response is valid
 
   @stable
@@ -45,7 +45,7 @@ Feature: Headers
     ETag: 68b329da9893e34099c7d8ad5cb9c940
     """
     Then Gavel will set some error for "headers"
-    And Gavel will set "isValid" to "false" for "headers"
+    And field "headers" is NOT valid
     And Request or Response is NOT valid
 
   @stable
@@ -58,7 +58,7 @@ Feature: Headers
     ETag: something-completely-different
     """
     Then Gavel will NOT set any errors for "headers"
-    And Gavel will set "isValid" to "true" for "headers"
+    And field "headers" is valid
     And Request or Response is valid
 
 
diff --git a/features/expectations/method.feature b/features/expectations/method.feature
@@ -4,14 +4,14 @@ Feature: Method
   Background:
     Given you expect HTTP message method "POST"
 
-  Scenario: Different HTTP message method
-    When real HTTP message method is "GET"
-    Then Gavel will set some errors for "method"
-    And Gavel will set "isValid" to "false" for "method"
-    And Request or Response is NOT valid
-
   Scenario: HTTP message method match
     When real method is "POST"
     Then Gavel will NOT set any errors for "method"
-    And Gavel will set "isValid" to "true" for "method"
+    And field "method" is valid
     And Request or Response is valid
+
+  Scenario: Different HTTP message method
+    When real HTTP message method is "GET"
+    Then Gavel will set some errors for "method"
+    And field "method" is NOT valid
+    And Request or Response is NOT valid
diff --git a/features/expectations/status_code.feature b/features/expectations/status_code.feature
@@ -4,14 +4,14 @@ Feature: Status code
   Background:
     Given you expect HTTP status code "200"
 
-  Scenario: Different real response status
-    When real status code is "500"
-    Then Gavel will set some error for "statusCode"
-    And Gavel will set "isValid" to "false" for "statusCode"
-    And Request or Response is NOT valid
-
   Scenario: Response status code match
     When real status code is "200"
     Then Gavel will NOT set any errors for "statusCode"
-    And Gavel will set "isValid" to "true" for "statusCode"
+    And field "statusCode" is valid
     And Request or Response is valid
+
+  Scenario: Different real response status
+    When real status code is "500"
+    Then Gavel will set some error for "statusCode"
+    And field "statusCode" is NOT valid
+    And Request or Response is NOT valid