capybara-mechanize 0.3.0.rc2 → 0.3.0.rc3

data/README.mdown

@@ -39,21 +39,13 @@ Note that I haven't tested this case for my self yet. The Capybara tests pass fo
 
 ## Running tests
 
-Until this library is merged with capybara there needs to be local app and you need to add the following to your host file:
-
-    127.0.0.1 capybara-testapp.heroku.com 
-
 Run bundler
 
     bundle install
 
-Run the app with the following line: 
-
-    bundle exec ruby -rrubygems lib/capybara/spec/extended_test_app.rb
-
 Then you are ready to run the test like so
 
-    rake spec
+    bundle exec rake spec
 
 Todo
 ----
@@ -73,4 +65,4 @@ Note on Patches/Pull Requests
 
 Copyright
 ---------
-Copyright (c) 2010 Jeroen van Dijk. See LICENSE for details.
+Copyright (c) 2010-2011 Jeroen van Dijk. See LICENSE for details.

data/lib/capybara/mechanize/browser.rb

@@ -3,78 +3,69 @@ require 'mechanize'
 
 class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
   extend Forwardable
-  
+
   def_delegator :agent, :scheme_handlers
   def_delegator :agent, :scheme_handlers=
-  
-  def initialize(app, options)
+
+  def initialize(driver)
     @agent = ::Mechanize.new
     @agent.redirect_ok = false
-
+    @agent.user_agent = default_user_agent
     super
   end
-  
+
   def reset_host!
     @last_remote_host = nil
     @last_request_remote = nil
     super
   end
-  
+
   def current_url
     last_request_remote? ? remote_response.current_url : super
   end
-  
+
   def last_response
     last_request_remote? ? remote_response : super
   end
-  
+
   def follow_redirects!
     5.times do
       follow_redirect! if last_response.redirect?
     end
     raise Capybara::InfiniteRedirectError, "redirected more than 5 times, check for infinite redirects." if last_response.redirect?
   end
-  
-  # TODO see how this can be cleaned up
+
   def follow_redirect!
     unless last_response.redirect?
       raise "Last response was not a redirect. Cannot follow_redirect!"
     end
-  
-    location = if last_request_remote?
-        remote_response.page.response['Location'] 
-      else
-        last_response['Location']
-      end
-    
-    get(location)
+
+    get(last_location_header)
   end
-  
-  
+
   def process(method, path, *options)
     reset_cache!
-    process_without_redirect(method, path, *options)
+    send(method, path, *options)
     follow_redirects!
   end
-  
-  def process_without_redirect(method, path, *options)
+
+  def process_without_redirect(method, path, attributes, headers)
+    path = @last_path if path.nil? || path.empty?
+
     if remote?(path)
-      process_remote_request(method, path, *options)
+      process_remote_request(method, path, attributes, headers)
     else
       register_local_request
-      
-      
+
       path = determine_path(path)
-      
-      attributes, headers = *options
-      attributes ||= {}
-      headers ||= {}
-      
+
       reset_cache!
       send("racktest_#{method}", path, attributes, env.merge(headers))
     end
+
+    @last_path = path
   end
-  
+
   # TODO path Capybara to move this into its own method
   def determine_path(path)
     new_uri = URI.parse(path)
@@ -83,13 +74,17 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
     if new_uri.host
       @current_host = new_uri.scheme + '://' + new_uri.host
     end
-  
+
     if new_uri.relative?
       path = request_path + path if path.start_with?('?')
-    
+
       unless path.start_with?('/')
         folders = request_path.split('/')
-        path = (folders[0, folders.size - 1] << path).join('/')
+        if folders.empty?
+          path = '/' + path
+        else
+          path = (folders[0, folders.size - 1] << path).join('/')
+        end
       end
       path = current_host + path
     end
@@ -97,25 +92,25 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
   end
 
   alias :racktest_get :get
-  def get(path, attributes = {})
-    process_without_redirect(:get, path, attributes)
+  def get(path, attributes = {}, headers = {})
+    process_without_redirect(:get, path, attributes, headers)
   end
 
   alias :racktest_post :post
   def post(path, attributes = {}, headers = {})
     process_without_redirect(:post, path, post_data(attributes), headers)
   end
-  
+
   alias :racktest_put :put
-  def put(method, path, attributes = {}, headers = {})
+  def put(path, attributes = {}, headers = {})
     process_without_redirect(:put, path, attributes, headers)
   end
