bbc-capybara-mechanize 0.4.2 → 0.4.5

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-2012 Jeroen van Dijk. See LICENSE for details.

data/lib/capybara/mechanize/browser.rb

@@ -3,16 +3,15 @@ require 'mechanize'
 
 class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
   extend Forwardable
-  
-  attr_reader :driver
-  
+
   def_delegator :agent, :scheme_handlers
   def_delegator :agent, :scheme_handlers=
-  
+
   def initialize(driver)
     @agent = ::Mechanize.new
     @agent.redirect_ok = false
     @agent.user_agent = default_user_agent
+    #@agent.agent.max_history = 0
     if !driver.options.empty?
       if driver.options[:certificate]
         if !driver.options[:certificate].is_a? Hash
@@ -22,6 +21,9 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
           @agent.cert = driver.options[:certificate][:cer]
           @agent.key = driver.options[:certificate][:key]
         end
+        if driver.options[:ca]
+          @agent.ca_file = driver.options[:ca]
+        end
       end
       if driver.options[:user_agent]
         @agent.user_agent = driver.options[:user_agent]
@@ -45,221 +47,246 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
     end
     super
   end
-  
-  def auth(username, password)
-    @agent.basic_auth(username, password)
-  end
-  
+
   def reset_host!
-        @last_remote_host = nil
-        @last_request_remote = nil
-        super
-      end
+    @last_remote_uri = nil
+    @last_request_remote = nil
+    super
+  end
 
-      def current_url
-        last_request_remote? ? remote_response.current_url : 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 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
+  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
 
-      def follow_redirect!
-        unless last_response.redirect?
-          raise "Last response was not a redirect. Cannot follow_redirect!"
-        end
+  def follow_redirect!
+    unless last_response.redirect?
+      raise "Last response was not a redirect. Cannot follow_redirect!"
+    end
 
-        get(last_location_header)
-      end
+    get(last_location_header)
+  end
 
-      def process(method, path, *options)
-        reset_cache!
-        send(method, path, *options)
-        follow_redirects!
-      end
+  def process(method, path, *options)
+    reset_cache!
+    send(method, path, *options)
+    follow_redirects!
+  end
 
-      def process_without_redirect(method, path, attributes, headers)
-        path = @last_path if path.nil? || path.empty?
+  def process_without_redirect(method, path, attributes, headers)
+    path = @last_path if path.nil? || path.empty?
 
-        if remote?(path)
-          process_remote_request(method, path, attributes, headers)
-        else
-          register_local_request
+    if remote?(path)
+      process_remote_request(method, path, attributes, headers)
+    else
+      register_local_request
 
-          path = determine_path(path)
+      path = determine_path(path)
 
-          reset_cache!
-          send("racktest_#{method}", path, attributes, env.merge(headers))
-        end
+      reset_cache!
+      send("racktest_#{method}", path, attributes, env.merge(headers))
+    end
 
-        @last_path = path
-      end
+    @last_path = path
+  end
 
-      # TODO path Capybara to move this into its own method
-      def determine_path(path)
-        new_uri = URI.parse(path)
-        current_uri = URI.parse(current_url)
+  # TODO path Capybara to move this into its own method
+  def determine_path(path)
+    new_uri = URI.parse(path)
+    current_uri = URI.parse(current_url)
 
-        if new_uri.host
-          @current_host = new_uri.scheme + '://' + new_uri.host
-        end
+    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('/')
-            if folders.empty?
-              path = '/' + path
-            else
-              path = (folders[0, folders.size - 1] << path).join('/')
-            end
-          end
-          path = current_host + path
+    if new_uri.relative?
+      path = request_path + path if path.start_with?('?')
+
+      unless path.start_with?('/')
+        folders = request_path.split('/')
+        if folders.empty?
+          path = '/' + path
+        else
+          path = (folders[0, folders.size - 1] << path).join('/')
         end
-        path
       end
+      path = current_host + path
+    end
+    path
+  end
 
-      alias :racktest_get :get
-      def get(path, attributes = {}, headers = {})
-        process_without_redirect(:get, path, attributes, headers)
-      end
+  alias :racktest_get :get
+  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_post :post
+  def post(path, attributes = {}, headers = {})
+    process_without_redirect(:post, path, post_data(attributes), headers)
+  end
 
-      alias :racktest_put :put
-      def put(path, attributes = {}, headers = {})
-        process_without_redirect(:put, path, attributes, headers)
-      end
+  alias :racktest_put :put
+  def put(path, attributes = {}, headers = {})
+    process_without_redirect(:put, path, attributes, headers)
+  end
 
-      alias :racktest_delete :delete
-      def delete(path, attributes = {}, headers = {})
-        process_without_redirect(:delete, path, attributes, headers)
-      end
+  alias :racktest_delete :delete
+  def delete(path, attributes = {}, headers = {})
+    process_without_redirect(:delete, path, attributes, headers)
+  end
 
