capybara-json 0.3.0.beta2 → 0.3.0

data/.travis.yml

@@ -2,7 +2,8 @@ rvm:
 #  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
+#  - ruby-head
 gemfile:
   - Gemfile
+  - Gemfile.capybara.lt.2.0
   - Gemfile.capybara.lt.1.0

data/CHANGELOG.md

@@ -1,8 +1,5 @@
-## 0.3.0.beta2
-* Fix #8
-
-## 0.3.0.beta1
-* Capybara 2.x support, but test not working now... (thanks to gkellogg)
+## 0.3.0
+* Capybara 2.x support (Thanks to @sonots, @gkellogg)
 
 ## 0.2.4
 * Added __FILE__ and __LINE__ so that pry can find generated methods (thanks to @mad_p)

data/Gemfile.capybara.lt.2.0

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in capybara-json.gemspec
+gem 'capybara', '< 2.0.0'
+gemspec

data/README.md

@@ -1,6 +1,6 @@
 # capybara-json [![Build Status](https://secure.travis-ci.org/okitan/capybara-json.png?branch=master)](http://travis-ci.org/okitan/capybara-json) [![Dependency Status](https://gemnasium.com/okitan/capybara-json.png)](https://gemnasium.com/okitan/capybara-json)
 
-testing ruby: 1.9.2, 1.9.3 and ruby-head;  Capybara: < 1.0 and > 1.0
+testing ruby: 1.9.2, 1.9.3;  Capybara: 0.4.x, 1.1.x, 2.0.x
 
 ## About capybara-json
 
@@ -15,12 +15,15 @@ require 'capybara/json'
 include Capybara::Json
 
 Capybara.current_driver = :rack_test_json
+Capybara.app = MyRackApp
 post '/', { "this is" => "json" } # POST '/'
 json   #=> parsed json response
 source #=> raw response body
 get  '/errors/400'
 status_code #=> 400
 get! '/errors' #=> raise Capybara::Json::Error
+get  '/errors', {}, { 'header' => '' } # request headers
+response_headers #=> response headers
 
 Capybara.current_driver = :httpclient_json
 Capybara.app_host = 'http://example.com'
@@ -30,4 +33,6 @@ source #=> raw response body
 get  '/errors/400'
 status_code #=> 400
 get! '/errors' #=> raise Capybara::Json::Error
