skink 0.3.1 → 0.4.0

data/lib/skink/integrations/rspec.rb

@@ -2,8 +2,32 @@ Dir[File.dirname(__FILE__) + "/../../../spec/support/**/*.rb"].each {|f| STDOUT.
 
 require 'skink/dsl'
 
+# Pretty much everything that follows gratefully borrowed from Capybara.
+
+module Skink
+  module Features
+    def self.included(base)
+      base.instance_eval do
+        alias :background :before
+        alias :scenario :it
+      end
+    end
+  end
+end
+
+def self.api_feature(*args, &block)
+  options = if args.last.is_a?(Hash) then args.pop else {} end
+  options[:skink_features] = true
+  options[:type] = :api
+  options[:caller] ||= caller
+  args.push(options)
+
+  describe(*args, &block)
+end
+
 RSpec.configure do |config|
-  config.include Skink::DSL
+  config.include Skink::DSL, type: :api
+  config.include Skink::Features, skink_features: true
 
   config.after do
     if self.class.include?(Skink::DSL)

data/lib/skink/version.rb

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

data/spec/skink_dsl_spec.rb

@@ -86,14 +86,27 @@ shared_examples "a REST API test language" do
     response.should_not have_header(content_type: %r{json})
   end
 
-  it "is able to test for the presence of elements in the response body" do
+  it "is able to test for the presence of xml elements in the response body" do
     with_accept_header "application/xml"
     get "/xml_doc"
-    response.should have_xpath "//foo/foo"
+    response.should have_xpath "//foo/bar"
     response.should_not have_xpath "//bar/foo"
     response.should have_xpath "//foo", /Some/
-    response.should_not have_xpath "//foo", /bar/
+    response.should_not have_xpath "//foo/bar", /foo/
+  end
+
+  it "is able to test for the presence of namespaced xml elements in the response body" do
+    with_accept_header "application/xml"
+    get "/xml_doc_with_namespaces"
+    response.should have_xpath "//fake:foo/fake:bar", /more/
+
+    # test a pathological case that was encountered in the real world
+    with_accept_header "application/xml"
+    get "/xml_doc_with_pathological_namespaces"
+    response.should have_xpath "//fake:foo/fake:bar", /more/
+  end
 
+  it "is able to test for the presence of json elements in the response body" do
     with_accept_header "application/json"
     get "/json_doc"
     response.should have_jsonpath "root.foo.foo"
@@ -107,12 +120,12 @@ shared_examples "a REST API test language" do
     get "/xml_doc"
     expect {response.should have_xpath "//not/a/valid/xpath"}.to raise_error(/^expected xpath .* in .*$/)
     expect {response.should have_xpath "//root/foo", /not there/}.to raise_error(%r{^expected xpath .* with value /not there/ in .*$})
-    expect {response.should_not have_xpath "//foo/foo"}.to raise_error(/^expected xpath .* would not be in .*/)
+    expect {response.should_not have_xpath "//foo/bar"}.to raise_error(/^expected xpath .* would not be in .*/)
     expect {response.should_not have_xpath "//root/foo", /Some/}.to raise_error(%r{^expected xpath .* with value /Some/ would not be in .*$})
   end
 end
 
-describe Skink::DSL do
+describe Skink::DSL, type: :api do
   context "using rack_test" do
     it_behaves_like "a REST API test language"
   end
@@ -122,3 +135,13 @@ describe Skink::DSL do
     it_behaves_like "a REST API test language"
   end
 end
+
+api_feature "Built-in acceptance test DSL" do
+  background "with something set" do
+    @answer = 42
+  end
+
+  scenario "verifying something is set" do
+    @answer.should be 42
+  end
+end

data/spec/test_server.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'sinatra'
 
 helpers do
@@ -40,7 +42,30 @@ get '/protected' do
 end
 
 get '/xml_doc', :provides => :xml do
-  "<root><foo attr=\"true\">Some text<foo/></foo></root>"
+  <<-END
+  <?xml version="1.0" encoding="UTF-8"?>
+  <root>
+    <foo attr=\"true\">Some text<bar>more text</bar></foo>
+  </root>
+  END
+end
+
+get '/xml_doc_with_namespaces', :provides => :xml do
+  <<-END
+  <?xml version="1.0" encoding="UTF-8"?>
+  <root xmlns:fake="http://www.example.org/xmlns/fake">
+    <fake:foo attr=\"true\">Some text<fake:bar>more text</fake:bar></fake:foo>
+  </root>
+  END
+end
+
+get '/xml_doc_with_pathological_namespaces', :provides => :xml do
+  <<-END
+  <?xml version="1.0" encoding="UTF-8"?>
+  <root xmlns="http://www.example.org/xmlns/fake" xmlns:fake="http://www.example.org/xmlns/fake">
+    <foo attr=\"true\">Some text<bar>more text</bar></foo>
+  </root>
+  END
 end
 
 get '/json_doc', :provides => :json do

metadata

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