-      def post_data(params)
-        params.inject({}) do |memo, param|
-          case param
-          when Hash
-            param.each {|attribute, value| memo[attribute] = value }
-            memo
-          when Array
-            case param.last
-            when Hash
-              param.last.each {|attribute, value| memo["#{param.first}[#{attribute}]"] = value }
-            else
-              memo[param.first] = param.last
-            end
-            memo
-          end
+  def post_data(params)
+    params.inject({}) do |memo, param|
+      case param
+      when Hash
+        param.each {|attribute, value| memo[attribute] = value }
+        memo
+      when Array
+        case param.last
+        when Hash
+          param.last.each {|attribute, value| memo["#{param.first}[#{attribute}]"] = value }
+        else
+          memo[param.first] = param.last
         end
+        memo
       end
+    end
+  end
 
-      def remote?(url)
-        if Capybara.app_host
-          true
-        else
-          host = URI.parse(url).host
+  def remote?(url)
+    if Capybara.app_host
+      true
+    else
+      host = URI.parse(url).host
 
-          if host.nil?
-            last_request_remote?
-          else
-            !Capybara::Mechanize.local_hosts.include?(host)
-          end
-        end
+      if host.nil?
+        last_request_remote?
+      else
+        !Capybara::Mechanize.local_hosts.include?(host)
       end
+    end
+  end
 
-      attr_reader :agent
+  attr_reader :agent
 
-      private
+  private
 
-      def last_location_header
-        last_request_remote? ? remote_response.page.response['Location'] : last_response['Location']
-      end
+  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 last_request_remote?
+    !!@last_request_remote
+  end
 
-      def register_local_request
-        @last_remote_host = nil
-        @last_request_remote = false
+  def register_local_request
+    @last_remote_uri = nil
+    @last_request_remote = false
+  end
+
+  def process_remote_request(method, url, attributes, headers)
+    if remote?(url)
+      uri = URI.parse(url)
+      uri = resolve_relative_url(url) if uri.host.nil?
+      @last_remote_uri = uri
+      url = uri.to_s
+
+      reset_cache!
+      begin
+        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 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 =~ /^http(s?):/
-          else
-            @last_remote_host = "#{remote_uri.host}:#{remote_uri.port}"
-          end
-
-          reset_cache!
-          begin
-            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
+  # 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
 
-      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
+  def remote_response
+    ResponseProxy.new(@agent.current_page) if @agent.current_page
+  end
 
-      class ResponseProxy
-        extend Forwardable
+  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
 
-        def_delegator :page, :body
+  class ResponseProxy
+    extend Forwardable
 
-        attr_reader :page
+    def_delegator :page, :body
 
-        def initialize(page)
-          @page = page
-        end
+    attr_reader :page
 
-        def current_url
-          page.uri.to_s
-        end
+    def initialize(page)
+      @page = page
+    end
 
-        def headers
-          # Hax the content-type contains utf8, so Capybara specs are failing, need to ask mailinglist
-          headers = page.response
-          headers["cache-control"] = "no-cache"
-          headers["content-type"].gsub!(';charset=utf-8', '') if headers["content-type"]
-          headers
-        end
+    def current_url
+      page.uri.to_s
+    end
 
-        def status
-          page.code.to_i
-        end
+    def headers
+      # 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 redirect?
-          [301, 302].include?(status)
-        end
+    def status
+      page.code.to_i
+    end
 
-      end
+    def redirect?
+      status >= 300 && status < 400
+    end
+
+  end
+
+end
 
-    end

data/lib/capybara/mechanize/driver.rb

@@ -18,4 +18,4 @@ class Capybara::Mechanize::Driver < Capybara::RackTest::Driver
     @browser ||= Capybara::Mechanize::Browser.new(self)
   end
   
-end
+end

data/lib/capybara/mechanize/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Mechanize
-    VERSION = '0.4.2'
+    VERSION = '0.4.5'
   end
-end
+end

data/lib/capybara/spec/extended_test_app.rb

@@ -2,22 +2,6 @@ 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!
-  
-  helpers do
-
-    def protected!
-      unless authorized?
-        response['WWW-Authenticate'] = %(Basic realm="Restricted Area")
-        throw(:halt, [401, "Not authorized\n"])
-      end
-    end
-
-    def authorized?
-      @auth ||=  Rack::Auth::Basic::Request.new(request.env)
-      @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == ['admin', 'password']
-    end
-
-  end
 
   get %r{/redirect_to/(.*)} do
     redirect params[:captures]
@@ -50,10 +34,29 @@ class ExtendedTestApp < TestApp#< Sinatra::Base
   post '/request_info/*' do
     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 '/basic_auth/' do
-    protected!
-    %{Successfully authenticated}
+  get '/redirect_target' do
+    %{correct redirect}
   end
 
   private
@@ -61,4 +64,5 @@ class ExtendedTestApp < TestApp#< Sinatra::Base
     def current_request_info
       "Current host is #{request.url}, method #{request.request_method.downcase}"
     end
