capybara-mechanize 0.2.3 → 0.2.4

data/README.mdown

@@ -37,10 +37,27 @@ When you want to use this driver to test a remote application. You have to set t
     
 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 redirect specs pass 
-* Add specs for local to remote redirect (functionality is there though and works in our case)
+* 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

data/lib/capybara/driver/{mechanize.rb → mechanize_driver.rb}

@@ -6,13 +6,19 @@ class Capybara::Driver::Mechanize < Capybara::Driver::RackTest
   def_delegator :agent, :scheme_handlers
   def_delegator :agent, :scheme_handlers=
   
-  def initialize(*args)
-    super
+  def initialize(app = nil)
     @agent = ::Mechanize.new
     @agent.redirect_ok = false
+    
+    if app
+     # Delegate the RackApp to the RackTest driver
+     super(app)
+    elsif !Capybara.app_host
+      raise ArgumentError, "You have to set at least Capybara.app_host or Capybara.app"
+    end
   end
   
-  def cleanup!
+  def reset!
     @agent.cookie_jar.clear!
     super
   end
@@ -30,7 +36,7 @@ class Capybara::Driver::Mechanize < Capybara::Driver::RackTest
     unless response.redirect?
       raise "Last response was not a redirect. Cannot follow_redirect!"
     end
-    
+
     location = if last_request_remote?
         remote_response.page.response['Location'] 
       else
@@ -43,7 +49,8 @@ class Capybara::Driver::Mechanize < Capybara::Driver::RackTest
   def get(url, params = {}, headers = {})
     if remote?(url)
       process_remote_request(:get, url)
-    else 
+    else
+      register_local_request
       super
     end
   end
@@ -51,7 +58,26 @@ class Capybara::Driver::Mechanize < Capybara::Driver::RackTest
   def post(url, params = {}, headers = {})
     if remote?(url)
       process_remote_request(:post, url, params, headers)
-    else 
+    else
+      register_local_request
+      super
+    end
+  end
+  
+  def put(url, params = {}, headers = {})
+    if remote?(url)
+      process_remote_request(:put, url)
+    else
+      register_local_request
+      super
+    end
+  end
+
+  def delete(url, params = {}, headers = {})
+    if remote?(url)
+      process_remote_request(:delete, url, params, headers)
+    else
+      register_local_request
       super
     end
   end
@@ -63,7 +89,12 @@ class Capybara::Driver::Mechanize < Capybara::Driver::RackTest
       false
     else
       host = URI.parse(url).host
-      !(host.nil? || host.include?(Capybara.default_host))
+      
+      if host.nil? && last_request_remote?
+        true
+      else
+        !(host.nil? || host.include?(Capybara.default_host))
+      end
     end
   end
 
@@ -74,15 +105,28 @@ class Capybara::Driver::Mechanize < Capybara::Driver::RackTest
   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)
     if remote?(url)
-      url = File.join((Capybara.app_host || Capybara.default_host), url) if URI.parse(url).host.nil?
+      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)
+        url = "http://#{url}" unless url.include?("http")
+      else
+        @last_remote_host = "#{remote_uri.host}:#{remote_uri.port}"
+      end
+      
       reset_cache
       @agent.send *( [method, url] + options)
+        
       @last_request_remote = true
-    else
-      @last_request_remote = false
     end
   end
 

data/lib/capybara/mechanize.rb

@@ -1 +1,11 @@
-require 'capybara/driver/mechanize'
+require 'capybara'
+
+module Capybara
+  module Driver
+    autoload :Mechanize, 'capybara/driver/mechanize_driver'
+  end
+end
+
+Capybara.register_driver :mechanize do |app|
+  Capybara::Driver::Mechanize.new(app)
+end

data/lib/capybara/spec/extended_test_app.rb

@@ -8,7 +8,21 @@ class ExtendedTestApp < TestApp#< Sinatra::Base
   end
   
   get '/host' do