-  
+
   alias :racktest_delete :delete
-  def delete(method, path, attributes = {}, headers = {})
+  def delete(path, attributes = {}, headers = {})
     process_without_redirect(:delete, path, attributes, headers)
   end
-  
+
   def post_data(params)
     params.inject({}) do |memo, param|
       case param
@@ -133,13 +128,13 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
       end
     end
   end
-  
+
   def remote?(url)
     if Capybara.app_host
       true
     else
       host = URI.parse(url).host
-      
+
       if host.nil?
         last_request_remote?
       else
@@ -147,24 +142,28 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
       end
     end
   end
-  
+
   attr_reader :agent
-  
+
   private
-  
+
+  def last_location_header
+    last_request_remote? ? remote_response.page.response['Location'] : last_response['Location']
+  end
+
   def last_request_remote?
     !!@last_request_remote
   end
-  
+
   def register_local_request
     @last_remote_host = nil
     @last_request_remote = false
   end
-  
-  def process_remote_request(method, url, *options)
+
+  def process_remote_request(method, url, attributes, headers)
     if remote?(url)
       remote_uri = URI.parse(url)
-  
+
       if remote_uri.host.nil?
         remote_host = @last_remote_host || Capybara.app_host || Capybara.default_host
         url = File.join(remote_host, url)
@@ -172,52 +171,59 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
       else
         @last_remote_host = "#{remote_uri.host}:#{remote_uri.port}"
       end
-      
+
       reset_cache!
       begin
-        @agent.send *( [method, url] + options)
+        args = []
+        args << attributes unless attributes.empty?
+        args << headers unless headers.empty?
+        @agent.send(method, url, *args)
       rescue => e
         raise "Received the following error for a #{method.to_s.upcase} request to #{url}: '#{e.message}'"
       end
       @last_request_remote = true
     end
   end
-  
+
   def remote_response
     ResponseProxy.new(@agent.current_page) if @agent.current_page
   end
-  
+
+  def default_user_agent
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.853.0 Safari/535.2"
+  end
+
   class ResponseProxy
     extend Forwardable
-    
+
     def_delegator :page, :body
-    
+
     attr_reader :page
-    
+
     def initialize(page)
       @page = page
     end
-    
+
     def current_url
       page.uri.to_s
     end
-    
+
     def headers
-      # Hax the content-type contains utf8, so Capybara specs are failing, need to ask mailinglist  
+      # Hax the content-type contains utf8, so Capybara specs are failing, need to ask mailinglist
       headers = page.response
       headers["content-type"].gsub!(';charset=utf-8', '') if headers["content-type"]
       headers
     end
-  
+
     def status
       page.code.to_i
-    end    
-  
+    end
+
     def redirect?
       [301, 302].include?(status)
     end
-    
-  end 
-   
+
+  end
+
 end
 

data/lib/capybara/mechanize/driver.rb

@@ -15,7 +15,7 @@ class Capybara::Mechanize::Driver < Capybara::RackTest::Driver
   end
   
   def browser
-    @browser ||= Capybara::Mechanize::Browser.new(app, options)
+    @browser ||= Capybara::Mechanize::Browser.new(self)
   end
   
 end

data/lib/capybara/mechanize/version.rb

@@ -0,0 +1,5 @@
+module Capybara
+  module Mechanize
+    VERSION = '0.3.0.rc3'
+  end
+end

data/lib/capybara/spec/extended_test_app.rb

@@ -2,27 +2,44 @@ require 'capybara/spec/test_app'
 
 class ExtendedTestApp < TestApp#< Sinatra::Base
   set :environment, :production # so we don't get debug info that makes our test pass!
-  
+
   get %r{/redirect_to/(.*)} do
     redirect params[:captures]
   end
-  
-  get '/host' do
-    "Current host is #{request.scheme}://#{request.host}:#{request.port}, method get"
-  end
-  
+
   get '/form_with_relative_action_to_host' do