-end
+end
+

data/spec/driver/remote_mechanize_driver_spec.rb

@@ -29,6 +29,24 @@ describe Capybara::Mechanize::Driver do
       @driver.post("#{REMOTE_TEST_URL}/form", {:form => "success"})
       @driver.body.should include('success')
     end
+    
+    it "should throw an error when bad proxy option is passed" do
+      running do
+        Capybara::Mechanize::Driver.new(ExtendedTestApp, {:proxy => BAD_PROXY}).browser
+      end.should raise_error("ProxyError: You have entered an invalid proxy address #{BAD_PROXY}. e.g. (http|https)://proxy.com(:port)")
+    end
+
+    it "should not throw an error when good proxy option is passed" do
+      running do
+        Capybara::Mechanize::Driver.new(ExtendedTestApp, {:proxy => GOOD_PROXY}).browser
+      end.should_not raise_error()
+    end
+
+    it "should not throw an error when good proxy with port option is passed" do
+      running do
+        Capybara::Mechanize::Driver.new(ExtendedTestApp, {:proxy => PROXY_WITH_PORT}).browser
+      end.should_not raise_error()
+    end
 
     context "for a post request" do
 
@@ -48,6 +66,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"
@@ -56,40 +81,3 @@ describe Capybara::Mechanize::Driver do
   end
   
 end
-
-describe "Capybara::Mechanize::Driver, browser" do
-  
-  before(:each) do
-    Capybara.app_host = REMOTE_TEST_URL
-  end
-
-  after(:each) do
-    Capybara.app_host = nil
-  end
-  
-  context "in remote mode" do
-    it "should not throw an error when empty option is passed" do
-      running do
-        Capybara::Mechanize::Driver.new(ExtendedTestApp, {})
-      end.should_not raise_error()
-    end
-
-    it "should throw an error when bad proxy option is passed" do
-      running do
-        Capybara::Mechanize::Driver.new(ExtendedTestApp, {:proxy => BAD_PROXY}).browser
-      end.should raise_error("ProxyError: You have entered an invalid proxy address #{BAD_PROXY}. e.g. (http|https)://proxy.com(:port)")
-    end
-
-    it "should not throw an error when good proxy option is passed" do
-      running do
-        Capybara::Mechanize::Driver.new(ExtendedTestApp, {:proxy => GOOD_PROXY}).browser
-      end.should_not raise_error()
-    end
-
-    it "should not throw an error when good proxy with port option is passed" do
-      running do
-        Capybara::Mechanize::Driver.new(ExtendedTestApp, {:proxy => PROXY_WITH_PORT}).browser
-      end.should_not raise_error()
-    end
-  end
-end

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/mechanize_spec.rb

@@ -56,43 +56,4 @@ describe Capybara::Session do
     it_should_behave_like "session with headers support"
     it_should_behave_like "session with status code support"
   end
-  
-  context "Custom user agent" do
-    
-    before do
-      @session = Capybara::Session.new(:mechanize, TestApp)
-      @session.driver.options[:respect_data_method] = true
-      Capybara.default_host = 'http://www.local.com'
-    end
-    
-    it "should allow setting of custom user agents" do
-      @session.driver.options[:user_agent] = "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
-      @session.visit("#{REMOTE_TEST_URL}/request_info/user_agent")
-      @session.body.should include("Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3")
-    end
-  end
-  
-  context "Basic HTTP Auth" do
-    
-    before do
-      @session = Capybara::Session.new(:mechanize, TestApp)
-      @session.driver.options[:respect_data_method] = true
-      Capybara.default_host = 'http://www.local.com'
-    end
-    
-    it "should allow basic authentication to be setup" do
-      @session.driver.options[:username] = "admin"
-      @session.driver.options[:password] = "password"
-      @session.visit("#{REMOTE_TEST_URL}/basic_auth/")
-      @session.body.should include("Successfully authenticated")
-    end
-    
-    it "should allow basic authentication via auth method" do
-      @session.driver.browser.auth("admin", "password")
-      @session.visit("#{REMOTE_TEST_URL}/basic_auth/")
-      @session.body.should include("Successfully authenticated")
-    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,24 +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"
-GOOD_PROXY = "http://proxy.com"
-BAD_PROXY = "fasfasfasfasf"
-PROXY_WITH_PORT = "http://proxy.com:520"
+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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bbc-capybara-mechanize
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Jeroen van Dijk
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-30 00:00:00 Z
+date: 2012-08-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -24,12 +24,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 5
         segments: 
         - 2
-        - 5
-        - 1
-        version: 2.5.1
+        - 3
+        version: "2.3"
   prerelease: false
   type: :runtime
   name: mechanize
@@ -40,12 +39,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 13
         segments: 
         - 1
         - 1
-        - 2
-        version: 1.1.2
+        version: "1.1"
   prerelease: false
   type: :runtime
   name: capybara
@@ -67,6 +65,7 @@ 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