frameworks-capybara 0.2.34 → 0.3.0.rc1

data/Gemfile

@@ -1,9 +1,3 @@
 source :rubygems
 
-platforms :jruby do
-  gem "jruby-openssl"
-end
-
-gem "rspec-mocks", "<2.14.0"
-
 gemspec

data/Gemfile.lock

@@ -1,25 +1,18 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.2.34)
-      capybara (~> 1.1.2)
+    frameworks-capybara (0.3.0.rc1)
+      capybara (>= 1.0.0)
       capybara-celerity
-      capybara-mechanize (>= 0.3.0, < 1.0.0)
-      cucumber (>= 0.10.5)
-      headless
-      json
-      mechanize (= 2.7.2)
-      mime-types (~> 1.25)
-      nokogiri (~> 1.5.10)
-      rubyzip (~> 0.9.9)
-      selenium-webdriver
+      capybara-mechanize (>= 0.3.0)
       w3c_validators
 
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.2.2)
-    capybara (1.1.4)
+    addressable (2.2.7)
+    builder (3.0.0)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -33,66 +26,64 @@ GEM
       capybara (~> 1.1)
       mechanize (~> 2.3)
     celerity (0.9.2)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.10)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
-    diff-lcs (1.2.5)
-    domain_name (0.5.15)
-      unf (>= 0.0.5, < 1.0.0)
-    ffi (1.9.3)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    headless (1.0.1)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    json (1.8.1)
-    mechanize (2.7.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.9.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    domain_name (0.5.3)
+      unf (~> 0.0.3)
+    ffi (1.0.11)
+    gherkin (2.9.3)
+      json (>= 1.4.6)
+    json (1.6.6)
+    libwebsocket (0.1.3)
+      addressable
+    mechanize (2.3)
       domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0.0)
       mime-types (~> 1.17, >= 1.17.2)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
       net-http-persistent (~> 2.5, >= 2.5.2)
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-    mime-types (1.25.1)
-    multi_json (1.8.2)
-    multi_test (0.0.2)
-    net-http-digest_auth (1.4)
-    net-http-persistent (2.9)
-    nokogiri (1.5.11)
+      webrobots (~> 0.0, >= 0.0.9)
+    mime-types (1.18)
+    multi_json (1.3.2)
+    net-http-digest_auth (1.2)
+    net-http-persistent (2.6)
+    nokogiri (1.5.2)
     ntlm-http (0.1.1)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.4.1)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rake (10.1.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.35.1)
+    rake (0.9.2.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rubyzip (0.9.7)
+    selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
-      rubyzip (< 1.0.0)
-      websocket (~> 1.0.4)
-    unf (0.1.3)
+      rubyzip
+    term-ansicolor (1.0.7)
+    unf (0.0.5)
       unf_ext
-    unf_ext (0.0.6)
+    unf_ext (0.0.4)
     w3c_validators (1.2)
       json
       nokogiri
-    webrobots (0.1.1)
-    websocket (1.0.7)
+    webrobots (0.0.13)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -100,8 +91,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  cucumber (>= 0.10.5)
   frameworks-capybara!
-  jruby-openssl
   rake
   rspec (>= 1.0.0)
-  rspec-mocks (< 2.14.0)

data/README.rdoc

@@ -1,5 +1,3 @@
-= Build Status {<img src="https://secure.travis-ci.org/bbc-frameworks/frameworks-capybara.png"/>}[https://secure.travis-ci.org/bbc-frameworks/frameworks-capybara]
-
 = frameworks-capybara
 
 Gem to simplify the configuration of Capybara when using multiple drivers, also exposes other useful utility methods.
@@ -27,7 +25,7 @@ In your env.rb simply add:
 
 The following environment variables can be set to configure your tests:
 
-  ENVIRONMENT - this must be one of either 'sandbox', 'sandbox6', 'int', 'test', 'stage', 'live'
+  ENVIRONMENT - this must be one of either 'sandbox', 'int', 'test', 'stage', 'live'
   BROWSER - this must be one of either 'ie', 'firefox', 'chrome', 'headless', 'remote'
   HTTP_PROXY - url of proxy if required e.g. 'http://proxyhost:80', when running a headless browser this sets the proxy for the browser itself, when running a remote browser this sets the proxy for the client which will connect to the remote selenium server
   PLATFORM - used when specifying remote test on a grid that provides a choice of platforms, this must be one of either 'WINDOWS' or 'LINUX'
@@ -36,17 +34,10 @@ The following environment variables can be set to configure your tests:
   REMOTE_BROWSER_VERSION - used when specifying remote test on a grid the provides a choice of browser versions for a given browser
   REMOTE_URL - URL of remote Selenium-Webdriver server e.g. http://yourremotehost:4444/wd/hub
   FIREFOX_PROFILE - specify a firefox profile to use when running in-browser tests (local or remote)
-  FIREFOX_PREFS - specify a json string of additional preferences e.g. FIREFOX_PREFS='{"javascript.enabled": false}'
-  FIREFOX_CERT_PATH - specify optional directory containing Firefox profile certificate (.db) files
-  FIREFOX_CERT_PREFIX - specify optional prefix for locating Firefox profile certificate files (e.g. <prefix>-<file>.db)
-  CREATE_NEW_FF_PROFILE - create a new Firefox profile with name provided by FIREFOX_PROFILE 
   CELERITY_JS_ENABLED (string - 'true', 'false') - determines whether Celerity (HTMLUnit) attempts to execute javascript 
   XVFB - (string - 'true', 'false') - determines whether XVFB is used to run browser (i.e. headless Firefox on *nix platform)
   FW_CERT_LOCATION - path to client certificate (combined pem)
   CHROME_SWITCHES - pass in any allowed switches for the Selenium chrome driver (http://peter.sh/experiments/chromium-command-line-switches/) e.g. CHROME_SWITCHES="--user-agent=Mozilla/5.0 (PLAYSTATION 3; 3.55)"
-  PROJECT_NAME - optional project name description which gets displayed in Cucumber html reports 
-  TEAM_NAME - optional team name description which gets displayed in Cucumber html reports 
-  BROWSER_CLI_ARGS - optional additional arguments to pass to local browser processes
 
 Here is a sample cucumber.yml:
 
@@ -79,25 +70,15 @@ This gem also sets up a number of 'base urls' for you to use in your tests, thes
   @base_static_url
   @base_open_url
 
-Finally this gem contains some useful monkey-patches to core libraries e.g. Capybara-Mechanize, Selenium-Webdriver and Cucumber.
+Finally this gem contains some useful monkey-patches to core libraries e.g. Capybara, Selenium-Webdriver and Cucumber.
 
 == Release instructions
 
 * Run tests - 'rake'
-* If you have not published with 'gem' before, run 'gem push' to enter your credentials (ignore failed publish error at the end)
 * Bump version - manually update file in lib/version.rb
-* Update the CHANGES[https://github.com/bbc-frameworks/frameworks-capybara/blob/master/CHANGES] log (see file for convention).
-* Run 'bundle install --binstubs --path vendor' to pick up new version in Gemfile
-* Commit 'Gemfile.lock' changes
+* Run 'bundle install' to pick up new version in Gemfile
 * Release - 'rake release'
 
-You should see something like:
-
-  frameworks-capybara 0.2.23 built to pkg/frameworks-capybara-0.2.23.gem
-  Tagged v0.2.23
-  Pushed git commits and tags
-  Pushed frameworks-capybara 0.2.23 to rubygems.org
-
 == Contributing to frameworks-capybara
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/frameworks-capybara.gemspec

@@ -20,25 +20,12 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
 
-  if RUBY_VERSION < "1.9"
-    s.add_runtime_dependency("mime-types", ["~>1.25"])
-    s.add_runtime_dependency("nokogiri", ["~>1.5.10"])
-    s.add_runtime_dependency("rubyzip", ["~>0.9.9"])
-  else
-    s.add_runtime_dependency("mime-types")
-    s.add_runtime_dependency("nokogiri")
-    s.add_runtime_dependency("rubyzip")
-    s.add_runtime_dependency("zip")
-  end
-  s.add_runtime_dependency("selenium-webdriver")
-  s.add_runtime_dependency("capybara", ["~>1.1.2"])  
-  s.add_runtime_dependency("mechanize", ["2.7.2"])
-  s.add_runtime_dependency("capybara-mechanize", [">=0.3.0"], ["<1.0.0"])
-  s.add_runtime_dependency("json")
-  s.add_runtime_dependency("headless")
+  s.add_runtime_dependency("capybara", [">=1.0.0"])
+  s.add_runtime_dependency("capybara-mechanize", [">=0.3.0"])
   s.add_runtime_dependency("capybara-celerity")
   s.add_runtime_dependency("w3c_validators")
-  s.add_runtime_dependency("cucumber", [">= 0.10.5"])
+  s.add_development_dependency("cucumber", [">= 0.10.5"])
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec", [">=1.0.0"])
+
 end

data/lib/frameworks/capybara.rb

@@ -4,7 +4,6 @@ require 'monkey-patches/capybara-patches'
 require 'monkey-patches/capybara-mechanize-patches'
 require 'monkey-patches/mechanize-patches'
 require 'monkey-patches/send-keys'
-require 'monkey-patches/net-http-persistent-patches'
 require 'selenium-webdriver'
 require 'capybara/mechanize/cucumber' 
 require 'capybara/celerity'
@@ -14,7 +13,6 @@ class CapybaraSetup
   attr_reader :driver
 
   def initialize
-
     http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
 
     capybara_opts = {:environment => ENV['ENVIRONMENT'],
@@ -24,33 +22,25 @@ class CapybaraSetup
       :javascript_enabled => ENV['CELERITY_JS_ENABLED'],
       :proxy_on => ENV['PROXY_ON'],
       :url => ENV['REMOTE_URL'],
-      :chrome_switches => ENV['CHROME_SWITCHES'],
-      :firefox_prefs => ENV['FIREFOX_PREFS'],
-      :args => ENV['BROWSER_CLI_ARGS']
-    }
+      :chrome_switches => ENV['CHROME_SWITCHES']}
 
     selenium_remote_opts = {:platform => ENV['PLATFORM'],
       :browser_name => ENV['REMOTE_BROWSER'],
       :version => ENV['REMOTE_BROWSER_VERSION'],
-      :url => ENV['REMOTE_URL']
-    }
+      :url => ENV['REMOTE_URL']}
 
     custom_opts = {:job_name => ENV['SAUCE_JOB_NAME'],
-      :max_duration => ENV['SAUCE_MAX_DURATION'],
-      :firefox_cert_path => ENV['FIREFOX_CERT_PATH'],
-      :firefox_cert_prefix => ENV['FIREFOX_CERT_PREFIX']
-    }
+      :max_duration => ENV['SAUCE_MAX_DURATION']}
 
     validate_env_vars(capybara_opts.merge(selenium_remote_opts)) #validate environment variables set using cucumber.yml or passed via command line
 
-    @proxy_host =  capybara_opts[:proxy].gsub(/http:\/\//,'').gsub(/:80.*/,'') unless capybara_opts[:proxy].nil?
+    @proxy_host =  capybara_opts[:proxy].gsub(/http:\/\//,'').gsub(/:80/,'') unless capybara_opts[:proxy].nil?
     capybara_opts[:browser] = capybara_opts[:browser].intern #update :browser value to be a symbol, required for Selenium
     selenium_remote_opts[:browser_name] = selenium_remote_opts[:browser_name].intern if selenium_remote_opts[:browser_name]#update :browser value to be a symbol, required for Selenium
 
     Capybara.run_server = false #Disable rack server
 
     [capybara_opts, selenium_remote_opts, custom_opts].each do |opts| #delete nil options and environment (which is only used for validation)
-
       opts.delete_if {|k,v| (v.nil? or k == :environment)}
     end
 
@@ -84,41 +74,10 @@ class CapybaraSetup
     end
   end
 
-  # WARNING: This modifies the Firefox profile passed in the parameters
-  def update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix = '')
-    profile_path = profile.layout_on_disk
-    
-    # Create links to the certificate files in the profile directory
-    ['cert8.db', 'key3.db', 'secmod.db'].each do |cert_file|
-      source_file = "#{certificate_prefix}#{cert_file}"
-      source_path = "#{certificate_path}" + File::SEPARATOR + source_file
-      dest_path = profile_path + File::SEPARATOR + cert_file
-      if(! File.exist?(source_path))
-        raise "Firefox cert db file #{source_path} does not exist."
-      end
-      FileUtils.cp(source_path, dest_path)
-    end 
-
-    # Force the certificates to get pulled into the profile
-    profile = Selenium::WebDriver::Firefox::Profile.new(profile_path)
-
-    # Avoid Firefox certificate alerts
-    profile["security.default_personal_cert"] = 'Select Automatically'
-    
-    return profile
-  end
-
   def register_selenium_driver(opts,remote_opts,custom_opts)
     Capybara.register_driver :selenium do |app|
 
-      if opts[:firefox_prefs] || opts[:profile]
-        opts[:profile] = create_profile(opts[:profile], opts[:firefox_prefs])
-
-        if custom_opts[:firefox_cert_path]
-          opts[:profile] = update_firefox_profile_with_certificates(opts[:profile], custom_opts[:firefox_cert_path], custom_opts[:firefox_cert_prefix])
-        end
-      end
-
+      opts[:profile] = create_profile(opts[:profile]) if(opts[:profile])
       opts[:switches] = [opts.delete(:chrome_switches)] if(opts[:chrome_switches])
 
       if opts[:browser] == :remote
@@ -134,8 +93,7 @@ class CapybaraSetup
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
       end
-
-      clean_opts(opts, :proxy, :proxy_on, :firefox_prefs)
+      clean_opts(opts, :proxy, :proxy_on)
       Capybara::Selenium::Driver.new(app,opts)
     end   
     :selenium
@@ -150,31 +108,24 @@ class CapybaraSetup
     Selenium::WebDriver::Proxy.new(:http => opts[:proxy]) if opts[:proxy] && opts[:proxy_on] != 'false' #set proxy on client connection if required, note you may use ENV['HTTP_PROXY'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
   end
 
-  def create_profile(profile_name = nil, additional_prefs = nil)
-    additional_prefs = JSON.parse(additional_prefs) if additional_prefs
-    if(additional_prefs && !profile_name)
-      profile = Selenium::WebDriver::Firefox::Profile.new
-      profile.native_events = true
-    elsif(profile_name == 'BBC_INTERNAL')
+  def create_profile(profile_name)
+    if(profile_name == 'BBC_INTERNAL')
       profile = Selenium::WebDriver::Firefox::Profile.new
       profile["network.proxy.type"] = 1
-      profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk"
+      profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.bbc.co.uk"
       profile["network.proxy.http"] = @proxy_host 
       profile["network.proxy.ssl"] = @proxy_host 
       profile["network.proxy.http_port"] = 80
       profile["network.proxy.ssl_port"] = 80
       profile.native_events = true
+    elsif(profile_name == 'DISABLED_REFERER')
+      profile = Selenium::WebDriver::Firefox::Profile.new
+      profile["network.http.sendRefererHeader"] = 0
+      profile.native_events = true
     else
       profile = Selenium::WebDriver::Firefox::Profile.from_name profile_name
       profile.native_events = true
     end
-
-    if additional_prefs
-      additional_prefs.each do |k, v|
-        profile[k] = v
-      end
-    end
-
     profile
   end
 
@@ -196,7 +147,6 @@ class CapybaraSetup
     :mechanize
   end
 
-
   def clean_opts(opts, *args)
     args.each do |arg|
       opts.delete arg

data/lib/frameworks/cucumber.rb

@@ -2,7 +2,6 @@ require 'frameworks/capybara'
 require 'w3c_validators'
 require 'monkey-patches/cucumber-patches'
 
-#This is hackish but means we only run once in cucumber and not every scenario
 if(ENV['XVFB']=='true')
   puts "You have chosen to use XVFB - ensure you have yum installed Xvfb Xorg and firefox"
   require 'headless'
@@ -19,121 +18,55 @@ module Frameworks
     #Generate base urls to use in Cucumber step defs
     def generate_base_urls 
       environment = ENV['ENVIRONMENT'].downcase #be defensive
-
-      prepare_host
-
+      set_scheme
       if(environment =='sandbox')
         @base_url = @sandbox + @bbc_domain 
-        @pal_base_url = @sandbox + @bbc_domain 
-        @ssl_base_url = @sslsandbox + @bbc_domain
         @static_base_url = @static_sandbox + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + "sandbox.dev" + @bbc_domain
-        @m_base_url = @mdot_prefix + "sandbox.dev" + @bbc_domain
-      elsif(environment =='sandbox6')
-        @base_url = @sandbox6 + @bbc_domain 
-        @pal_base_url = @sandbox6 + @bbc_domain 
-        @ssl_base_url = @sslsandbox6 + @bbc_domain
-        @static_base_url = @static_sandbox6 + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + "sandbox" + @bbc_domain
-        @m_base_url = @mdot_prefix + "sandbox" + @bbc_domain
       elsif (environment =='live' && ENV['WWW_LIVE']=='false')
         @base_url = @www_prefix.chop + @bbc_domain
-        @pal_base_url = @pal_prefix + environment + @bbc_domain
-        @ssl_base_url = @ssl_prefix.chop + @bbc_domain
         @static_base_url = @static_prefix.chop + @bbci_domain
         @open_base_url = @open_prefix.chop + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix.chop + @bbc_domain
-        @m_base_url = @mdot_prefix.chop + @bbc_domain
+      elsif (environment.split('.')[0].include? 'pal') #address specific box
+        @base_url = "#{scheme}://#{ENV['ENVIRONMENT']}" 
       else
         @base_url = @www_prefix + environment + @bbc_domain
-        @pal_base_url = @pal_prefix + environment + @bbc_domain
-        @ssl_base_url = @ssl_prefix + environment + @bbc_domain
         @static_base_url = @static_prefix + environment + @bbci_domain
         @static_base_url = @static_prefix.chop + @bbci_domain if environment == 'live'
         @open_base_url = @open_prefix + environment + @bbc_domain
-        @mobile_base_url = @mobiledot_prefix + environment + @bbc_domain
-        @m_base_url = @mdot_prefix + environment + @bbc_domain
       end
-
       proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 
-      proxy_parts = proxy.scan(/(?:http:\/\/)?([^\:]+)(?::(\d+))?/) if proxy && !proxy.empty?
-      if proxy_parts && !proxy_parts.empty?
-          @proxy_host = proxy_parts[0][0]
-          if proxy_parts[0][1]
-              @proxy_port = proxy_parts[0][1]
-          else
-              @proxy_port = "80"
-          end
-      end
+      @proxy_host = proxy.scan(/http:\/\/(.*):80/).to_s if proxy
     end
 
-    def validate_online(src, validator_args = nil)
+    def validate_online(src)
 
-      args = {:proxy_host => @proxy_host,:proxy_port => @proxy_port} 
-      if(validator_args != nil)
-         args = args.merge(validator_args)
-      end    
-      @validator = MarkupValidator.new(args)
+      @validator = MarkupValidator.new({:proxy_host => @proxy_host,:proxy_port => 80})
 
       @validator.set_doctype!(:xhtml)
       begin
-
         results = @validator.validate_text(src)
+      rescue Net::HTTPFatalError => e
+        puts "WARNING - OUTGOING NETWORK ERROR FROM FORGE TO W3C - Validation Not Performed"
+      end
 
-        if results.errors.length > 0
-          results.errors.each do |err|
-            puts err.to_s
-          end
-          raise "W3C Validation failed."
+      if results.errors.length > 0
+        results.errors.each do |err|
+          puts err.to_s
         end
-
-      rescue SystemCallError => e
-        puts "System error whilst performing request to W3C: #{e}"  
+        raise "W3C Validation of " + current_url + " failed."
       end
     end
 
-    def prepare_host
+
+    def set_scheme  
       ENV['SCHEME']=='https' ? scheme = 'https' : scheme = 'http'
       @www_prefix = "#{scheme}://www."
-      @pal_prefix = "#{scheme}://pal."
-      @ssl_prefix = "https://ssl."
       @static_prefix = "#{scheme}://static."
       @open_prefix = "#{scheme}://open."
-      @bbc_domain = '.' + (ENV['FW_BBC_DOMAIN'] || 'bbc.co.uk')
+      @bbc_domain = '.bbc.co.uk'
       @bbci_domain = '.bbci.co.uk'
       @sandbox = "#{scheme}://pal.sandbox.dev"
-      @sandbox6 = "#{scheme}://sandbox"
-      @mobiledot_prefix = "#{scheme}://mobile."
-      @mdot_prefix = "#{scheme}://m."
-      @sslsandbox = "https://ssl.sandbox.dev"
-      @sslsandbox6 = "https://ssl.sandbox"
       @static_sandbox = "#{scheme}://static.sandbox.dev"
-      @static_sandbox6 = "#{scheme}://static.sandbox"      
-    end
-
-    def setup_mechanize(agent, http_proxy=nil)
-      http_proxy = http_proxy || ENV['HTTP_PROXY'] || ENV['http_proxy']
-
-      if ENV['FW_CERT_LOCATION']
-        agent.cert, agent.key = ENV['FW_CERT_LOCATION'], ENV['FW_CERT_LOCATION'] 
-      end
-
-      agent.ca_file = ENV['CA_CERT_LOCATION'] if ENV['CA_CERT_LOCATION']
-      agent.set_proxy(http_proxy.scan(/http:\/\/(.*):80/)[0][0].to_s,80) if http_proxy && !http_proxy.empty?
-
-      #This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
-      agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      # This prevents Mechanize from raising a Mechanize::ResponseCodeError
-      # when the HTTP Response Code is 404 or 503. This lets capybara continue the journey.
-      agent.agent.allowed_error_codes = ['404', '503']
-    end
-
-    def new_mechanize(http_proxy=nil)
-      require 'mechanize'
-      agent = Mechanize.new
-      setup_mechanize(agent, http_proxy)
-      agent
     end
 
   end #EnvHelper
@@ -147,7 +80,15 @@ World(Frameworks::EnvHelper)
 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
-  setup_mechanize(page.driver.browser.agent) if page.driver.class == Capybara::Mechanize::Driver
+  http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
+  if page.driver.class == Capybara::Mechanize::Driver
+    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']
+    #TODO: Fix proxy logic globally...use system proxy instead of PROXY_URL
+    page.driver.browser.agent.set_proxy(http_proxy.scan(/http:\/\/(.*):80/).to_s,80) if http_proxy
+    #This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
+    page.driver.browser.agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  end
 
   generate_base_urls
 end

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

@@ -2,7 +2,6 @@ require 'capybara/mechanize/cucumber'
 require 'uri'
 class Capybara::Mechanize::Browser
   #patch to remove catching all Mechanize exceptions (which are nice and specific) and throwing a useless RuntimeError
-  #patch to add Referer (Mechanize@0.3.0 won't add Referer for urls starting with http(s)://.)
   def process_remote_request(method, url, attributes, headers)
     if remote?(url)
       uri = URI.parse(url)
@@ -10,23 +9,11 @@ class Capybara::Mechanize::Browser
       @last_remote_uri = uri
       url = uri.to_s
 
-      referer = nil
-      referer_candidate = current_url
-      unless referer_candidate.empty? or (referer_candidate.start_with?('https://') and url.start_with?('http://'))
-        referer = referer_candidate
-      end
-
       reset_cache!
       args = []
       args << attributes unless attributes.empty?
       args << headers unless headers.empty?
-
-      if method == :get
-        agent.send(method, url, attributes, referer, headers)
-      else
-        agent.send(method, url, *args)
-      end
-
+      @agent.send(method, url, *args)
       @last_request_remote = true
     end
   end
@@ -40,14 +27,12 @@ class Capybara::Mechanize::Driver
     browser.agent.cookie_jar.jar.each do |domain|
       domain[1].each do |path|
         path[1].each do |cookie|
-          
           cookies.push({
             :name => cookie[1].name,
             :value => cookie[1].value,
             :domain => cookie[1].domain,
             :secure => cookie[1].secure,
             :expires => cookie[1].expires,
-            :httponly => cookie[1].httponly,
             :path => cookie[1].path
           })
         end
@@ -76,26 +61,14 @@ class Capybara::Mechanize::Driver
     browser.agent.cookie_jar.clear!
   end
 
-  def delete_cookies_in_domain(domain)
-    cookies.each do |cookie|
-      delete_cookie(cookie[:name]) if cookie[:domain].include?(domain)
-    end
-  end
-
+  FakeURI = Struct.new(:host)
   def add_cookie(attribs)
-    
-    cookie = HTTP::Cookie.new(
-      attribs[:name],
-      attribs[:value],
-      :domain => attribs[:domain],
-      :for_domain => true,
-      :path => '/',
-      :expires => attribs[:expires],
-      :secure => attribs[:secure],
-      :httponly => attribs[:httponly]
-    )
-
-    browser.agent.cookie_jar.add(cookie)
-
+    c = Mechanize::Cookie.new(attribs[:name],attribs[:value])
+    # remember: mechanize always removes leading '.' from domains
+    c.domain = attribs[:domain]
+    c.path = '/'
+    c.expires = attribs[:expires]
+    c.secure = attribs[:secure]
+    browser.agent.cookie_jar.add(FakeURI.new(c.domain),c)
   end
 end

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

@@ -43,10 +43,6 @@ class Capybara::Selenium::Driver
   def add_cookie(attribs)
     browser.manage.add_cookie(attribs)
   end
-
-   def delete_cookies_in_domain(domain)
-    browser.manage.delete_cookies_in_domain(domain)
-  end
 end
 
 module Capybara
@@ -82,8 +78,6 @@ module Capybara
       driver.add_cookie(attribs)
     end
 
-    def delete_cookies_in_domain(domain)
-      driver.delete_cookies_in_domain(domain)
-    end
   end
+
 end