cucumber-blendle-steps 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555e0cfd7893221b67853b9e7c108c72e52d6db1
-  data.tar.gz: 861b303b38b65fcd118f931f53e274a1fad604cd
+  metadata.gz: a6d5ffa7f19cddc960b90cac8c998474b5a5ccd6
+  data.tar.gz: 122ffdf9b1241377caf69eb0133fe12109136642
 SHA512:
-  metadata.gz: 8afcc6ec6e4d0d3b495c53d40fd370701db8179d51b02060ee8f0b65e84605758b395ae36c3343721918fe3cb88ec2ce8aa270c291cce7d5e879b52706607a82
-  data.tar.gz: c7f1d81ae4f5212c001e56c57945b3d5b043e6faa87a3e41c7f109b0eff3922ab58887d3c4576f58f582be978abae7d90947fdec145d8b3368a415ef8f0f7d9a
+  metadata.gz: da27cd9b9b98aea2a01f4833bf55771384ccab21e0f25dd1e37e6d52679b5f73e34bdff08fa415ece2279113f6d014835215f6d3ffb654ca550a7f0760e47ab9
+  data.tar.gz: e56a137ea2d9b66cfafde4f44d975a2a4157afdfb342fa8166194ae4a2c148d84ea721640d6209b0192b1a3376907327d60ce492af2f460b30d88411ce301ff9

data/.ruby-version

@@ -0,0 +1 @@
+2.3

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [v0.8.2](https://github.com/blendle/cucumber-blendle-steps/tree/v0.8.2) (2016-04-28)
+[Full Changelog](https://github.com/blendle/cucumber-blendle-steps/compare/v0.8.1...v0.8.2)
+
 ## [v0.8.1](https://github.com/blendle/cucumber-blendle-steps/tree/v0.8.1) (2016-04-26)
 [Full Changelog](https://github.com/blendle/cucumber-blendle-steps/compare/v0.8.0...v0.8.1)
 

data/lib/cucumber/blendle/steps/model_steps.rb

@@ -136,7 +136,7 @@ end
 def row_finder(klass, hash)
   ext = 'where'
   query = hash.each_with_object({}) do |(key, value), q|
-    if value.is_a?(Sequel::Postgres::JSONBHash)
+    if defined?(Sequel::Postgres) && value.is_a?(Sequel::Postgres::JSONBHash)
       ext = "where { Sequel.pg_jsonb(:#{key}).contains(#{value}) }"
     else
       q[key] = value

data/lib/cucumber/blendle/steps/resource_steps.rb

@@ -21,20 +21,11 @@ end
 #
 When(/^the client does a (GET|POST|DELETE) request to the "([^"]*)" resource with these template variables:$/) do |method, resource, table|
   params = {}
-  current_accept_header = current_session.instance_variable_get(:@headers)['Accept']
-
-  step %(the client provides the header "Accept: application/hal+json")
-  body = JSON.parse(get('/api').body)
-
-  if current_accept_header
-    step %(the client provides the header "Accept: #{current_accept_header}")
-  end
-
   table && table.hashes.each do |row|
     params[row['key']] = row['value']
   end
 
-  api = HyperResource.from_body(body)
+  api = HyperResource.from_body(api_body)
   url = api.send(resource, params).href
   step %(the client does a #{method} request to "#{url}")
 end
@@ -48,8 +39,7 @@ end
 #     """
 #
 When(/^the client does a (GET|POST|DELETE) request to the "([^"]*)" resource with the following content:$/) do |method, resource, content|
-  body = JSON.parse(get('/api').body)
-  api  = HyperResource.from_body(body)
+  api  = HyperResource.from_body(api_body)
   url  = api.send(resource, {}).href
 
   step %(the client does a #{method} request to "#{url}" with the following content:), content
@@ -63,9 +53,23 @@ end
 #     """
 #
 When(/^the client does a (POST|PUT) request to the "([^"]*)" resource with the template variable "([^"]*)" set to "([^"]*)" and the following content:$/) do |method, resource, key, value, content|
-  body = JSON.parse(get('/api').body)
-  api  = HyperResource.from_body(body)
+  api  = HyperResource.from_body(api_body)
   url  = api.send(resource, key => value).href
 
   step %(the client does a #{method} request to "#{url}" with the following content:), content
 end
+
+def api_body
+  current_accept_header = current_session.instance_variable_get(:@headers)['Accept']
+
+  step %(the client provides the header "Accept: application/hal+json")
+  body = JSON.parse(get('/api').body)
+
+  if current_accept_header
+    step %(the client provides the header "Accept: #{current_accept_header}")
+  else
+    header('Accept', nil)
+  end
+
+  body
+end

data/lib/cucumber/blendle/steps/rest_steps.rb

@@ -45,7 +45,7 @@ end
 # * Then the response should contain the header "Location" with value "https://example.org/item/hello"
 #
 Then(/^the response should contain the header "([^"]*)" with value "([^"]*)"$/) do |header, value|
-  assert_equal last_response.headers[header], value
+  assert_equal value, last_response.headers[header]
 end
 
 # * Then the response should be of type "application/json" with content:
@@ -58,8 +58,15 @@ end
 Then(/^the response should be of type "([^"]*)" with content:$/) do |content_type, content|
   dump last_response.body
 
+  content = Liquid::Template.parse(content).render
+
   assert_equal content_type, last_response.headers['Content-Type']
-  assert_equal content, last_response.body
+
+  if content_type.include?('json')
+    expect(last_response.body).to be_json_eql(content)
+  else
+    assert_equal content, last_response.body
+  end
 end
 
 # * Then the response should be JSON:
@@ -68,13 +75,8 @@ end
 #       "uid": "hello"
 #     }
 #     """
-Then(/^the response should be JSON:$/) do |json|
-  dump last_response.body
-
-  json = Liquid::Template.parse(json).render
-
-  assert_equal last_response.headers['Content-Type'], 'application/json'
-  expect(last_response.body).to be_json_eql(json)
+Then(/^the response should be JSON:$/) do |content|
+  step 'the response should be of type "application/json" with content:', content
 end
 
 # * Then the response should be HAL/JSON:
@@ -108,8 +110,6 @@ Then(%r{^the response should be HAL/JSON(?: \(disregarding values? of "([^"]*)"\
     assert false, [e.message, last_response.body].join("\n")
   end
 
-  assert hal.valid?, "Halidator errors: #{hal.errors.join(',')}"
-
   json  = Liquid::Template.parse(json).render
   match = be_json_eql(json)
 
@@ -120,6 +120,7 @@ Then(%r{^the response should be HAL/JSON(?: \(disregarding values? of "([^"]*)"\
   end
 
   expect(last_response.body).to match
+  assert hal.valid?, "Halidator errors: #{hal.errors.join(',')}"
 end
 
 # * Then the response contains the "Location" header with value "https://example.org/item/hello"

data/lib/cucumber/blendle/support/dump.rb

@@ -45,8 +45,9 @@ def prettify_hash(hash)
 
   hash = unshift_hash_key('_embedded', hash)
   hash = unshift_hash_key('_links', hash)
+  hash['_links'] = unshift_hash_key('self', hash['_links']) if hash['_links']
 
-  hash
+  hash.sort.to_h
 end
 
 def unshift_hash_key(key, hash)

data/lib/cucumber/blendle/version.rb

@@ -6,6 +6,6 @@ module Cucumber
   # This module defines default steps used by all of Blendle Ruby projects.
   #
   module BlendleSteps
-    VERSION = '0.8.2'.freeze
+    VERSION = '0.8.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-blendle-steps
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Jean Mertz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -314,6 +314,7 @@ files:
 - ".gitignore"
 - ".hubbit.yml"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".wercker.yml"
 - CHANGELOG.md
 - Gemfile