capybara-mechanize 1.1.0 → 1.4.0

data/lib/capybara/mechanize/browser.rb

@@ -19,6 +19,7 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
   def reset_host!
     @last_remote_uri = nil
     @last_request_remote = nil
+    @errored_remote_response = nil
     super
   end
 
@@ -71,7 +72,7 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
     end.map { |node| Capybara::Mechanize::Node.new(self, node) }
   end
 
-  attr_reader :agent
+  attr_reader :agent, :errored_remote_response
 
   private
 
@@ -116,8 +117,13 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
         else
           @agent.send(method, url, attributes, headers)
         end
-      rescue => e
-        raise "Received the following error for a #{method.to_s.upcase} request to #{url}: '#{e.message}'"
+        @errored_remote_response = nil
+      rescue Mechanize::ResponseCodeError => e
+        @errored_remote_response = e.page
+
+        if Capybara.raise_server_errors
+          raise "Received the following error for a #{method.to_s.upcase} request to #{url}: '#{e.message}'"
+        end
       end
       @last_request_remote = true
     end
@@ -129,7 +135,11 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
   end
 
   def remote_response
-    ResponseProxy.new(@agent.current_page) if @agent.current_page
+    if errored_remote_response
+      ResponseProxy.new(errored_remote_response)
+    elsif @agent.current_page
+      ResponseProxy.new(@agent.current_page)
+    end
   end
 
   def default_user_agent

data/lib/capybara/mechanize/node.rb

@@ -4,7 +4,8 @@ class Capybara::Mechanize::Node < Capybara::RackTest::Node
       super
     elsif (tag_name == 'input' and %w(submit image).include?(type)) or
         ((tag_name == 'button') and type.nil? or type == "submit")
-      Capybara::Mechanize::Form.new(driver, form).submit(self)
+      associated_form = form
+      Capybara::Mechanize::Form.new(driver, form).submit(self) if associated_form
     end
   end
 end

data/lib/capybara/mechanize/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Mechanize
-    VERSION = '1.1.0'
+    VERSION = '1.4.0'
   end
 end

data/lib/capybara/spec/extended_test_app.rb

@@ -1,6 +1,6 @@
 require 'capybara/spec/test_app'
 
-class ExtendedTestApp < TestApp#< Sinatra::Base
+class ExtendedTestApp < TestApp
   set :environment, :production # so we don't get debug info that makes our test pass!
   disable :protection
 

data/spec/driver/mechanize_driver_spec.rb

@@ -90,7 +90,6 @@ describe Capybara::Mechanize::Driver, 'local' do
   end
 
   context "with an app_host" do
-
     before do
       Capybara.app_host = 'http://www.remote.com'
     end
@@ -109,9 +108,22 @@ describe Capybara::Mechanize::Driver, 'local' do
       Capybara.default_host = 'www.local.com'
     end
 
-    it "should allow local hosts to be set" do
-      Capybara::Mechanize.local_hosts = ['subdomain.local.com']
-      driver.should_not be_remote('http://subdomain.local.com')
+    after do
+      Capybara.default_host = CAPYBARA_DEFAULT_HOST
+    end
+
+    context "local hosts" do
+      before do
+        Capybara::Mechanize.local_hosts = ['subdomain.local.com']
+      end
+
+      after do
+        Capybara::Mechanize.local_hosts = nil
+      end
+
+      it "should allow local hosts to be set" do
+        driver.should_not be_remote('http://subdomain.local.com')
+      end
     end
 
     it "should treat urls with the same host names as local" do
@@ -123,7 +135,7 @@ describe Capybara::Mechanize::Driver, 'local' do
     end
 
     it "should treat relative paths as remote if the previous request was remote" do
-      driver.visit(REMOTE_TEST_URL)
+      driver.visit(remote_test_url)
       driver.should be_remote('/some_relative_link')
     end
 
@@ -146,7 +158,7 @@ describe Capybara::Mechanize::Driver, 'local' do
     end
 
     it "should consider relative paths to be remote when the previous request was remote" do
-      driver.visit("#{REMOTE_TEST_URL}/host")
+      driver.visit("#{remote_test_url}/host")
       driver.get('/host')
 
       should_be_a_remote_get
@@ -156,7 +168,7 @@ describe Capybara::Mechanize::Driver, 'local' do
     it "should always switch to the right context" do
       driver.visit('http://www.local.com/host')
       driver.get('/host')