-    %{<form action="/host" method="post">
+    %{<form action="/request_info/host" method="post">
+       <input type="submit" value="submit" />
+      </form>}
+  end
+
+  get '/request_info/form_with_no_action' do
+    %{<form method="post">
        <input type="submit" value="submit" />
       </form>}
   end
-  
+
   get '/relative_link_to_host' do
-    %{<a href="/host">host</a>}
+    %{<a href="/request_info/host">host</a>}
   end
-  
-  post '/host' do
-    "Current host is #{request.scheme}://#{request.host}:#{request.port}, method post"
+
+  get '/request_info/user_agent' do
+    request.user_agent
+  end
+
+  get '/request_info/*' do
+    current_request_info
+  end
+
+  post '/request_info/*' do
+    current_request_info
   end
+
+
+  private
+
+    def current_request_info
+      "Current host is #{request.url}, method #{request.request_method.downcase}"
+    end
 end
 

data/spec/driver/mechanize_driver_spec.rb

@@ -114,10 +114,10 @@ describe "Capybara::Driver::Mechanize, in local model" do
       Capybara.default_host = nil
     end
     
-    it "should raise a useful error for sites that return a 404, because it is probably a misconfiguration", :focus => true do
+    it "should raise a useful error for sites that return a 404, because it is probably a misconfiguration" do
       lambda { 
         @driver.visit("http://iamreallysurethatthisdoesntexist.com/canttouchthis")
-      }.should raise_error("Received the following error for a GET request to http://iamreallysurethatthisdoesntexist.com/canttouchthis: 'getaddrinfo: nodename nor servname provided, or not known'")
+      }.should raise_error(%r{Received the following error for a GET request to http://iamreallysurethatthisdoesntexist.com/canttouchthis:})
     end
   end
 

data/spec/driver/remote_mechanize_driver_spec.rb

@@ -39,6 +39,15 @@ describe Capybara::Mechanize::Driver do
 
     end
 
+    context "process remote request" do
+
+      it "should transform nested map in post data" do
+        @driver.submit(:post, "#{REMOTE_TEST_URL}/form", {:form => {:key => "value"}})
+        @driver.body.should include('key: value')
+      end
+
+    end
+
     it_should_behave_like "driver"
     it_should_behave_like "driver with header support"
     it_should_behave_like "driver with status code support"

data/spec/session/mechanize_spec.rb

@@ -4,6 +4,7 @@ describe Capybara::Session do
   context 'with mechanize driver' do
     before do
       @session = Capybara::Session.new(:mechanize, TestApp)
+      @session.driver.options[:respect_data_method] = true
       Capybara.default_host = 'http://www.local.com'
     end
 
@@ -26,17 +27,28 @@ describe Capybara::Session do
         @session.body.should include('The requested object was deleted')
       end
     end
-    
+
     it "should use the last remote url when following relative links" do
       @session.visit("#{REMOTE_TEST_URL}/relative_link_to_host")
       @session.click_link "host"
-      @session.body.should include("Current host is #{REMOTE_TEST_URL}, method get")
+      @session.body.should include("Current host is #{REMOTE_TEST_URL}/request_info/host, method get")
     end
-    
+
     it "should use the last remote url when submitting a form with a relative action" do
       @session.visit("#{REMOTE_TEST_URL}/form_with_relative_action_to_host")
       @session.click_button "submit"
-      @session.body.should include("Current host is #{REMOTE_TEST_URL}, method post")
+      @session.body.should include("Current host is #{REMOTE_TEST_URL}/request_info/host, method post")
+    end
+
+    it "should use the last url when submitting a form with no action" do
+      @session.visit("#{REMOTE_TEST_URL}/request_info/form_with_no_action")
+      @session.click_button "submit"
+      @session.body.should include("Current host is #{REMOTE_TEST_URL}/request_info/form_with_no_action, method post")
+    end
+
+    it "should send correct user agent" do
+      @session.visit("#{REMOTE_TEST_URL}/request_info/user_agent")
+      @session.body.should include("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.853.0 Safari/535.2")
     end
 
     it_should_behave_like "session"
@@ -44,4 +56,4 @@ describe Capybara::Session do
     it_should_behave_like "session with headers support"
     it_should_behave_like "session with status code support"
   end
-end
+end

data/spec/session/remote_mechanize_spec.rb

@@ -13,6 +13,7 @@ describe Capybara::Session do
     
     before do      
       @session = Capybara::Session.new(:mechanize)
+      @session.driver.options[:respect_data_method] = true
     end
 
     describe '#driver' do
@@ -42,4 +43,4 @@ describe Capybara::Session do
     it_should_behave_like "session with headers support"
     it_should_behave_like "session with status code support"
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'bundler/setup'
 require 'capybara'
 require 'capybara/mechanize'
+require 'artifice'
 
 require 'sinatra'
 
@@ -15,17 +16,19 @@ alias :running :lambda
 Capybara.default_wait_time = 0 # less timeout so tests run faster
 
 RSpec.configure do |config|
+  config.before(:all) do
+    Artifice.activate_with(ExtendedTestApp)
+  end
+
   config.after do
     Capybara.default_selector = :xpath
     Capybara::Mechanize.local_hosts = nil
   end
+
+  config.after(:all) do
+    Artifice.deactivate
+  end
   # config.filter_run :focus => true
 end
 
-# Until this library is merged with capybara there needs to be a local app and you need to add
-# Install pow (get.pow.cx) and run add a symlink in ~/.pow with ln -s lib/capybara/spec capybara-testapp.heroku
-if ENV['HOME'] =~ /jvandijk/ # TODO don't tie it to my personal stuff :)
-  REMOTE_TEST_URL = "http://capybara-testapp.heroku.dev:80"
-else
-  REMOTE_TEST_URL = "http://capybara-mechanize-testapp.herokuapp.com:80"
-end
+REMOTE_TEST_URL = "http://localhost"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-mechanize
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc2
+  version: 0.3.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,31 +9,31 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-13 00:00:00.000000000 +02:00
+date: 2011-09-09 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &2152844820 !ruby/object:Gem::Requirement
+  requirement: &2168594720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152844820
+  version_requirements: *2168594720
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152843680 !ruby/object:Gem::Requirement
+  requirement: &2168594240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152843680
+  version_requirements: *2168594240
 description: RackTest driver for Capybara, but with remote request support thanks
   to mechanize
 email: jeroen@jeevidee.nl
@@ -44,12 +44,11 @@ files:
 - lib/capybara/mechanize/browser.rb
 - lib/capybara/mechanize/cucumber.rb
 - lib/capybara/mechanize/driver.rb
+- lib/capybara/mechanize/version.rb
 - lib/capybara/mechanize.rb
 - lib/capybara/spec/extended_test_app.rb
-- lib/capybara/spec/tmp/restart.txt
 - spec/driver/mechanize_driver_spec.rb
 - spec/driver/remote_mechanize_driver_spec.rb
-- spec/README.mdown
 - spec/session/mechanize_spec.rb
 - spec/session/remote_mechanize_spec.rb
 - spec/spec_helper.rb
@@ -70,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4133827917572927530
+      hash: -3177128084939450317
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/README.mdown

@@ -1,76 +0,0 @@
-Capybara-mechanize
-==================
-
-This gems makes it possible to use Capybara for (partially) remote testing. It inherits most functionality from the RackTest driver and only uses [Mechanize](http://github.com/tenderlove/mechanize) for remote requests. 
-
-It is currently in use to test the integration between a Rails application and Twitter authorization and sharing.
-
-This gem is a [Capybara](http://github.com/jnicklas/capybara) extension. I have been inspired by the Capybara driver and some earlier efforts for a Mechanize driver.
-
-Thanks to [Pinkelstar](http://www.pinkelstar.com) for giving me the time and the need to develop this gem.
-
-### Installation
-
-    gem install capybara-mechanize
-
-### Usage without Cucumber
-
-    require 'capybara/mechanize'
-
-### Usage with Cucumber and tags
-
-A @mechanize tag is added to your hooks when you add the following line to your env.rb
-
-    require 'capybara/mechanize/cucumber'
-
-The following scenario will then be using the Mechanize driver
-
-    @mechanize
-    Scenario: do something remote
-      When I click the remote link
-      
-### Remote testing
-
-When you want to use this driver to test a remote application. You have to set the app_host:
-
-    Capybara.app_host = "http://www.yourapp.com"
-    
-Note that I haven't tested this case for my self yet. The Capybara tests pass for this situation though so it should work! Please provide me with feedback if it doesn't.
-
-## Running tests
-
-Until this library is merged with capybara there needs to be local app and you need to add the following to your host file:
-
-    127.0.0.1 capybara-testapp.heroku.com 
-
-Run bundler
-
-    bundle install
-
-Run the app with the following line: 
-
-    bundle exec ruby -rrubygems lib/capybara/spec/extended_test_app.rb
-
-Then you are ready to run the test like so
-
-    rake spec
-
-Todo
-----
-* Make the last 12 failing remote session spec pass, see remote_mechanize_spec and uncomment one line there to see them fail
-* Test this driver with non-rack/non-ruby projects
-
-Note on Patches/Pull Requests
------------------------------
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-Copyright
----------
-Copyright (c) 2010 Jeroen van Dijk. See LICENSE for details.