alinta-cucumber-rest-bdd 0.5.19 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 27c980d29ee35952fbc7bc96f4795dc0af56e31c
-  data.tar.gz: cbe202b5007ade6def21773d8a2bd6ed1ac838a8
+SHA256:
+  metadata.gz: fbffb705889af8cb87393b7617f1c084c145c31ce37851e0bcbd83f99827bf86
+  data.tar.gz: 859abac39ab824a2386976b85badae3a9d60920bd511f917b1b308bc8c04ef6e
 SHA512:
-  metadata.gz: be9194bbf9479cb44f9b1cd3ee6ebe610fbd23c5ec049d69ee80677245414ee23e7be667cee6d65edbeadcf1275cf34e54ef79de37e638f8e932293b00cd82fb
-  data.tar.gz: 2e7c5f36fa32a8cda7e3dcacf0f132cfc9968c9b23f96e63f73bcf1058a1afaa693db70d9eaf695fc623eb96ce21bd5a7a216aa62b4ab35c75814ffacb596b98
+  metadata.gz: 3281d942a833aa3dcd689e53aa394e267a58b782632b544d93026bf2dc81d55b516fcf007772a4fde0ff5a9d71ec90b7298f46ac1a599be99aa0e8f77c4517c4
+  data.tar.gz: 2d9eaa3ed011778ef147668e16b7abaa3c9a16ccf9d04d3e6d3bb2da70a0622c4563dbdf278f792969b3221faaec21a2922837dfe7e04f9c7586b017924492f8

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

@@ -5,14 +5,17 @@ INT_AS_WORDS_SYNONYM = %q{zero|one|two|three|four|five|six|seven|eight|nine|ten}
 
 ParameterType(
     name: 'list_has_count',
-    regexp: /a|an|(?:(#{FEWER_MORE_THAN_SYNONYM})\s+)?(#{INT_AS_WORDS_SYNONYM}|\d+)/,
-    transformer: -> (type, amount) { ListCountComparison.new(type, amount) },
+    regexp: /a|an|(?:(?:#{FEWER_MORE_THAN_SYNONYM})\s+)?(?:#{INT_AS_WORDS_SYNONYM}|\d+)/,
+    transformer: -> (match) {
+        matches = /(?:(#{FEWER_MORE_THAN_SYNONYM})\s+)?(#{INT_AS_WORDS_SYNONYM}|\d+)/.match(match)
+        return ListCountComparison.new(matches[1], matches[2])
+    },
     use_for_snippets: false
 )
 
 ParameterType(
     name: 'list_nesting',
-    regexp: %r{((?:(?:#{HAVE_ALTERNATION.split('/').join('|')})\s+(?:a list of\s+)?(?:a|an|(?:(?:#{FEWER_MORE_THAN_SYNONYM})\s+)?(?:#{INT_AS_WORDS_SYNONYM}|\d+))\s+(?:#{FIELD_NAME_SYNONYM})\s*)*)},
+    regexp: %r{(?:(?:#{HAVE_ALTERNATION.split('/').join('|')})\s+(?:a list of\s+)?(?:a|an|(?:(?:#{FEWER_MORE_THAN_SYNONYM})\s+)?(?:#{INT_AS_WORDS_SYNONYM}|\d+))\s+(?:#{FIELD_NAME_SYNONYM})\s*)+},
     transformer: -> (match) { ListNesting.new(match) },
     use_for_snippets: false
 )
@@ -73,6 +76,7 @@ class ListNesting
 end
 
 class ListCountComparison
+   
     def initialize(type, amount)
         @type = type.nil? ? CMP_EQUALS : to_compare(type)
         @amount = amount.nil? ? 1 : to_num(amount)

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

@@ -31,7 +31,37 @@ Then("the response is a list of/containing {list_has_count} {field_name}") do |l
     raise %/Expected #{list_comparison.to_string()} items in array for path '#{get_root_data_key()}', found: #{list.count}\n#{@response.to_json_s}/ if !list_comparison.compare(list.count)
 end
 
-Then("the response( {list_nesting}) #{HAVE_ALTERNATION} (the )(following )attributes:") do |nesting, attributes|
+# Responses without nesting
+
+Then("the response #{HAVE_ALTERNATION} (the )(following )attributes:") do |attributes|
+    expected = get_attributes(attributes.hashes)
+    data = @response.get get_root_data_key()
+    raise %/Response did not match:\n#{expected.inspect}\n#{data}/ if data.empty? || !data.deep_include?(expected)
+end
+
+Then("the response #{HAVE_ALTERNATION} (the )(following )value {string}") do |value|
+    expected = value
+    data = @response.get get_root_data_key()
+    raise %/Response did not match: #{expected}\n#{data}/ if data.empty? || !data.include?(expected)
+end
+
+Then("{list_has_count} {field_name} #{HAVE_ALTERNATION} (the )(following )(data )attributes:") do |list_comparison, count_item, attributes|
+    expected = get_attributes(attributes.hashes)
+    data = @response.get get_root_data_key()
+    matched = data.select { |item| !item.empty? && item.deep_include?(expected) }
+    raise %/Expected #{list_comparison.to_string()} items in array that matched:\n#{expected.inspect}\n#{data}/ if !list_comparison.compare(matched.count)
+end
+
+Then("{list_has_count} {field_name} #{HAVE_ALTERNATION} (the )(following )value {string}") do |list_comparison, count_item, value|
+    expected = value
+    data = @response.get get_root_data_key()
+    matched = data.select { |item| !item.empty? && item.include?(expected) }
+    raise %/Expected #{list_comparison.to_string()} items in array that matched:\n#{expected}\n#{data}/ if !list_comparison.compare(matched.count)
+end
+
+# Responses with nesting
+
+Then("the response {list_nesting} #{HAVE_ALTERNATION} (the )(following )attributes:") do |nesting, attributes|
     expected = get_attributes(attributes.hashes)
     nesting.push({
         root: true,
@@ -41,7 +71,7 @@ Then("the response( {list_nesting}) #{HAVE_ALTERNATION} (the )(following )attrib
     raise %/Could not find a match for: #{nesting.match}\n#{expected.inspect}\n#{@response.to_json_s}/ if data.empty? || !nest_match_attributes(data, nesting.grouping, expected, false)
 end
 
-Then("the response( {list_nesting}) #{HAVE_ALTERNATION} (the )(following )value {string}") do |nesting, value|
+Then("the response {list_nesting} #{HAVE_ALTERNATION} (the )(following )value {string}") do |nesting, value|
     expected = value
     nesting.push({
         root: true,
@@ -60,7 +90,7 @@ Then("the response {list_nesting}") do |nesting|
     raise %/Could not find a match for: #{nesting.match}\n#{@response.to_json_s}/ if data.empty? || !nest_match_attributes(data, nesting.grouping, {}, false)
 end
 
-Then("{list_has_count} {field_name}( {list_nesting}) #{HAVE_ALTERNATION} (the )(following )(data )attributes:") do |list_comparison, count_item, nesting, attributes|
+Then("{list_has_count} {field_name} {list_nesting} #{HAVE_ALTERNATION} (the )(following )(data )attributes:") do |list_comparison, count_item, nesting, attributes|
     expected = get_attributes(attributes.hashes)
     nesting.push({
         root: true,

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

@@ -26,19 +26,6 @@ class FalseClass; include Boolean; end
 module Enum; end
 class String; include Enum; end
 
-class String
-  def to_type(type)
-    # cannot use 'case type' which checks for instances of a type rather than type equality
-    if type == Boolean then !(self =~ /true|yes/i).nil?
-    elsif type == Enum then self.upcase.tr(" ", "_")
-    elsif type == Float then self.to_f
-    elsif type == Integer then self.to_i
-    elsif type == NilClass then nil
-    else self
-    end
-  end
-end
-
 class ResponseField
     def initialize(names)
         @fields = get_fields(names)
@@ -68,6 +55,7 @@ def parse_type(type)
         /^bool$/i => 'boolean',
         /^null$/i => 'nil_class',
         /^nil$/i => 'nil_class',
+        /^string$/i => 'string',
         /^text$/i => 'string'
     }
     type.tr(' ', '_')
@@ -75,6 +63,33 @@ def parse_type(type)
     type
 end
 
+def string_to_type(value, type)
+    replacements = {
+        /^numeric$/i => 'integer',
+        /^int$/i => 'integer',
+        /^long$/i => 'integer',
+        /^number$/i => 'integer',
+        /^decimal$/i => 'float',
+        /^double$/i => 'float',
+        /^bool$/i => 'boolean',
+        /^null$/i => 'nil_class',
+        /^nil$/i => 'nil_class',
+        /^string$/i => 'string',
+        /^text$/i => 'string'
+    }
+    type.tr(' ', '_')
+    replacements.each { |k,v| type.gsub!(k, v) }
+    type = type.camelize.constantize
+    # cannot use 'case type' which checks for instances of a type rather than type equality
+    if type == Boolean then !(value =~ /true|yes/i).nil?
+    elsif type == Enum then value.upcase.tr(" ", "_")
+    elsif type == Float then value.to_f
+    elsif type == Integer then value.to_i
+    elsif type == NilClass then nil
+    else value
+    end
+end
+
 def get_resource(name)
     if name[0] == '`' && name[-1] == '`'
         name = name[1..-2]
@@ -114,9 +129,8 @@ def get_attributes(hashes)
       value = resolve_functions(value)
       value = resolve(value)
       value.gsub!(/\\n/, "\n")
-      type = parse_type(type)
       names = get_fields(name)
-      new_hash = names.reverse.inject(value.to_type(type.camelize.constantize)) { |a, n| add_to_hash(a, n) }
+      new_hash = names.reverse.inject(string_to_type(value, type)) { |a, n| add_to_hash(a, n) }
       hash.deep_merge!(new_hash) { |key, old, new| new.kind_of?(Array) ? merge_arrays(old, new) : new }
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alinta-cucumber-rest-bdd
 version: !ruby/object:Gem::Version
-  version: 0.5.19
+  version: 0.5.20
 platform: ruby
 authors:
 - Harry Bragg
@@ -17,14 +17,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: cucumber-expressions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.17
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.17
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: BDD Rest API specifics for cucumber