skink 0.4.0 → 0.4.1

data/lib/skink/client/utils.rb

@@ -20,7 +20,7 @@ module Utils
     end
 
     # otherwise this should work
-    name.split("_").map(&:capitalize).join("-")
+    name.to_s.split(/[_-]/).map(&:capitalize).join("-")
   end
 end
 

data/lib/skink/rack_test_client/rack_test_response.rb

@@ -18,7 +18,11 @@ class RackTestResponse < Client::Response
   end
 
   def headers
-    native_response.header
+    if native_response.is_a? Rack::Response
+      native_response.header
+    else
+      native_response.headers
+    end
   end
 
   def body

data/lib/skink/version.rb

@@ -1,3 +1,3 @@
 module Skink
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/skink_dsl_spec.rb

@@ -79,6 +79,15 @@ shared_examples "a REST API test language" do
     response.should_not have_header("This-Is-Not-A-Header-Name")
   end
 
+  it "has a helpful failure message for have_header" do
+    with_accept_header "application/json"
+    get "/json_doc"
+    expect {response.should have_header(:not_a_real_header)}.to raise_error(/expected response headers .* to have header Not-A-Real-Header/)
+    expect {response.should have_header(content_type: /xml/)}.to raise_error(%r{expected response headers .* to have header Content-Type with value /xml/})
+    expect {response.should_not have_header(:content_type)}.to raise_error(/expected response headers .* to not have header Content-Type/)
+    expect {response.should_not have_header('Content-Type' => /json/)}.to raise_error(%r{expected response headers .* to not have header Content-Type with value /json/})
+  end
+
   it "is able to test the value of specified response headers" do
     with_accept_header "application/xml"
     get "/xml_doc"

data/spec/support/matchers/response_matchers.rb

@@ -1,3 +1,6 @@
+require 'skink/client/utils'
+include Skink::Client::Utils
+
 RSpec::Matchers.define :have_status_code do |expected|
   match do |response|
     response.has_status_code? expected
@@ -12,6 +15,28 @@ RSpec::Matchers.define :have_status_code do |expected|
   end
 end
 
+RSpec::Matchers.define :have_header do |expected|
+  match do |response|
+    response.has_header? expected
+  end
+
+  failure_message_for_should do |response|
+    if expected.respond_to? :keys
+      "expected response headers #{response.headers.inspect} to have header #{normalize_header_name(expected.keys.first)} with value #{expected.values.first.inspect}"
+    else
+      "expected response headers #{response.headers.inspect} to have header #{normalize_header_name(expected)}"
+    end
+  end
+
+  failure_message_for_should_not do |response|
+    if expected.respond_to? :keys
+      "expected response headers #{response.headers.inspect} to not have header #{normalize_header_name(expected.keys.first)} with value #{expected.values.first.inspect}"
+    else
+      "expected response headers #{response.headers.inspect} to not have header #{normalize_header_name(expected)}"
+    end
+  end
+end
+
 RSpec::Matchers.define :have_xpath do |xpath, value|
   match do |response|
     response.has_xpath? xpath, value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skink
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test