cucumber-rest-bdd 0.4.4.pre.124 → 0.4.4.pre.136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb615fea4da2428d0bb99748c5095c18f7d6b11f
-  data.tar.gz: d94194a9a2f89a51ce610d206e2c801152b98261
+  metadata.gz: f9bb4e19befe54674236ada928775cc8f6a4d6a1
+  data.tar.gz: 0cfc7671388549be92b15f8e7e927600c00ad06a
 SHA512:
-  metadata.gz: bb7b8b2539ce1d5fc8907c667376a49f62e795552cf5fde3ba469f1e0ba3ccdb19dd77e0ee150176c60499554e6837a96f53b8c83a0f4b9fb86a5a3622cb077c
-  data.tar.gz: 39309d24870a52c17a13306fb49ad64190cc0887f349934c21f6a2181f362e77c974bd28fa6d508ff8fa4988ce86a85d15a35d3f3a1d1b2f3b57c88bdcc52b73
+  metadata.gz: 1de33c7788797ee55173764bf15997c43d965e292006582c0d5b4fdcda13c92babd02be5f692c6b6de597ad1d7de2f2dbd456beb0ba8744bc802e653756c53b1
+  data.tar.gz: b6c62f44e4bd80219a74a8f5f6ea9ff40075c4e2acbd7e70ebe429f5e7432d2066af37186cacaa327043394115477ce946f236c812e4cb388bf96ea6510b95a3

data/Dockerfile

@@ -18,6 +18,7 @@ ENV field_camel=false
 ENV resource_single=false
 ENV cucumber_api_verbose=false
 ENV data_key=
+ENV error_key=error
 ENV set_parent_id=false
 
 CMD ["cucumber"]

data/Makefile

@@ -5,7 +5,7 @@ build:
 	docker-compose build runner
 
 test: start-test-server
-	docker-compose run --rm runner cucumber --order random
+	docker-compose run --rm runner cucumber --order random --format progress
 	make stop-test-server > /dev/null 2>&1 &
 
 start-test-server: stop-test-server

data/README.md

