frameworks-capybara 0.3.0.rc1 → 0.3.0.rc2

data/.travis.yml

@@ -0,0 +1,12 @@
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install xvfb
+language: ruby
+rvm:
+- 1.8.7
+- 1.9.2
+- 1.9.3
+- jruby-18mode # JRuby in 1.8 mode
+- jruby-19mode # JRuby in 1.9 mode
+# uncomment this line if your project needs to run something other than `rake`:
+# # script: bundle exec rspec spec

data/Gemfile

@@ -1,3 +1,7 @@
 source :rubygems
 
+platforms :jruby do
+  gem "jruby-openssl"
+end
+
 gemspec

data/Gemfile.lock

@@ -1,16 +1,20 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.3.0.rc1)
+    frameworks-capybara (0.3.0.rc2)
       capybara (>= 1.0.0)
       capybara-celerity
       capybara-mechanize (>= 0.3.0)
+      capybara-webkit
+      cucumber (>= 0.10.5)
+      headless
+      json
       w3c_validators
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.7)
+    addressable (2.2.8)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -25,25 +29,28 @@ GEM
     capybara-mechanize (0.3.0)
       capybara (~> 1.1)
       mechanize (~> 2.3)
+    capybara-webkit (0.12.1)
+      capybara (>= 1.0.0, < 1.2)
+      json
     celerity (0.9.2)
-    childprocess (0.3.1)
+    childprocess (0.3.3)
       ffi (~> 1.0.6)
-    cucumber (1.1.9)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.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)
+    gherkin (2.11.1)
       json (>= 1.4.6)
-    json (1.6.6)
-    libwebsocket (0.1.3)
+    headless (0.3.1)
+    json (1.7.3)
+    libwebsocket (0.1.4)
       addressable
-    mechanize (2.3)
+    mechanize (2.5.1)
       domain_name (~> 0.5, >= 0.5.1)
       mime-types (~> 1.17, >= 1.17.2)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
@@ -51,35 +58,33 @@ GEM
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
       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)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    net-http-digest_auth (1.2.1)
+    net-http-persistent (2.7)
+    nokogiri (1.5.5)
     ntlm-http (0.1.1)
     rack (1.4.1)
     rack-test (0.6.1)
       rack (>= 1.0)
     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)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    rubyzip (0.9.7)
-    selenium-webdriver (2.21.2)
+    rspec-mocks (2.10.1)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.24.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    term-ansicolor (1.0.7)
     unf (0.0.5)
       unf_ext
-    unf_ext (0.0.4)
+    unf_ext (0.0.5)
     w3c_validators (1.2)
       json
       nokogiri
@@ -91,7 +96,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber (>= 0.10.5)
   frameworks-capybara!
+  jruby-openssl
   rake
   rspec (>= 1.0.0)

data/README.rdoc

@@ -1,3 +1,5 @@
+= Build Status {<img src="https://secure.travis-ci.org/mcrmfc/frameworks-capybara.png"/>}[https://secure.travis-ci.org/mcrmfc/frameworks-capybara]
+
 = frameworks-capybara
 
 Gem to simplify the configuration of Capybara when using multiple drivers, also exposes other useful utility methods.
@@ -34,6 +36,8 @@ 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}'
+  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)

data/frameworks-capybara.gemspec

@@ -22,10 +22,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("capybara", [">=1.0.0"])
   s.add_runtime_dependency("capybara-mechanize", [">=0.3.0"])
+  s.add_runtime_dependency("capybara-webkit")
+  s.add_runtime_dependency("json")
+  s.add_runtime_dependency("headless")
   s.add_runtime_dependency("capybara-celerity")
   s.add_runtime_dependency("w3c_validators")
-  s.add_development_dependency("cucumber", [">= 0.10.5"])
+  s.add_runtime_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,15 +4,18 @@ 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'
+require 'capybara-webkit'
 
 class CapybaraSetup
 
   attr_reader :driver
 
   def initialize
+
     http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
 
     capybara_opts = {:environment => ENV['ENVIRONMENT'],
@@ -22,7 +25,8 @@ class CapybaraSetup
       :javascript_enabled => ENV['CELERITY_JS_ENABLED'],
       :proxy_on => ENV['PROXY_ON'],
       :url => ENV['REMOTE_URL'],
-      :chrome_switches => ENV['CHROME_SWITCHES']}
+      :chrome_switches => ENV['CHROME_SWITCHES'],
+      :firefox_prefs => ENV['FIREFOX_PREFS']}
 
     selenium_remote_opts = {:platform => ENV['PLATFORM'],
       :browser_name => ENV['REMOTE_BROWSER'],
@@ -41,6 +45,7 @@ class CapybaraSetup
     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
 
@@ -49,6 +54,8 @@ class CapybaraSetup
       @driver = register_celerity_driver(capybara_opts)
     when :mechanize then
       @driver = register_mechanize_driver(capybara_opts)
+    when :webkit then
+      @driver = register_webkit_driver(capybara_opts)
     else
       @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end
@@ -77,7 +84,10 @@ class CapybaraSetup
   def register_selenium_driver(opts,remote_opts,custom_opts)
     Capybara.register_driver :selenium do |app|
 
-      opts[:profile] = create_profile(opts[:profile]) if(opts[:profile])
+      if opts[:firefox_prefs] || opts[:profile]
+        opts[:profile] = create_profile(opts[:profile], opts[:firefox_prefs])
+      end
+
       opts[:switches] = [opts.delete(:chrome_switches)] if(opts[:chrome_switches])
 
       if opts[:browser] == :remote
@@ -93,7 +103,8 @@ class CapybaraSetup
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
       end
-      clean_opts(opts, :proxy, :proxy_on)
+
+      clean_opts(opts, :proxy, :proxy_on, :firefox_prefs)
       Capybara::Selenium::Driver.new(app,opts)
     end   
     :selenium
@@ -108,8 +119,12 @@ 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)
-    if(profile_name == 'BBC_INTERNAL')
+  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')
       profile = Selenium::WebDriver::Firefox::Profile.new
       profile["network.proxy.type"] = 1
       profile["network.proxy.no_proxies_on"] = "*.sandbox.dev.bbc.co.uk"
@@ -118,14 +133,17 @@ class CapybaraSetup
       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
 
@@ -147,6 +165,13 @@ class CapybaraSetup
     :mechanize
   end
 
+  def register_webkit_driver(opts)
+    Capybara.register_driver :webkit do |app|
+      Capybara::Driver::Webkit.new(app)
+    end
+    :webkit
+  end
+
   def clean_opts(opts, *args)
     args.each do |arg|
       opts.delete arg

data/lib/frameworks/cucumber.rb

@@ -2,7 +2,8 @@ require 'frameworks/capybara'
 require 'w3c_validators'
 require 'monkey-patches/cucumber-patches'
 
-if(ENV['XVFB']=='true')
+#This is hackish but means we only run once in cucumber and not every scenario
+if(ENV['XVFB']=='true' || ENV['BROWSER'] == 'webkit') 
   puts "You have chosen to use XVFB - ensure you have yum installed Xvfb Xorg and firefox"
   require 'headless'
   headless = Headless.new
@@ -18,24 +19,37 @@ module Frameworks
     #Generate base urls to use in Cucumber step defs
     def generate_base_urls 
       environment = ENV['ENVIRONMENT'].downcase #be defensive
-      set_scheme
+
+      prepare_host
+
       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.co.uk"
+        @m_base_url = @mdot_prefix + "sandbox.dev.bbc.co.uk"
       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
-      elsif (environment.split('.')[0].include? 'pal') #address specific box
-        @base_url = "#{scheme}://#{ENV['ENVIRONMENT']}" 
+        @mobile_base_url = @mobiledot_prefix.chop + @bbc_domain
+        @m_base_url = @mdot_prefix.chop + @bbc_domain
       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_host = proxy.scan(/http:\/\/(.*):80/).to_s if proxy
+      @proxy_host = proxy.scan(/http:\/\/(.*):80/)[0][0] if proxy
     end
 
     def validate_online(src)
@@ -44,28 +58,34 @@ module Frameworks
 
       @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
+        if results.errors.length > 0
+          results.errors.each do |err|
+            puts err.to_s
+          end
+          raise "W3C Validation of " + current_url + " failed."
         end
-        raise "W3C Validation of " + current_url + " failed."
+
+      rescue Net::HTTPFatalError => e
+        puts "WARNING - OUTGOING NETWORK ERROR FROM FORGE TO W3C - Validation Not Performed"
       end
     end
 
-
-    def set_scheme  
+    def prepare_host
       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 = '.bbc.co.uk'
       @bbci_domain = '.bbci.co.uk'
       @sandbox = "#{scheme}://pal.sandbox.dev"
+      @mobiledot_prefix = "#{scheme}://mobile."
+      @mdot_prefix = "#{scheme}://m."
+      @sslsandbox = "https://ssl.sandbox.dev"
       @static_sandbox = "#{scheme}://static.sandbox.dev"
     end
 
@@ -82,14 +102,27 @@ Before do
   #it was either this or a monkey patch - need to think about pushing a softer reset change to capybara-mechanize to override this
   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']
+
+    if ENV['FW_CERT_LOCATION']
+      page.driver.browser.agent.cert, page.driver.browser.agent.key = 
+        ENV['FW_CERT_LOCATION'],
+        ENV['FW_CERT_LOCATION'] 
+    end
+
     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
 
+  #TODO: See if this can be set at the driver level rather than in before do - and only want to start headless once
+  if page.driver.class == Capybara::Driver::Webkit
+    page.driver.browser.set_proxy(:host => http_proxy.scan(/http:\/\/(.*):80/).to_s,:port => '80') if http_proxy
+  end
+  
+
   generate_base_urls
 end
 

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

@@ -61,6 +61,12 @@ 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)
     c = Mechanize::Cookie.new(attribs[:name],attribs[:value])

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

@@ -43,6 +43,10 @@ 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
@@ -78,6 +82,8 @@ module Capybara
       driver.add_cookie(attribs)
     end
 
+    def delete_cookies_in_domain(domain)
+      driver.delete_cookies_in_domain(domain)
+    end
   end
-
 end

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

@@ -57,3 +57,111 @@ end
 end
 =end
 
+# This patch prevents Mechanize from raising a Mechanize::ResponseCodeError
+# when the HTTP Response Code is 503 or 404. This lets capybara continue the journey.
+class Mechanize::HTTP::Agent
+  def fetch uri, method = :get, headers = {}, params = [],
+            referer = current_page, redirects = 0
+    referer_uri = referer ? referer.uri : nil
+
+    uri = resolve uri, referer
+
+    uri, params = resolve_parameters uri, method, params
+
+    request = http_request uri, method, params
+
+    connection = connection_for uri
+
+    request_auth             request, uri
+
+    disable_keep_alive       request
+    enable_gzip              request
+
+    request_language_charset request
+    request_cookies          request, uri
+    request_host             request, uri
+    request_referer          request, uri, referer_uri
+    request_user_agent       request
+    request_add_headers      request, headers
+
+    pre_connect              request
+
+    # Consult robots.txt
+    if robots && uri.is_a?(URI::HTTP)
+      robots_allowed?(uri) or raise Mechanize::RobotsDisallowedError.new(uri)
+    end
+
+    # Add If-Modified-Since if page is in history
+    page = visited_page(uri)
+
+    if (page = visited_page(uri)) and page.response['Last-Modified']
+      request['If-Modified-Since'] = page.response['Last-Modified']
+    end if(@conditional_requests)
+
+    # Specify timeouts if given
+    connection.open_timeout = @open_timeout if @open_timeout
+    connection.read_timeout = @read_timeout if @read_timeout
+
+    request_log request
+
+    response_body_io = nil
+
+    # Send the request
+    begin
+      response = connection.request(uri, request) { |res|
+        response_log res
+
+        response_body_io = response_read res, request, uri
+
+        res
+      }
+    rescue Mechanize::ChunkedTerminationError => e
+      raise unless @ignore_bad_chunking
+
+      response = e.response
+      response_body_io = e.body_io
+    end
+
+    hook_content_encoding response, uri, response_body_io
+
+    response_body_io = response_content_encoding response, response_body_io if
+      request.response_body_permitted?
+
+    post_connect uri, response, response_body_io
+
+    page = response_parse response, response_body_io, uri
+
+    response_cookies response, uri, page
+
+    meta = response_follow_meta_refresh response, uri, page, redirects
+
+    return meta if meta
+
+    case response
+    when Net::HTTPSuccess
+      if robots && page.is_a?(Mechanize::Page)
+        page.parser.noindex? and raise Mechanize::RobotsDisallowedError.new(uri)
+      end
+
+      page
+    when Mechanize::FileResponse
+      page
+    when Net::HTTPNotModified
+      log.debug("Got cached page") if log
+      visited_page(uri) || page
+    when Net::HTTPRedirection
+      response_redirect response, method, page, redirects, headers, referer
+    when Net::HTTPUnauthorized
+      response_authenticate(response, page, uri, request, headers, params,
+                            referer)
+    else
+      # BEGIN PATCH
+      if page.code == "503" or page.code == "404"
+        page
+      else
+        raise Mechanize::ResponseCodeError.new(page, 'unhandled response')
+      end
+      # END PATCH
+    end
+  end
+end

data/lib/monkey-patches/net-http-persistent-patches.rb

@@ -0,0 +1,72 @@
+#Adding no_proxy_host logic for Mechanize2 which uses this
+#gem for it's HTTP client logic
+#TODO: Grab from envirnment variable optionally, or provide list
+class Net::HTTP::Persistent
+
+  ##
+  # Creates a new connection for +uri+
+  def connection_for uri
+    Thread.current[@generation_key]     ||= Hash.new { |h,k| h[k] = {} }
+    Thread.current[@ssl_generation_key] ||= Hash.new { |h,k| h[k] = {} }
+    Thread.current[@request_key]        ||= Hash.new 0
+    Thread.current[@timeout_key]        ||= Hash.new EPOCH
+
+    use_ssl = uri.scheme.downcase == 'https'
+
+    if use_ssl then
+      ssl_generation = @ssl_generation
+
+      ssl_cleanup ssl_generation
+
+      connections = Thread.current[@ssl_generation_key][ssl_generation]
+    else
+      generation = @generation
+
+      cleanup generation
+
+      connections = Thread.current[@generation_key][generation]
+    end
+
+    net_http_args = [uri.host, uri.port]
+    connection_id = net_http_args.join ':'
+    #
+    #Frameworks patch (and condition)
+    if @proxy_uri and !uri.host.include? 'sandbox' then
+      connection_id << @proxy_connection_id
+      net_http_args.concat @proxy_args
+    end
+
+    connection = connections[connection_id]
+
+    unless connection = connections[connection_id] then
+      connections[connection_id] = http_class.new(*net_http_args)
+      connection = connections[connection_id]
+      ssl connection if use_ssl
+    else
+      reset connection if expired? connection
+    end
+
+    unless connection.started? then
+      connection.set_debug_output @debug_output if @debug_output
+      connection.open_timeout = @open_timeout if @open_timeout
+      connection.read_timeout = @read_timeout if @read_timeout
+
+      connection.start
+
+      socket = connection.instance_variable_get :@socket
+
+      if socket then # for fakeweb
+        @socket_options.each do |option|
+          socket.io.setsockopt(*option)
+        end
+      end
+    end
+
+    connection
+  rescue Errno::ECONNREFUSED
+    raise Error, "connection refused: #{connection.address}:#{connection.port}"
+  rescue Errno::EHOSTDOWN
+    raise Error, "host down: #{connection.address}:#{connection.port}"
+  end
+end
+

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

@@ -7,7 +7,6 @@ module Selenium
   module WebDriver
     module Remote
       class Capabilities
-
         def custom_capabilities(opts)
           @custom_capabilities = opts
         end
@@ -15,7 +14,6 @@ module Selenium
         #hopefuly this alias approach will mean we capture changes in the webdriver method
         alias_method :old_as_json, :as_json
         def as_json(opts = nil)
-
           hash = old_as_json
           if @custom_capabilities 
             @custom_capabilities.each do |key, value|
@@ -24,9 +22,40 @@ module Selenium
           end
           hash
         end
+      end
+    end
 
+    class Options
+      def delete_cookies_in_domain(domain)
+        delete_all_cookies #proxy to this method as WebDriver only deletes
+        #by domain
       end
     end
   end
 end
 
+#Workaround for http://code.google.com/p/selenium/issues/detail?id=4007
+module Selenium
+  module WebDriver
+    module Remote
+      module Http
+        class Default
+          def new_http_client
+            if @proxy
+              unless @proxy.respond_to?(:http) && url = @proxy.http
+                raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}"
+              end
+
+              proxy = URI.parse(url)
+
+              clazz = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password)
+              clazz.new(server_url.host, server_url.port)
+            else
+              Net::HTTP.new server_url.host, server_url.port
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/version.rb

@@ -1,4 +1,3 @@
 module FrameworksCapybara
-  VERSION = '0.3.0.rc1'
+  VERSION = '0.3.0.rc2'
 end
-

data/spec/frameworks_capybara_spec.rb

@@ -18,7 +18,6 @@ shared_examples_for "Selenium Driver Options Array" do
   it "should contain no nil values for unset options" do
     #TODO: Test for nil elements in options - there shouldn't be any that we insert
     #i.e. anything in our ENV options should not end up being nil in Selenium
-
     Capybara.current_session.driver.options[:environment].should == nil
     Capybara.current_session.driver.options[:proxy].should == nil
     Capybara.current_session.driver.options[:proxy_on].should == nil
@@ -27,6 +26,7 @@ shared_examples_for "Selenium Driver Options Array" do
     Capybara.current_session.driver.options[:version].should == nil
     Capybara.current_session.driver.options[:job_name].should == nil
     Capybara.current_session.driver.options[:chrome_switches].should == nil
+    Capybara.current_session.driver.options[:firefox_prefs].should == nil
     Capybara.current_session.driver.options[:max_duration].should == nil
     Capybara.current_session.driver.options[:profile].should_not be_a_kind_of String
     Capybara.current_session.driver.options[:browser].should_not be_a_kind_of String
@@ -136,24 +136,6 @@ describe CapybaraSetup do
         it_behaves_like "Selenium Driver Options Array"
       end
 
-
-      context "with Selenium driver and programtically created profile with referer disabled" do
-        before do
-          ENV['BROWSER'] = 'firefox'
-          ENV['FIREFOX_PROFILE'] = 'DISABLED_REFERER'
-        end
-
-        it "should be initialized correctly" do 
-          Capybara.delete_session
-          CapybaraSetup.new.driver.should == :selenium
-          Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
-          Capybara.current_session.driver.options[:browser].should == :firefox
-          Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.http.sendRefererHeader'].should == 0
-        end
-        it_behaves_like "Selenium Driver Options Array"
-      end
-
       context "with Selenium driver and custom chrome options" do
         before do
           ENV['BROWSER'] = 'chrome'
@@ -275,6 +257,62 @@ describe CapybaraSetup do
         it_behaves_like "Selenium Driver Options Array"
       end
 
+      context "with Selenium driver and hardcoded bbc internal profile and additional firefox preferences" do
+        before do
+          ENV['BROWSER'] = 'firefox'
+          ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
+          ENV['FIREFOX_PROFILE'] = 'BBC_INTERNAL'
+          ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
+        end
+
+        it "should be initialized correctly" do 
+          Capybara.delete_session
+          CapybaraSetup.new.driver.should == :selenium
+          Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
+          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+
+
+      context "with Selenium driver and additional firefox preferences" do
+        before do
+          ENV['BROWSER'] = 'firefox'
+          ENV['FIREFOX_PROFILE'] = 'default'
+          ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
+        end
+
+        it "should be initialized correctly" do 
+          Capybara.delete_session
+          CapybaraSetup.new.driver.should == :selenium
+          Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
+          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+
+
+      context "with Selenium driver and new profile and custom prefs" do
+        before do
+          ENV['BROWSER'] = 'firefox'
+          ENV['FIREFOX_PREFS'] = '{"javascript.enabled":false}'
+        end
+
+        it "should be initialized correctly" do 
+          Capybara.delete_session
+          CapybaraSetup.new.driver.should == :selenium
+          Capybara.current_session.driver.should be_a_kind_of Capybara::Selenium::Driver
+          Capybara.current_session.driver.options[:browser].should == :firefox
+          Capybara.current_session.driver.options[:profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['javascript.enabled'].should == false
+        end
+        it_behaves_like "Selenium Driver Options Array"
+      end
+
       context "with Remote Selenium driver and specified Chrome Switches" do
         before do
           ENV['BROWSER'] = 'remote'
@@ -411,6 +449,22 @@ describe CapybaraSetup do
         end
 
       end
+
+
+      describe "should allow Webkit driver to be created" do
+        context "with minimal Webkit driver" do
+          before do
+            ENV['BROWSER'] = 'webkit'
+          end
+
+          it "should be initialized correctly" do 
+            Capybara.delete_session
+            CapybaraSetup.new.driver.should == :webkit
+            Capybara.current_session.driver.should be_a_kind_of Capybara::Driver::Webkit
+          end
+        end
+      end
+
     end
   end
 end

data/spec/frameworks_cucumber_spec.rb

@@ -14,39 +14,54 @@ describe Frameworks::EnvHelper do
       ENV['ENVIRONMENT'] = 'sandbox'
       generate_base_urls
       @base_url.should == 'http://pal.sandbox.dev.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.sandbox.dev.bbc.co.uk'
       @static_base_url.should == 'http://static.sandbox.dev.bbc.co.uk'
+      @m_base_url.should == 'http://m.sandbox.dev.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.sandbox.dev.bbc.co.uk'
     end
 
     it "should be able to set a base url" do
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
       @base_url.should == 'http://www.foo.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
       @static_base_url.should == 'http://static.foo.bbci.co.uk'
       @open_base_url.should == 'http://open.foo.bbc.co.uk'
+      @m_base_url.should == 'http://m.foo.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
     end
 
     it "should set correct static base for www.live.bbc.co.uk" do
       ENV['ENVIRONMENT'] = 'live'
       generate_base_urls
       @base_url.should == 'http://www.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
       @static_base_url.should == 'http://static.bbci.co.uk'
       @open_base_url.should == 'http://open.live.bbc.co.uk'
+      @m_base_url.should == 'http://m.live.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
     end
 
     it "should be able to set a base url and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'fOo'
       generate_base_urls
       @base_url.should == 'http://www.foo.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
       @static_base_url.should == 'http://static.foo.bbci.co.uk'
       @open_base_url.should == 'http://open.foo.bbc.co.uk'
+      @m_base_url.should == 'http://m.foo.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.foo.bbc.co.uk'
     end
 
     it "should set correct static base for www.live.bbc.co.uk and not be case sensitive" do
       ENV['ENVIRONMENT'] = 'LiVe'
       generate_base_urls
       @base_url.should == 'http://www.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
       @static_base_url.should == 'http://static.bbci.co.uk'
       @open_base_url.should == 'http://open.live.bbc.co.uk'
+      @m_base_url.should == 'http://m.live.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
     end
 
 
@@ -55,15 +70,46 @@ describe Frameworks::EnvHelper do
       ENV['WWW_LIVE'] = 'false' 
       generate_base_urls
       @base_url.should == 'http://www.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
       @static_base_url.should == 'http://static.bbci.co.uk'
       @open_base_url.should == 'http://open.bbc.co.uk'
+      @m_base_url.should == 'http://m.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
     end
 
+    it "should be able to set pal url and not be case sensitive" do
+      ENV['ENVIRONMENT'] = 'Live'
+      generate_base_urls
+      @base_url.should == 'http://www.live.bbc.co.uk'
+      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.live.bbc.co.uk'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.live.bbc.co.uk'
+      @m_base_url.should == 'http://m.live.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.live.bbc.co.uk'
+    end
+
+    it "pal url should still have environment even if asking for classic live url" do
+      ENV['ENVIRONMENT'] = 'Live'
+      ENV['WWW_LIVE'] = 'false' 
+      generate_base_urls
+      @base_url.should == 'http://www.bbc.co.uk'
+      @pal_base_url.should == 'http://pal.live.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.bbc.co.uk'
+      @static_base_url.should == 'http://static.bbci.co.uk'
+      @open_base_url.should == 'http://open.bbc.co.uk'
+      @m_base_url.should == 'http://m.bbc.co.uk'
+      @mobile_base_url.should == 'http://mobile.bbc.co.uk'
+    end
+
+
+
     it "should be able to set scheme to ssl" do
       ENV['SCHEME'] = 'https'
       ENV['ENVIRONMENT'] = 'foo'
       generate_base_urls
       @base_url.should == 'https://www.foo.bbc.co.uk'
+      @ssl_base_url.should == 'https://ssl.foo.bbc.co.uk'
       @static_base_url.should == 'https://static.foo.bbci.co.uk'
       @open_base_url.should == 'https://open.foo.bbc.co.uk'
     end

data/spec/mock.default/prefs.js

@@ -0,0 +1,10 @@
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the application is running,
+ * the changes will be overwritten when the application exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
+ */

data/spec/profiles.ini

@@ -0,0 +1,8 @@
+[General]
+StartWithLastProfile=1
+
+[Profile0]
+Name=default
+IsRelative=1
+Path=mock.default
+Default=1

data/spec/spec_helper.rb

@@ -13,3 +13,4 @@ Cucumber::RbSupport::RbLanguage.new(Cucumber::Runtime.new) #Need to load Cucumbe
 
 require 'frameworks/capybara'
 require 'frameworks/cucumber'
+require 'unit_test_monkeypatches.rb'

data/spec/unit_test_monkeypatches.rb

@@ -0,0 +1,17 @@
+module Selenium
+  module WebDriver
+    module Firefox
+
+      # @api private
+      module Util
+        module_function
+
+        def app_data_path
+           File.dirname(__FILE__)
+        end
+
+      end # Util
+    end # Firefox
+  end # WebDriver
+end # Selenium
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 15424039
+  hash: 15424033
   prerelease: 6
   segments: 
   - 0
   - 3
   - 0
   - rc
-  - 1
-  version: 0.3.0.rc1
+  - 2
+  version: 0.3.0.rc2
 platform: ruby
 authors: 
 - matt robbins
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 +01:00
+date: 2012-07-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: capybara-celerity
+  name: capybara-webkit
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -77,12 +77,54 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: w3c_validators
+  name: json
   version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: headless
+  version_requirements: *id005
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: capybara-celerity
+  version_requirements: *id006
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: w3c_validators
+  version_requirements: *id007
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,11 +136,11 @@ dependencies:
         - 5
         version: 0.10.5
   name: cucumber
-  version_requirements: *id005
+  version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,11 +150,11 @@ dependencies:
         - 0
         version: "0"
   name: rake
-  version_requirements: *id006
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,7 +166,7 @@ dependencies:
         - 0
         version: 1.0.0
   name: rspec
-  version_requirements: *id007
+  version_requirements: *id010
   prerelease: false
 description: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches
 email: 
@@ -139,6 +181,7 @@ files:
 - .document
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -152,13 +195,17 @@ files:
 - lib/monkey-patches/capybara-patches.rb
 - lib/monkey-patches/cucumber-patches.rb
 - lib/monkey-patches/mechanize-patches.rb
+- lib/monkey-patches/net-http-persistent-patches.rb
 - lib/monkey-patches/send-keys.rb
 - lib/monkey-patches/webdriver-patches.rb
 - lib/tasks/frameworks-tasks.rb
 - lib/version.rb
 - spec/frameworks_capybara_spec.rb
 - spec/frameworks_cucumber_spec.rb
+- spec/mock.default/prefs.js
+- spec/profiles.ini
 - spec/spec_helper.rb
+- spec/unit_test_monkeypatches.rb
 has_rdoc: true
 homepage: 
 licenses: []