-    "current host is #{request.host}"
+    "current host is #{request.host}:#{request.port}, method get"
+  end
+  
+  get '/form_with_relative_action_to_host' do
+    %{<form action="/host" method="post">
+       <input type="submit" value="submit" />
+      </form>}
+  end
+  
+  get '/relative_link_to_host' do
+    %{<a href="/host">host</a>}
+  end
+  
+  post '/host' do
+    "current host is #{request.host}:#{request.port}, method post"
   end
 end
 

data/spec/driver/mechanize_driver_spec.rb

@@ -5,10 +5,10 @@ describe "Capybara::Driver::Mechanize, in local model" do
     @driver = Capybara::Driver::Mechanize.new(ExtendedTestApp)
   end
   
-  it "should throw an error when no rack app is given" do
+  it "should throw an error when no rack app is given without an app host" do
     running do
-      Capybara::Driver::Mechanize.new(nil)
-    end.should raise_error(ArgumentError)
+      Capybara::Driver::Mechanize.new
+    end.should raise_error(ArgumentError, "You have to set at least Capybara.app_host or Capybara.app")
   end
   
   it_should_behave_like "driver"
@@ -32,31 +32,62 @@ describe "Capybara::Driver::Mechanize, in local model" do
     end
 
     it "should treat urls as remote" do
-      @driver.remote?('http://www.remote.com').should be true
+      @driver.should be_remote('http://www.remote.com')
     end
   end
   
   context "with a default url, no app host" do
     before :each do
-      Capybara.default_host = 'local.com'
+      Capybara.default_host = 'www.local.com'
     end
     
     it "should treat urls with the same host names as local" do
-      @driver.remote?('http://www.local.com').should be false
+      @driver.should_not be_remote('http://www.local.com')
     end
     
     it "should treat other urls as remote" do
-      @driver.remote?('http://www.remote.com').should be true
+      @driver.should be_remote('http://www.remote.com')
+    end
+    
+    it "should treat relative paths as remote if the previous request was remote" do
+      @driver.visit('http://www.remote.com')
+      @driver.should be_remote('/some_relative_link')
+    end
+
+    it "should treat relative paths as local if the previous request was local" do
+      @driver.visit('http://www.local.com')
+      @driver.should_not be_remote('/some_relative_link')
     end
 
     it "should receive the right host" do
       @driver.visit('http://www.local.com/host')
-      @driver.body.should include('local.com')
+      @driver.body.should == "current host is www.local.com:80, method get"
+    end
+
+    it "should always switch to the right context" do
+      @driver.visit('http://www.local.com/host')
+      should_be_a_local_get
+
+      @driver.visit('/host')
+      should_be_a_local_get
+      @driver.should_not be_remote('/first_local')
+
+      @driver.visit("#{REMOTE_TEST_URL}/host")
+      should_be_a_remote_get
+      @driver.should be_remote('/first_remote')
+
+      @driver.visit('/host')
+      should_be_a_remote_get
+      @driver.should be_remote('/second_remote')
+
+      @driver.visit('http://www.local.com/host')
+      should_be_a_local_get
+      @driver.should_not be_remote('/second_local')
     end
 
     it "should follow redirects from local to remote" do
       @driver.visit("http://www.local.com/redirect_to/#{REMOTE_TEST_URL}/host")
-      @driver.body.should include(REMOTE_TEST_HOST)
+      should_be_a_remote_get
     end
     
     after :each do
@@ -66,13 +97,20 @@ describe "Capybara::Driver::Mechanize, in local model" do
 
   it "should include the right host when remote" do
     @driver.visit("#{REMOTE_TEST_URL}/host")
-    @driver.body.should include(REMOTE_TEST_HOST)
+    should_be_a_remote_get
   end
 
-  
   it "should follow redirects from remote to local" do
     @driver.visit("#{REMOTE_TEST_URL}/redirect_to/http://www.local.com/host")
-    @driver.body.should include('local.com')
+    should_be_a_local_get
+  end
+
+  def should_be_a_remote_get
+    @driver.body.should == "current host is #{REMOTE_TEST_HOST}, method get"
+  end
+  
+  def should_be_a_local_get
+    @driver.body.should == "current host is www.local.com:80, method get"
   end
 
 end