+get  '/errors', {}, { 'header' => '' } # request headers
+response_headers #=> response headers
 ```

data/VERSION

@@ -1 +1 @@
-0.3.0.beta2
+0.3.0

data/capybara-json.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |s|
   # for debug
   s.add_development_dependency "pry"
   s.add_development_dependency "tapp"
+  s.add_development_dependency "pry-debugger"
 end

data/lib/capybara/json.rb

@@ -11,31 +11,10 @@ module Capybara
 
     def self.included(base)
       base.__send__(:include, to_include) unless base < to_include
-      base.extend(self)
-    end
-
-    %w[ get get! delete delete! ].each do |method|
-      module_eval <<-DEF, __FILE__, __LINE__ + 1
-        def #{method}(path, params = {}, env = {})
-          page.driver.#{method}(path, params, env)
-        end
-      DEF
-    end
-
-    %w[ post post! put put! ].each do |method|
-      module_eval <<-DEF, __FILE__, __LINE__ + 1
-        def #{method}(path, json, env = {})
-          page.driver.#{method}(path, json, env)
-        end
-      DEF
-    end
-
-    %w[ raw_json json ].each do |method|
-      define_method(method) do
-        page.driver.__send__(method)
-      end
+      base.__send__(:include, ::Capybara::Json::Dsl)
     end
 
+    autoload :Dsl,   'capybara/json/dsl'
     autoload :Error, 'capybara/json/error'
 
     module Driver

data/lib/capybara/json/dsl.rb

@@ -0,0 +1,31 @@
+module Capybara
+  module Json
+    module Dsl
+      def self.included(base)
+        base.extend(self)
+      end
+
+      %w[ get get! delete delete! ].each do |method|
+        module_eval <<-DEF, __FILE__, __LINE__ + 1
+        def #{method}(path, params = {}, env = {})
+          page.driver.#{method}(path, params, env)
+        end
+        DEF
+      end
+
+      %w[ post post! put put! ].each do |method|
+        module_eval <<-DEF, __FILE__, __LINE__ + 1
+        def #{method}(path, json, env = {})
+          page.driver.#{method}(path, json, env)
+        end
+        DEF
+      end
+
+      %w[ raw_json json source body status_code response_headers ].each do |method|
+        define_method(method) do
+          page.driver.__send__(method)
+        end
+      end
+    end
+  end
+end

data/spec/capybara/httpclient_json/dsl_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Capybara::HTTPClientJson do
+  before { @driver = :httpclient_json }
+
+  it_behaves_like 'dsl'
+  it_behaves_like "dsl with redirect support"
+  it_behaves_like "dsl not to follow redirect"
+end

data/spec/capybara/json_spec.rb

@@ -6,40 +6,4 @@ require 'spec_helper'
       Capybara.drivers.should have_key(driver)
     end
   end
-
-  describe Capybara::Json do
-    include described_class
-
-    before(:all) do
-      Capybara.app = JsonTestApp
-      Capybara.current_driver = driver
-    end
-
-    after(:all) do
-      Capybara.app = nil
-      Capybara.current_driver = Capybara.default_driver
-    end
-
-    %w[ get get! delete delete! ].each do |method|
-      it "register #{method}" do
-        __send__(method, '/')
-        body.should == { 'Hello world!' => 'Hello world!' }
-      end
-    end
-
-    %w[ post post! put put! ].each do |method|
-      it "register #{method}" do
-        __send__(method, '/', {})
-        body.should == { 'Hello world!' => 'Hello world!' }
-      end
-
-      it "#{method} send json" do
-        json = { "some" => "args" }
-        __send__(method, '/env', json)
-
-        body['content_type'].should =~ %r"application/json"
-        body['rack.input'].should == MultiJson.dump(json)
-      end
-    end
-  end
 end

data/spec/capybara/rack_test_json/dsl_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Capybara::RackTestJson do
+  before { @driver = :rack_test_json }
+
+  it_behaves_like 'dsl'
+  it_behaves_like "dsl with redirect support"
+  it_behaves_like "dsl not to follow redirect"
+end

data/spec/support/driver_examples.rb

@@ -1,12 +1,6 @@
-require 'capybara/spec/driver'
-
 # this code is written in capybara's spec/spec_helper
 alias :running :lambda
 
-[ 'driver', 'driver with header support' ].each do |shared|
-  RSpec.world.shared_example_groups.delete(shared)
-end
-
 shared_examples_for 'driver' do
   describe '#visit' do
     it "should move to another page" do
@@ -64,6 +58,45 @@ shared_examples_for 'driver with custom header support' do
   end
 end
 
+shared_examples_for "driver with status code support" do
+  it "should make the status code available through status_code" do
+    @driver.visit('/with_simple_html')
+    @driver.status_code.should == 200
+  end
+end
+
+shared_examples_for "driver with cookies support" do
+  describe "#reset!" do
+    it "should set and clean cookies" do
+      @driver.visit('/get_cookie')
+      @driver.body.should_not include('test_cookie')
+
+      @driver.visit('/set_cookie')
+      @driver.body.should include('Cookie set to test_cookie')
+
+      @driver.visit('/get_cookie')
+      @driver.body.should include('test_cookie')
+
+      @driver.reset!
+      @driver.visit('/get_cookie')
+      @driver.body.should_not include('test_cookie')
+    end
+  end
+end
+
+shared_examples_for "driver with infinite redirect detection" do
+  it "should follow 5 redirects" do
+    @driver.visit('/redirect/5/times')
+    @driver.body.should include('redirection complete')
+  end
+
+  it "should not follow more than 5 redirects" do
+    running do
+      @driver.visit('/redirect/6/times')
+    end.should raise_error(Capybara::InfiniteRedirectError)
+  end
+end
+
 shared_examples_for "driver with redirect support" do
   it "should update current_url" do
     @driver.get "/redirect"
@@ -76,6 +109,7 @@ shared_examples_for "driver not to follow redirect" do
     @driver.get "/redirect"
     @driver.status_code.should == 302
     URI.parse(@driver.current_url).path.should == "/redirect"
+    URI.parse(@driver.response_headers["Location"]).path.should == "/redirect_again"
   end
 end
 

data/spec/support/dsl_examples.rb

@@ -0,0 +1,77 @@
+shared_context 'prepare_dsl' do
+  include Capybara::Json
+
+  before do
+    Capybara.app = JsonTestApp
+    Capybara.current_driver = @driver
+    @default_follow_redirect = page.driver.options[:follow_redirect]
+  end
+
+  after do
+    page.driver.options[:follow_redirect] = @default_follow_redirect
+    Capybara.app = nil
+    Capybara.current_driver = Capybara.default_driver
+  end
+end
+
+shared_examples_for 'dsl' do
+  include_context 'prepare_dsl'
+
+  %w[ get get! delete delete! ].each do |method|
+    it "register #{method}" do
+      __send__(method, '/')
+      body.should == { 'Hello world!' => 'Hello world!' }
+    end
+  end
+
+  %w[ post post! put put! ].each do |method|
+    it "register #{method}" do
+      __send__(method, '/', {})
+      body.should == { 'Hello world!' => 'Hello world!' }
+    end
+
+    it "#{method} send json" do
+      json = { "some" => "args" }
+      __send__(method, '/env', json)
+
+      body['content_type'].should =~ %r"application/json"
+      body['rack.input'].should == MultiJson.dump(json)
+    end
+  end
+
+  %w[ raw_json source ].each do |method|
+    it "register #{method}" do
+      get('/', {})
+      __send__(method).should == MultiJson.dump({ 'Hello world!' => 'Hello world!' })
+    end
+  end
+
+  %w[ json body ].each do |method|
+    it "register #{method}" do
+      get('/', {})
+      __send__(method).should == { 'Hello world!' => 'Hello world!' }
+    end
+  end
+end
+
+shared_examples_for 'dsl with redirect support' do
+  include_context 'prepare_dsl'
+
+  it "should update current_url" do
+    page.driver.options[:follow_redirect] = true
+    get "/redirect"
+    URI.parse(current_url).path.should == "/landed"
+  end
+end
+
+shared_examples_for "dsl not to follow redirect" do
+  include_context 'prepare_dsl'
+
+  it "should not follow redirect" do
+    page.driver.options[:follow_redirect] = false
+    get "/redirect"
+    status_code.should == 302
+    URI.parse(current_url).path.should == "/redirect"
+    URI.parse(response_headers["Location"]).path.should == "/redirect_again"
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capybara-json
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta2
-  prerelease: 6
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - okitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -187,6 +187,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: for testing json-api
 email:
 - okitakunio@gmail.com
@@ -203,6 +219,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.capybara.lt.1.0
+- Gemfile.capybara.lt.2.0
 - README.md
 - Rakefile
 - VERSION
@@ -211,15 +228,19 @@ files:
 - lib/capybara/httpclient_json/driver.rb
 - lib/capybara/json.rb
 - lib/capybara/json/driver/base.rb
+- lib/capybara/json/dsl.rb
 - lib/capybara/json/error.rb
 - lib/capybara/rack_test_json/client.rb
 - lib/capybara/rack_test_json/driver.rb
 - spec/capybara/httpclient_json/driver_spec.rb
+- spec/capybara/httpclient_json/dsl_spec.rb
 - spec/capybara/json_spec.rb
 - spec/capybara/rack_test_json/driver_spec.rb
+- spec/capybara/rack_test_json/dsl_spec.rb
 - spec/spec.watchr
 - spec/spec_helper.rb
 - spec/support/driver_examples.rb
+- spec/support/dsl_examples.rb
 - spec/support/json_test_app.rb
 homepage: http://github.com/okitan/capybara-json
 licenses: []
@@ -236,9 +257,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: capybara-json
 rubygems_version: 1.8.24
@@ -247,10 +268,13 @@ specification_version: 3
 summary: for testing json-api
 test_files:
 - spec/capybara/httpclient_json/driver_spec.rb
+- spec/capybara/httpclient_json/dsl_spec.rb
 - spec/capybara/json_spec.rb
 - spec/capybara/rack_test_json/driver_spec.rb
+- spec/capybara/rack_test_json/dsl_spec.rb
 - spec/spec.watchr
 - spec/spec_helper.rb
 - spec/support/driver_examples.rb
+- spec/support/dsl_examples.rb
 - spec/support/json_test_app.rb
 has_rdoc: