frameworks-capybara 0.2.0.rc4 → 0.2.0.rc5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.2.0.rc4)
+    frameworks-capybara (0.2.0.rc5)
       capybara (>= 1.0.0)
       capybara-celerity
       capybara-mechanize (>= 0.3.0)

data/lib/frameworks/cucumber.rb

@@ -77,7 +77,7 @@ Before do
   #This is ugly but unavoidable since Capybara::RackTest::Driver.reset_host! does @browser = nil and wipes all brower level settings
   #it was either this or a monkey patch - need to think about pushing a softer reset change to capybara-mechanize to override this
   if page.driver.class == Capybara::Mechanize::Driver
-    page.driver.browser.agent.cert, driver.browser.agent.key = ENV['FW_CERT_LOCATION'], ENV['FW_CERT_LOCATION'] if ENV['FW_CERT_LOCATION']
+    page.driver.browser.agent.cert, page.driver.browser.agent.key = ENV['FW_CERT_LOCATION'], ENV['FW_CERT_LOCATION'] if ENV['FW_CERT_LOCATION']
     page.driver.browser.agent.ca_file = ENV['CA_CERT_LOCATION'] if ENV['CA_CERT_LOCATION']
     page.driver.browser.agent.set_proxy('www-cache.reith.bbc.co.uk',80) if ENV['PROXY_URL']
   end

data/lib/monkey-patches/capybara-mechanize-patches.rb

@@ -1,41 +1,29 @@
 require 'capybara/mechanize/cucumber' 
 require 'uri'
-
-class Capybara::Driver::Mechanize
-=begin
-  def process_remote_request(method, url, *options)
+class Capybara::Mechanize::Browser
+  #patch to remove catching all Mechanize exceptions (which are nice and specific) and throwing a useless RuntimeError
+  def process_remote_request(method, url, attributes, headers)
     if remote?(url)
-      remote_uri = URI.parse(url)
-    
-      @scheme = remote_uri.scheme if remote_uri.scheme 
-
-      if remote_uri.host.nil?
-        #TODO: Ascertain whether this is really true...
-        if(method == :post && url == "" && @prev_url) #patch
-          #require 'uri'
-          #url = "http://#{URI.parse(@prev_url).host}#{URI.parse(@prev_url).path}"
-          #p url
-          url = @prev_url #patch
-        else
-          remote_host = @last_remote_host || Capybara.app_host || Capybara.default_host
-          url = File.join(remote_host, url)
-          #url = "http://#{url}" unless url.include?("http")
-          url = "#{@scheme}://#{url}" unless url.match(/^http.*/)
-        end
-      else
-        @last_remote_host = "#{remote_uri.host}:#{remote_uri.port}"
-      end
-      @prev_url = url #patch
-      reset_cache
-      @agent.send *( [method, url] + options)
+      uri = URI.parse(url)
+      uri = resolve_relative_url(url) if uri.host.nil?
+      @last_remote_uri = uri
+      url = uri.to_s
 
+      reset_cache!
+      args = []
+      args << attributes unless attributes.empty?
+      args << headers unless headers.empty?
+      @agent.send(method, url, *args)
       @last_request_remote = true
     end
   end
-=end 
+end
+
+class Capybara::Mechanize::Driver
+  #Patch for friendly cookie handling api
   def cookies
     cookies = []
-    
+
     browser.agent.cookie_jar.jar.each do |domain|
       domain[1].each do |path|
         path[1].each do |cookie|
@@ -52,11 +40,11 @@ class Capybara::Driver::Mechanize
     end
     cookies
   end
-  
+
   def cookie_named(name)
     cookies.find { |c| c[:name] == name }
   end
-  
+
   def delete_cookie(cookie_name)
     browser.agent.cookie_jar.jar.each do |domain|
       domain[1].each do |path|
@@ -68,13 +56,13 @@ class Capybara::Driver::Mechanize
       end
     end
   end
-  
+
   def delete_all_cookies
     browser.agent.cookie_jar.clear!
   end
-  
- FakeURI = Struct.new(:host)
- def add_cookie(attribs)
+
+  FakeURI = Struct.new(:host)
+  def add_cookie(attribs)
     c = Mechanize::Cookie.new(attribs[:name],attribs[:value])
     # remember: mechanize always removes leading '.' from domains
     c.domain = attribs[:domain]

data/lib/version.rb

@@ -1,4 +1,4 @@
 module FrameworksCapybara
-  VERSION = '0.2.0.rc4'
+  VERSION = '0.2.0.rc5'
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 15424061
+  hash: 15424063
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - rc
-  - 4
-  version: 0.2.0.rc4
+  - 5
+  version: 0.2.0.rc5
 platform: ruby
 authors: 
 - matt robbins
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-02 00:00:00 +01:00
+date: 2012-04-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency