capybara-mechanize 0.3.0.rc3 → 0.3.0

data/README.mdown

@@ -65,4 +65,4 @@ Note on Patches/Pull Requests
 
 Copyright
 ---------
-Copyright (c) 2010-2011 Jeroen van Dijk. See LICENSE for details.
+Copyright (c) 2010-2012 Jeroen van Dijk. See LICENSE for details.

data/lib/capybara/mechanize/browser.rb

@@ -15,7 +15,7 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
   end
 
   def reset_host!
-    @last_remote_host = nil
+    @last_remote_uri = nil
     @last_request_remote = nil
     super
   end
@@ -156,21 +156,16 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
   end
 
   def register_local_request
-    @last_remote_host = nil
+    @last_remote_uri = nil
     @last_request_remote = false
   end
 
   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)
-        url = "http://#{url}" unless url.include?("http")
-      else
-        @last_remote_host = "#{remote_uri.host}:#{remote_uri.port}"
-      end
+      uri = URI.parse(url)
+      uri = resolve_relative_url(url) if uri.host.nil?
+      @last_remote_uri = uri
+      url = uri.to_s
 
       reset_cache!
       begin
@@ -185,6 +180,40 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
     end
   end
 
+  # paths are combined "intelligently" as close as they would be by the browser, but still interpreting
+  # routes from rails like "/user/login" as relative to a host including a possible subdirectory:
+  # eg: app_host = localhost/mysite/    url = /                 result = http://localhost/mysite/
+  # eg: app_host = localhost/mysite/    url = /home             result = http://localhost/mysite/home
+  # eg: app_host = localhost/mysite/    url = /user/login       result = http://localhost/mysite/user/login
+  # eg: app_host = localhost/mysite/    url = /mysite/login     result = http://localhost/mysite/login
+  #                                                               **** notice that 'mysite' is not repeated! *****
+  def resolve_relative_url(url)
+    if @last_remote_uri
+      base_uri = @last_remote_uri
+      path_prefix = ''
+    else
+      host = Capybara.app_host || Capybara.default_host
+      # do this in text so we don't get the host interpretted as the scheme.
+      host = "http://#{host}" unless host =~ %r{^https?://.*}
+      base_uri = URI.parse(host)
+      base_uri.path = '/' if base_uri.path.nil? || base_uri.path.empty?
+      if base_uri.path.length > 1
+        path_prefix = base_uri.path
+        path_prefix += '/' unless path_prefix.end_with?('/') || url.start_with?('/')
+
+        # if the prefix is already in the path, don't let it be there twice.
+        if url.start_with?(path_prefix)
+          path_prefix = ''
+        end
+      else
+        path_prefix = ''
+      end
+    end
+    uri = URI.parse(path_prefix + url)
+    result_uri = base_uri.merge uri
+  end
+
+
   def remote_response
     ResponseProxy.new(@agent.current_page) if @agent.current_page
   end
@@ -220,7 +249,7 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
     end
 
     def redirect?
-      [301, 302].include?(status)
+      status >= 300 && status < 400
     end
 
   end

data/lib/capybara/mechanize/version.rb

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

data/lib/capybara/spec/extended_test_app.rb

@@ -35,6 +35,29 @@ class ExtendedTestApp < TestApp#< Sinatra::Base
     current_request_info
   end
 
+  get '/host' do
+    "Current host is #{request.scheme}://#{request.host}:#{request.port}"
+  end
+
+  get '/subsite/relative_link_to_host' do
+    %{<a href="/subsite/request_info2/host">host</a>}
+  end
+
+  get '/subsite/local_link_to_host' do
+    %{<a href="request_info2/host">host</a>}
+  end
+
+  get '/subsite/request_info2/*' do
+    "subsite: " + current_request_info
+  end
+
+  get '/redirect_with_http_param' do
+    redirect '/redirect_target?foo=http'
+  end
+  
+  get '/redirect_target' do
+    %{correct redirect}
+  end
 
   private
 

data/spec/driver/remote_mechanize_driver_spec.rb

@@ -48,6 +48,13 @@ describe Capybara::Mechanize::Driver do
 
     end
 
+    describe "redirect" do
+      it "should handle redirects with http-params" do
+        @driver.visit "#{REMOTE_TEST_URL}/redirect_with_http_param"
+        @driver.body.should include('correct redirect')
+      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/relative_urls_spec.rb

@@ -0,0 +1,68 @@
+require "rspec"
+require 'capybara'
+require 'capybara/mechanize/browser'
+require File.expand_path('../spec_helper.rb', __FILE__)
+
+describe_internally Capybara::Mechanize::Browser do
+  describe "Resolving Relative URLs" do
+
+    before(:all) do
+      @original_app_host = Capybara.app_host
+      @driver = Object.new
+      @browser = Capybara::Mechanize::Browser.new(@driver)
+    end
+
+    after(:all) do
+      Capybara.app_host = @original_app_host
+      @browser.reset_host!
+    end
+
+    context "resolving on 'http://localhost'" do
+      before(:all) do
+        Capybara.app_host ='http://localhost'
+      end
+
+      it "resolves '/'" do
+        @browser.resolve_relative_url('/').to_s.should == 'http://localhost/'
+      end
+
+      it "resolves '/home'" do
+        @browser.resolve_relative_url('/home').to_s.should == 'http://localhost/home'
+      end
+
+      it "resolves 'home'" do
+        @browser.resolve_relative_url('home').to_s.should == 'http://localhost/home'
+      end
+
+      it "resolves 'user/login'" do
+        @browser.resolve_relative_url('user/login').to_s.should == 'http://localhost/user/login'
+      end
+    end
+
+    context "resolving on 'http://localhost/subsite'" do
+      before() do
+        Capybara.app_host='http://localhost/subsite'
+      end
+
+      it "resolves '/'" do
+        @browser.resolve_relative_url('/').to_s.should == 'http://localhost/subsite/'
+      end
+
+      it "resolves '/home'" do
+        @browser.resolve_relative_url('/home').to_s.should == 'http://localhost/subsite/home'
+      end
+
+      it "resolves 'home'" do
+        @browser.resolve_relative_url('home').to_s.should == 'http://localhost/subsite/home'
+      end
+
+      it "resolves 'user/login'" do
+        @browser.resolve_relative_url('user/login').to_s.should == 'http://localhost/subsite/user/login'
+      end
+
+      it "resolves '/subsite/user/login'" do
+        @browser.resolve_relative_url('/subsite/user/login').to_s.should == 'http://localhost/subsite/user/login'
+      end
+    end
+  end
+end

data/spec/session/remote_mechanize_spec.rb

@@ -35,6 +35,8 @@ describe Capybara::Session do
         @session.body.should include('The requested object was deleted')
       end
     end
+    
+
 
     # Pending: Still 16 failing tests here (result is 706 examples, 16 failures, instead of 385 examples)
     # it_should_behave_like "session"
@@ -42,5 +44,24 @@ describe Capybara::Session do
     it_should_behave_like "session without javascript support"
     it_should_behave_like "session with headers support"
     it_should_behave_like "session with status code support"
+
+
+    context "remote app in a sub-domain" do
+      before :each do
+        Capybara.app_host = "#{REMOTE_TEST_URL}/subsite"
+      end
+
+      it "follows relative link correctly" do
+        @session.visit "/relative_link_to_host"
+        @session.click_link "host"
+        @session.body.should include('request_info2/host')
+      end
+
+      it "follows local link correctly" do
+        @session.visit "/local_link_to_host"
+        @session.click_link "host"
+        @session.body.should include('request_info2/host')
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,11 @@
 require 'bundler/setup'
 require 'capybara'
+require 'capybara/dsl'
 require 'capybara/mechanize'
-require 'artifice'
+require 'capybara/spec/extended_test_app'
 
 require 'sinatra'
 
-require 'capybara/spec/extended_test_app'
-
 # TODO move this stuff into capybara
 require 'capybara/spec/driver'
 require 'capybara/spec/session'
@@ -14,21 +13,35 @@ require 'capybara/spec/session'
 alias :running :lambda
 
 Capybara.default_wait_time = 0 # less timeout so tests run faster
+Capybara.app = ExtendedTestApp
 
-RSpec.configure do |config|
-  config.before(:all) do
-    Artifice.activate_with(ExtendedTestApp)
-  end
+rack_server = Capybara::Server.new(Capybara.app)
+rack_server.boot
 
+RSpec.configure do |config|
   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
 
-REMOTE_TEST_URL = "http://localhost"
+REMOTE_TEST_URL = "http://localhost:#{rack_server.port}"
+
+
+
+# for testing private methods, courtesy of
+# http://kailuowang.blogspot.com.au/2010/08/testing-private-methods-in-rspec.html
+def describe_internally *args, &block
+  example = describe *args, &block
+  klass = args[0]
+  if klass.is_a? Class
+    saved_private_instance_methods = klass.private_instance_methods
+    example.before do
+      klass.class_eval { public *saved_private_instance_methods }
+    end
+    example.after do
+      klass.class_eval { private *saved_private_instance_methods }
+    end
+  end
+end

metadata

@@ -1,39 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: capybara-mechanize
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc3
-  prerelease: 6
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Jeroen van Dijk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000 +02:00
-default_executable: 
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &2168594720 !ruby/object:Gem::Requirement
+  requirement: &70180442685720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2168594720
+  version_requirements: *70180442685720
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2168594240 !ruby/object:Gem::Requirement
+  requirement: &70180442685240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2168594240
+  version_requirements: *70180442685240
 description: RackTest driver for Capybara, but with remote request support thanks
   to mechanize
 email: jeroen@jeevidee.nl
@@ -49,11 +48,11 @@ files:
 - lib/capybara/spec/extended_test_app.rb
 - spec/driver/mechanize_driver_spec.rb
 - spec/driver/remote_mechanize_driver_spec.rb
+- spec/relative_urls_spec.rb
 - spec/session/mechanize_spec.rb
 - spec/session/remote_mechanize_spec.rb
 - spec/spec_helper.rb
 - README.mdown
-has_rdoc: true
 homepage: https://github.com/jeroenvandijk/capybara-mechanize
 licenses: []
 post_install_message: 
@@ -67,9 +66,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3177128084939450317
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: RackTest driver for Capybara with remote request support