@@ -154,6 +154,31 @@ Then more than 10 posts have five comments
 Then less than 200 posts have five comments
 ```
 
+#### Errors
+
+If the `error_key` environment variable is set, if that key is used as the initial step it will ignore any `data_key`
+setting.
+
+Example: `error_key=error`, `data_key=data`
+
+```gherkin
+Then the response has a list of posts       | {"data":[{"id": 12}]}
+
+Then the response has one error             | {"errors":[{"message": "Error"}]}
+
+Then the response has an error              | {"error": {"message": "Error}}
+```
+
+Example: `error_key=`, `data_key=data`
+
+```gherkin
+Then the response has a list of posts       | {"data":[{"id": 12}]}
+
+Then the response has one error             | {"data": {"errors":[{"message": "Error"}]}}
+
+Then the response has an error              | {"data": {"error": {"message": "Error}}}
+```
+
 ### Creation
 
 ```gherkin

data/STEPS.md

@@ -139,6 +139,37 @@ Then more than two items have have the following    <N/A>
                                                       "application/json"
 ```
 
+### Error Handling
+
+Using the environment variable: `error_key` to represent the error resource
+
+```
+Behavioural                                         Functional
+--------------------------------------------------- --------------------------------------------------------------
+Then the response has one error:                    Then the JSON response should have "errors[0].code" of type
+    | attribute | type   | value   |                  string with value "ERR-BLA"
+    | code      | string | ERR-BLA |
+
+Then the response has one error with attributes:    Then the JSON response should have "errors[0].code" of type
+    | attribute | type   | value   |                  string with value "ERR-BLA"
+    | code      | string | ERR-BLA |
+
+Then the response has at least one error           Then the JSON response should have "errors" of type array
+                                                     with at least 1 entry
+
+Then the response has an error                      Then the JSON response should have required key "error" of
+Then the response contains an error                   type object
+
+Then the response has two errors with:
+    | attribute | type   | value       |
+    | message   | string | super error |
+
+Then the response has three errors with two links   <N/A>
+  with:
+    | attribute | type   | value       |
+    | href      | string | http://oops |
+```
+
 ### Attribute saving and re-use
 
 ```
@@ -155,7 +186,7 @@ Behavioural                                         Functional
 --------------------------------------------------- --------------------------------------------------------------
 When I request a list of comments for post "1"      When I send a GET request to "http://url/posts/1/comments"
 
-When I request the comment "2" for post "3"         When I send a GET request to "http://url/posts/2/comments/3"
+When I request the comment "2" for post "3"         When I send a GET request to "http://url/posts/3/comments/2"
 
 When I request the photo "3" in album "4" for user  When I send a GET request to
   "5"                                                 "http://url/users/5/albums/4/photos/3"

data/docker-compose.yml

@@ -2,7 +2,7 @@ version: '2'
 services:
     test-server:
         image: clue/json-server
-        command: --routes /data/routes.json
+        command: --routes /data/routes.json --middlewares /data/error.js
         volumes:
             - ./server:/data:ro
 
@@ -19,4 +19,5 @@ services:
             - field_camel=true
             - resource_single=false
             - data_key=
+            - error_key=error
             - set_parent_id=true

data/features/errors.feature

@@ -0,0 +1,22 @@
+Feature: Handling error responses
+
+    Background:
+        Given I am a client
+
+    Scenario: Handle errors as a list
+        When I request the error "list"
+        Then the request fails because the post was not found
+        And the response contains at least one errors
+        And the response has one error
+        And the response has one error with the attributes:
+            | attribute   | type    | value     |
+            | Message     | string  | Not Found |
+
+    Scenario: Handle error as a single item
+        When I request the error "single"
+        Then the request fails because it was invalid
+        And the response contains an error
+        And the response has an error
+        And the response has an error with the attributes:
+            | attribute   | type    | value       |
+            | Message     | string  | Bad Request |

data/lib/cucumber-rest-bdd/steps/response.rb

@@ -4,11 +4,11 @@ require 'cucumber-rest-bdd/types'
 # response interrogation
 
 Then(/^the response is a list (?:of|containing) (#{FEWER_MORE_THAN})?\s*(#{CAPTURE_INT}|\d+) .*?$/) do |count_mod, count|
-    list = @response.get_as_type get_root_json_path(), 'array'
-    raise %/Expected at least #{count} items in array for path '#{get_root_json_path()}', found: #{list.count}\n#{@response.to_json_s}/ if !num_compare(count_mod, list.count, count.to_i)
+    list = @response.get_as_type get_root_data_key(), 'array'
+    raise %/Expected at least #{count} items in array for path '#{get_root_data_key()}', found: #{list.count}\n#{@response.to_json_s}/ if !num_compare(count_mod, list.count, count.to_i)
 end
 
-Then(/^the response ((?:#{HAVE_SYNONYM} (?:a|an|(?:(?:#{FEWER_MORE_THAN})?\s*#{CAPTURE_INT}|\d+)) (?:\w+) )*)#{HAVE_SYNONYM} (?:the )?(?:following )?(?:data )?attributes:$/) do |nesting, attributes|
+Then(/^the response ((?:#{HAVE_SYNONYM} (?:a|an|(?:(?:#{FEWER_MORE_THAN})?\s*#{CAPTURE_INT}|\d+)) (?:\w+) )*)#{HAVE_SYNONYM} (?:the )?(?:following )?(?:data|error )?attributes:$/) do |nesting, attributes|
     expected = get_attributes(attributes.hashes)
     groups = nesting
     grouping = get_grouping(groups)
@@ -16,8 +16,8 @@ Then(/^the response ((?:#{HAVE_SYNONYM} (?:a|an|(?:(?:#{FEWER_MORE_THAN})?\s*#{C
         root: true,
         type: 'single'
     })
-    data = @response.get get_root_json_path()
-    raise %/Could not find a match for: #{nesting}\n#{expected.inspect}\n#{@response.to_json_s}/ if !nest_match(data, grouping, expected)
+    data = @response.get get_key(grouping)
+    raise %/Could not find a match for: #{nesting}\n#{expected.inspect}\n#{@response.to_json_s}/ if data.empty? || !nest_match(data, grouping, expected)
 end
 
 Then(/^the response ((?:#{HAVE_SYNONYM} (?:a|an|(?:(?:#{FEWER_MORE_THAN})?\s*#{CAPTURE_INT}|\d+)) (?:\w+)\s?)+)$/) do |nesting|
@@ -27,8 +27,8 @@ Then(/^the response ((?:#{HAVE_SYNONYM} (?:a|an|(?:(?:#{FEWER_MORE_THAN})?\s*#{C
         root: true,
         type: 'single'
     })
-    data = @response.get get_root_json_path()
-    raise %/Could not find a match for: #{nesting}\n#{@response.to_json_s}/ if !nest_match(data, grouping, {})
+    data = @response.get get_key(grouping)
+    raise %/Could not find a match for: #{nesting}\n#{@response.to_json_s}/ if data.empty? || !nest_match(data, grouping, {})
 end
 
 Then(/^(#{FEWER_MORE_THAN})?\s*(#{CAPTURE_INT}|\d+) (?:.*?) ((?:#{HAVE_SYNONYM} (?:a|an|(?:(?:#{FEWER_MORE_THAN})?\s*#{CAPTURE_INT}|\d+)) (?:\w+) )*)#{HAVE_SYNONYM} (?:the )?(?:following )?(?:data )?attributes:$/) do |count_mod, count, nesting, attributes|
@@ -41,7 +41,7 @@ Then(/^(#{FEWER_MORE_THAN})?\s*(#{CAPTURE_INT}|\d+) (?:.*?) ((?:#{HAVE_SYNONYM}
         count: count.to_i,
         count_mod: count_mod
     })
-    data = @response.get get_root_json_path()
+    data = @response.get get_key(grouping)
     raise %/Expected #{compare_to_string(count_mod)}#{count} items in array with attributes for: #{nesting}\n#{expected.inspect}\n#{@response.to_json_s}/ if !nest_match(data, grouping, expected)
 end
 
@@ -54,7 +54,7 @@ Then(/^(#{FEWER_MORE_THAN})?\s*(#{CAPTURE_INT}|\d+) (?:.*?) ((?:#{HAVE_SYNONYM}
         count: count.to_i,
         count_mod: count_mod
     })
-    data = @response.get get_root_json_path()
+    data = @response.get get_key(grouping)
     raise %/Expected #{compare_to_string(count_mod)}#{count} items in array with: #{nesting}\n#{@response.to_json_s}/ if !nest_match(data, grouping, {})
 end
 
@@ -74,7 +74,7 @@ Then(/^the response ((?:#{HAVE_SYNONYM} (?:a|an|(?:(?:#{FEWER_MORE_THAN})?\s*#{C
         root: true,
         type: 'single'
     })
-    data = @response.get get_root_json_path()
+    data = @response.get get_key(grouping)
     raise %/Could not find a match for #{nesting}#{compare_to_string(num_mod)}#{num} #{item}\n#{@response.to_json_s}/ if !nest_match(data, grouping, {})
 end
 
@@ -96,10 +96,19 @@ Then(/^(#{FEWER_MORE_THAN})?\s*(#{CAPTURE_INT}|\d+) (?:.*?) ((?:#{HAVE_SYNONYM}
         count: count.to_i,
         count_mod: count_mod
     })
-    data = @response.get get_root_json_path()
+    data = @response.get get_key(grouping)
     raise %/Expected #{compare_to_string(count_mod)}#{count} items with #{nesting}#{compare_to_string(num_mod)}#{num}#{item}\n#{@response.to_json_s}/ if !nest_match(data, grouping, {})
 end
 
+# gets the relevant key for the response based on the first key element
+def get_key(grouping)
+    if ENV['error_key'] && !ENV['error_key'].empty? && grouping.count > 1 && grouping[-2][:key] == ENV['error_key'] then
+        get_root_error_key()
+    else
+        get_root_data_key()
+    end
+end
+
 # gets an array in the nesting format that nest_match understands to interrogate nested object and array data
 def get_grouping(nesting)
     grouping = []
@@ -131,6 +140,7 @@ end
 #
 # returns true if the expected data is contained within the data based on the nesting information
 def nest_match(data, nesting, expected)
+    return false if !data
     return data.deep_include?(expected) if nesting.size == 0
 
     local_nesting = nesting.dup

data/lib/cucumber-rest-bdd/types.rb

@@ -102,12 +102,16 @@ def get_resource(name)
     resource = (ENV.has_key?('resource_single') && ENV['resource_single'] == 'true') ? resource.singularize : resource.pluralize
 end
 
-def get_root_json_path()
+def get_root_data_key()
     return ENV.has_key?('data_key') && !ENV['data_key'].empty? ? "$.#{ENV['data_key']}." : "$."
 end
 
+def get_root_error_key()
+    return "$."
+end
+
 def get_json_path(names)
-    return "#{get_root_json_path()}#{get_parameters(names).join('.')}"
+    return "#{get_root_data_key()}#{get_parameters(names).join('.')}"
 end
 
 def get_parameters(names)
@@ -119,7 +123,7 @@ def get_parameter(name)
         name = name[1..-2]
     else
         separator = ENV.has_key?('field_separator') ? ENV['field_separator'] : '_'
-        name = name.parameterize(separator: separator)
+        name = name.singularize.parameterize(separator: separator)
         name = name.camelize(:lower) if (ENV.has_key?('field_camel') && ENV['field_camel'] == 'true')
     end
     name

data/server/error.js

@@ -0,0 +1,14 @@
+module.exports = (req, res, next) => {
+    if (req.path == '/errors/list') {
+        res.status(404)
+        res.locals.data = {
+            errors: [{ message: 'Not Found' }]
+        }
+    } else if (req.path == '/errors/single') {
+        res.status(400)
+        res.locals.data = {
+            error: { message: 'Bad Request' }
+        }
+    }
+    next()
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rest-bdd
 version: !ruby/object:Gem::Version
-  version: 0.4.4.pre.124
+  version: 0.4.4.pre.136
 platform: ruby
 authors:
 - Harry Bragg
@@ -68,6 +68,7 @@ files:
 - STEPS.md
 - cucumber-rest-bdd.gemspec
 - docker-compose.yml
+- features/errors.feature
 - features/functional.feature
 - features/grabs.feature
 - features/headers.feature
@@ -88,6 +89,7 @@ files:
 - lib/cucumber-rest-bdd/types.rb
 - lib/cucumber-rest-bdd/url.rb
 - server/db.json
+- server/error.js
 - server/routes.json
 homepage: http://github.com/graze/cucumber-rest-bdd
 licenses:
@@ -109,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: BDD Rest API specifics for cucumber