-      driver.get("#{REMOTE_TEST_URL}/host")
+      driver.get("#{remote_test_url}/host")
       driver.get('/host')
       driver.get('http://www.local.com/host')
 
@@ -165,28 +177,41 @@ describe Capybara::Mechanize::Driver, 'local' do
     end
 
     it "should follow redirects from local to remote" do
-      driver.visit("http://www.local.com/redirect_to/#{REMOTE_TEST_URL}/host")
+      driver.visit("http://www.local.com/redirect_to/#{remote_test_url}/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.visit("#{remote_test_url}/redirect_to/http://www.local.com/host")
       should_be_a_local_get
     end
 
-    after do
-      Capybara.default_host = nil
+    it "passes the status code of remote calls back to be validated" do
+      quietly do
+        driver.visit(remote_test_url)
+        driver.get('/asdfafadfsdfs')
+        driver.response.status.should be >= 400
+      end
     end
 
-    it "should raise a useful error for sites that return a 404, because it is probably a misconfiguration" do
-      expect { 
-        driver.visit("http://iamreallysurethatthisdoesntexist.com/canttouchthis")
-      }.to raise_error(%r{Received the following error for a GET request to http://iamreallysurethatthisdoesntexist.com/canttouchthis:})
+    context "when errors are set to true" do
+      it "raises an useful error because it is probably a misconfiguration" do
+        quietly do
+          original = Capybara.raise_server_errors
+
+          expect {
+            driver.visit(remote_test_url)
+            Capybara.raise_server_errors = true
+            driver.get('/asdfafadfsdfs')
+          }.to raise_error(%r{Received the following error for a GET request to /asdfafadfsdfs:})
+          Capybara.raise_server_errors = original
+        end
+      end
     end
   end
 
   it "should include the right host when remote" do
-    driver.visit("#{REMOTE_TEST_URL}/host")
+    driver.visit("#{remote_test_url}/host")
     should_be_a_remote_get
   end
 
@@ -195,8 +220,12 @@ describe Capybara::Mechanize::Driver, 'local' do
       Capybara.default_host = 'http://www.local.com'
     end
 
+    after do
+      Capybara.default_host = CAPYBARA_DEFAULT_HOST
+    end
+
     it 'should reset remote host' do
-      driver.visit("#{REMOTE_TEST_URL}/host")
+      driver.visit("#{remote_test_url}/host")
       should_be_a_remote_get
       driver.reset!
       driver.visit("/host")
@@ -205,11 +234,11 @@ describe Capybara::Mechanize::Driver, 'local' do
   end
 
   def should_be_a_remote_get
-    driver.current_url.should include(REMOTE_TEST_URL)
+    driver.current_url.should include(remote_test_url)
   end
 
   def should_be_a_local_get
     driver.current_url.should include("www.local.com")
   end
-# 
+
 end

data/spec/driver/remote_mechanize_driver_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Capybara::Mechanize::Driver, 'remote' do
   before do
-    Capybara.app_host = REMOTE_TEST_URL
+    Capybara.app_host = remote_test_url
   end
 
   after do
@@ -13,32 +13,32 @@ describe Capybara::Mechanize::Driver, 'remote' do
 
   context "in remote mode" do
     it "should pass arguments through to a get request" do
-      driver.visit("#{REMOTE_TEST_URL}/form/get", {:form => "success"})
+      driver.visit("#{remote_test_url}/form/get", {:form => "success"})
       driver.html.should include('success')
     end
 
     it "should pass arguments through to a post request" do
-      driver.post("#{REMOTE_TEST_URL}/form", {:form => "success"})
+      driver.post("#{remote_test_url}/form", {:form => "success"})
       driver.html.should include('success')
     end
 
     describe "redirect" do
       it "should handle redirects with http-params" do
-        driver.visit "#{REMOTE_TEST_URL}/redirect_with_http_param"
+        driver.visit "#{remote_test_url}/redirect_with_http_param"
         driver.html.should include('correct redirect')
       end
     end
 
     context "for a post request" do
       it 'transforms nested map in post data' do
-        driver.post("#{REMOTE_TEST_URL}/form", {:form => {:key => 'value'}})
+        driver.post("#{remote_test_url}/form", {:form => {:key => 'value'}})
         driver.html.should include(':key=>"value"')
       end
     end
 
     context 'process remote request' do
       it 'transforms nested map in post data' do
-        driver.submit(:post, "#{REMOTE_TEST_URL}/form", {:form => {:key => 'value'}})
+        driver.submit(:post, "#{remote_test_url}/form", {:form => {:key => 'value'}})
         driver.html.should include(':key=>"value"')
       end
     end

data/spec/session/mechanize_spec.rb

@@ -4,13 +4,15 @@ module TestSessions
   Mechanize = Capybara::Session.new(:mechanize, TestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::Mechanize, "Mechanize", :skip => [
+Capybara::SpecHelper.run_specs TestSessions::Mechanize, "Mechanize", :capybara_skip => [
   :js,
   :screenshot,
   :frames,
   :windows,
   :server,
-  :hover
+  :hover,
+  :modals,
+  :about_scheme
 ]
 
 describe Capybara::Session do
@@ -21,6 +23,10 @@ describe Capybara::Session do
       Capybara.default_host = 'http://www.local.com'
     end
 
+    after do
+      Capybara.default_host = CAPYBARA_DEFAULT_HOST
+    end
+
     describe '#driver' do
       it "should be a mechanize driver" do
         session.driver.should be_an_instance_of(Capybara::Mechanize::Driver)
@@ -71,31 +77,31 @@ describe Capybara::Session do
     end
 
     it "should use the last remote url when following relative links" do
-      session.visit("#{REMOTE_TEST_URL}/relative_link_to_host")
+      session.visit("#{remote_test_url}/relative_link_to_host")
       session.click_link "host"
-      session.body.should include("Current host is #{REMOTE_TEST_URL}/request_info/host, 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.visit("#{remote_test_url}/form_with_relative_action_to_host")
       session.click_button "submit"
-      session.body.should include("Current host is #{REMOTE_TEST_URL}/request_info/host, 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.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")
+      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.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
 
     context 'form referer when switching from local to remote' do
       it 'sends the referer' do
-        session.visit "/form_posts_to/#{REMOTE_TEST_URL}/get_referer"
+        session.visit "/form_posts_to/#{remote_test_url}/get_referer"
         session.click_button 'submit'
         session.body.should include 'Got referer'
       end

data/spec/session/remote_mechanize_spec.rb

@@ -6,7 +6,7 @@ end
 
 shared_context "remote tests" do
   before do
-    Capybara.app_host = REMOTE_TEST_URL
+    Capybara.app_host = remote_test_url
   end
 
   after do
@@ -14,13 +14,15 @@ shared_context "remote tests" do
   end
 end
 
-session_describe = Capybara::SpecHelper.run_specs TestSessions::Mechanize, "Mechanize", :skip => [
+session_describe = Capybara::SpecHelper.run_specs TestSessions::Mechanize, "Mechanize", :capybara_skip => [
   :js,
   :screenshot,
   :frames,
   :windows,
   :server,
-  :hover
+  :hover,
+  :modals,
+  :about_scheme
 ]
 
 session_describe.include_context("remote tests")

data/spec/spec_helper.rb

@@ -17,12 +17,18 @@ RSpec.configure do |config|
   # Used with DisableExternalTests
   config.filter_run_excluding :external_test_disabled
 
+  config.include RemoteTestUrl
+  config.extend RemoteTestUrl
+  config.include Capybara::SpecHelper
+
   config.after do
     Capybara::Mechanize.local_hosts = nil
   end
 
   Capybara::SpecHelper.configure(config)
+
+  config.order = "random"
+
+  CAPYBARA_DEFAULT_HOST = Capybara.default_host
 end
 
-setup = ExtendedTestAppSetup.new.boot
-REMOTE_TEST_URL = setup.remote_test_url

data/spec/support/extended_test_app_setup.rb

@@ -9,6 +9,7 @@ class ExtendedTestAppSetup
   def boot
     boot_test_app
     boot_remote_app
+    Capybara.raise_server_errors = false
 
     self
   end

data/spec/support/remote_test_url.rb

@@ -0,0 +1,5 @@
+module RemoteTestUrl
+  def remote_test_url
+    ExtendedTestAppSetup.new.boot.remote_test_url
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-mechanize
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.4
 description: RackTest driver for Capybara, but with remote request support thanks
   to mechanize
 email: jeroen@jeevidee.nl
@@ -65,6 +65,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/disable_external_tests.rb
 - spec/support/extended_test_app_setup.rb
+- spec/support/remote_test_url.rb
 - README.mdown
 homepage: https://github.com/jeroenvandijk/capybara-mechanize
 licenses: []
@@ -79,6 +80,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1895227021431628826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RackTest driver for Capybara with remote request support