data/spec/driver/remote_mechanize_driver_spec.rb

@@ -10,10 +10,16 @@ describe Capybara::Driver::Mechanize do
   end
 
   before do
-    @driver = Capybara::Driver::Mechanize.new(TestApp)
+    @driver = Capybara::Driver::Mechanize.new
   end
   
   context "in remote mode" do
+    it "should not throw an error when no rack app is given" do
+      running do
+        Capybara::Driver::Mechanize.new
+      end.should_not raise_error(ArgumentError)
+    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)
+      Capybara.default_host = "www.local.com"
     end
 
     describe '#driver' do
@@ -25,6 +26,18 @@ describe Capybara::Session do
         @session.body.should == '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 == "current host is #{REMOTE_TEST_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 == "current host is #{REMOTE_TEST_HOST}, method post"      
+    end
 
     it_should_behave_like "session"
     it_should_behave_like "session without javascript support"

data/spec/session/remote_mechanize_spec.rb

@@ -12,7 +12,7 @@ describe Capybara::Session do
     
     
     before do      
-      @session = Capybara::Session.new(:mechanize, TestApp)
+      @session = Capybara::Session.new(:mechanize)
     end
 
     describe '#driver' do
@@ -29,15 +29,13 @@ describe Capybara::Session do
 
     describe '#click_link' do
       it "should use data-method if available" do
-        pending "Needs to be implemented" do
-          @session.visit "/with_html"
-          @session.click_link "A link with data-method"
-          @session.body.should == 'The requested object was deleted'
-        end
+        @session.visit "/with_html"
+        @session.click_link "A link with data-method"
+        @session.body.should == 'The requested object was deleted'
       end
     end
 
-    # Pending: Still 12 failing tests here:
+    # Pending: Still 90 (and before the update of capybara to 0.4.0 16) failing tests here (result is 702 examples, 90 failures, instead of 381 examples)
     # it_should_behave_like "session"
 
     it_should_behave_like "session without javascript support"

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
+require 'bundler/setup'
 require 'capybara'
 require 'capybara/mechanize'
 
 require 'sinatra'
-require 'spec'
 
 require 'capybara/spec/extended_test_app'
 
@@ -14,10 +14,16 @@ alias :running :lambda
 
 Capybara.default_wait_time = 0 # less timeout so tests run faster
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.after do
     Capybara.default_selector = :xpath
   end
+  # config.filter_run :focus => true
 end
-REMOTE_TEST_HOST = "capybara-testapp.heroku.com"
-REMOTE_TEST_URL = "http://#{REMOTE_TEST_HOST}:8070"
+
+# Until this library is merged with capybara there needs to be a local app and you need to add
+# 127.0.0.1 capybara-testapp.heroku.com to your host file
+# Run the app with the following line: 
+# ruby -rrubygems lib/capybara/spec/extended_test_app.rb
+REMOTE_TEST_HOST = "capybara-testapp.heroku.com:8070"
+REMOTE_TEST_URL = "http://#{REMOTE_TEST_HOST}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capybara-mechanize
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jeroen van Dijk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 +02:00
+date: 2010-09-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -40,32 +40,16 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 9
-        version: 0.3.9
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
-  version_requirements: *id003
 description: RackTest driver for Capybara, but with remote request support thanks to mechanize
 email: jeroen@jeevidee.nl
 executables: []
@@ -75,7 +59,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/capybara/driver/mechanize.rb
+- lib/capybara/driver/mechanize_driver.rb
 - lib/capybara/mechanize/cucumber.rb
 - lib/capybara/mechanize.rb
 - lib/capybara/spec/extended_test_app.rb
@@ -83,7 +67,6 @@ files:
 - spec/driver/remote_mechanize_driver_spec.rb
 - spec/session/mechanize_spec.rb
 - spec/session/remote_mechanize_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - README.mdown
 has_rdoc: true

data/spec/spec.opts

@@ -1 +0,0 @@
---color --backtrace