frameworks-capybara 0.0.32 → 0.0.33

data/README.rdoc

@@ -15,9 +15,7 @@ Below are the current drivers that can be registered:
 
 * Celerity: This can be used to drive 'headless' tests.  Celerity is a ruby wrapper for HTMLUnit and as such provides support for Javascript, though this is commonly quite fragile.
 
-To be added in the near future:
-
-* Mechanize-Caybara: There is a Caybara driver for mechanize which has recently surfaced on Github.  Many people still enjoy using Mechanize as despite its lack of support for Javascrit, it offers a much faster 'headless' option over Celerity.  Once we have tested this driver and checked its robustness we will add an option to use it via this gem.
+* Mechanize-Caybara: This can be used, by setting BROWSER=mechanize
 
 How to use this gem in your project:
 
@@ -37,6 +35,7 @@ The following environment variables can be set to configure your tests:
   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)
   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)
 
 Here is a sample cucumber.yml:
 

data/VERSION

@@ -1 +1 @@
-0.0.32
+0.0.33

data/frameworks-capybara.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frameworks-capybara}
-  s.version = "0.0.32"
+  s.version = "0.0.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcrmfc"]
-  s.date = %q{2011-07-21}
+  s.date = %q{2011-08-16}
   s.description = %q{gem to aid setup of Capybara for testing bbc sites}
   s.email = %q{mcrobbins@gmail.com}
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/monkey-patches/capybara-mechanize-patches.rb",
     "lib/monkey-patches/capybara-patches.rb",
     "lib/monkey-patches/cucumber-patches.rb",
+    "lib/monkey-patches/mechanize-patches.rb",
     "lib/monkey-patches/send-keys.rb",
     "lib/monkey-patches/webdriver-patches.rb",
     "test/helper.rb",

data/lib/frameworks/capybara.rb

@@ -2,6 +2,7 @@ require 'capybara/cucumber'
 require 'monkey-patches/webdriver-patches'
 require 'monkey-patches/capybara-patches'
 require 'monkey-patches/capybara-mechanize-patches'
+require 'monkey-patches/mechanize-patches'
 require 'monkey-patches/send-keys'
 require 'selenium-webdriver'
 require 'capybara/mechanize/cucumber' 
@@ -16,7 +17,7 @@ class CapybaraSetup
 
   def initialize
 
-    capybara_opts = {:environment => ENV['ENVIRONMENT'], :proxy => ENV['PROXY_URL'], :remote_browser_proxy_url => ENV['REMOTE_BROWSER_PROXY_URL'], :platform => ENV['PLATFORM'], :browser_name => ENV['REMOTE_BROWSER'], :version => ENV['REMOTE_BROWSER_VERSION'], :url => ENV['REMOTE_URL'], :profile => ENV['FIREFOX_PROFILE'], :browser => ENV['BROWSER'], :javascript_enabled => ENV['CELERITY_JS_ENABLED'], :job_name => ENV['SAUCE_JOB_NAME'], :max_duration => ENV['SAUCE_MAX_DURATION']}
+    capybara_opts = {:environment => ENV['ENVIRONMENT'], :proxy => ENV['PROXY_URL'], :remote_browser_proxy_url => ENV['REMOTE_BROWSER_PROXY_URL'], :platform => ENV['PLATFORM'], :browser_name => ENV['REMOTE_BROWSER'], :version => ENV['REMOTE_BROWSER_VERSION'], :url => ENV['REMOTE_URL'], :profile => ENV['FIREFOX_PROFILE'], :browser => ENV['BROWSER'], :javascript_enabled => ENV['CELERITY_JS_ENABLED'], :job_name => ENV['SAUCE_JOB_NAME'], :max_duration => ENV['SAUCE_MAX_DURATION'], :proxy_on => ENV['PROXY_ON']}
 
     validate_env_vars(capybara_opts) #validate environment variables set using cucumber.yml or passed via command line
 
@@ -82,11 +83,11 @@ class CapybaraSetup
       if opts[:browser] == :remote
         client = Selenium::WebDriver::Remote::Http::Default.new
 
-        #set proxy on client connection if required
-        if opts[:proxy]
+        #set proxy on client connection if required, note you may use ENV['PROXY_URL'] for setting in browser (ff profile) but not for client conection, hence allow for PROXY_ON=false
+        if opts[:proxy] && opts[:proxy_on] != 'false'
           client.proxy = Selenium::WebDriver::Proxy.new(:http => opts[:proxy])
-          opts.delete :proxy
         end
+        opts.delete_if {|k,v| [:proxy, :proxy_on].include? k} 
 
         #TODO: temp workaround - needs refactoring
         cap_opts = opts.clone
@@ -100,7 +101,7 @@ class CapybaraSetup
         opts[:desired_capabilities] = caps
         opts[:http_client] = client
       else
-        opts.delete_if {|k,v| [:proxy].include? k} #may want to pass env variables that are not relevant for in browser 'non-remote' tests e.g. proxy, so delete these before setting up driver
+        opts.delete_if {|k,v| [:proxy, :proxy_on].include? k} #may want to pass env variables that are not relevant for in browser 'non-remote' tests e.g. proxy, so delete these before setting up driver
       end
       Capybara::Driver::Selenium.new(app,opts)
     end   

data/lib/frameworks/cucumber.rb

@@ -2,7 +2,7 @@ require 'frameworks/capybara'
 require 'monkey-patches/cucumber-patches'
 
 if(ENV['XVFB']=='true')
-  puts "You have chosed to use XVFB - ensure you have yum installed Xvfb Xorg and firefox"
+  puts "You have chosen to use XVFB - ensure you have yum installed Xvfb Xorg and firefox"
   require 'headless'
   headless = Headless.new
   headless.start
@@ -14,13 +14,15 @@ end
 module Frameworks
   module EnvHelper
 
-    WWW_PREFIX = 'http://www.'
-    STATIC_PREFIX = 'http://static.'
-    OPEN_PREFIX = 'http://open.'
+    ENV['SCHEME']=='https' ? scheme = 'https' : scheme = 'http'
+
+    WWW_PREFIX = "#{scheme}://www."
+    STATIC_PREFIX = "#{scheme}://static."
+    OPEN_PREFIX = "#{scheme}://open."
     BBC_DOMAIN = '.bbc.co.uk'
     STATIC_BBC_DOMAIN = '.bbc.co.uk'
-    SANDBOX = 'http://pal.sandbox.dev'
-    STATIC_SANDBOX = 'http://static.sandbox.dev'
+    SANDBOX = "#{scheme}://pal.sandbox.dev"
+    STATIC_SANDBOX = "#{scheme}://static.sandbox.dev"
 
     #Generate base urls to use in Cucumber step defs
     def generate_base_urls 
@@ -32,7 +34,7 @@ module Frameworks
         @static_base_url = STATIC_PREFIX + BBC_DOMAIN
         @open_base_url = OPEN_PREFIX + BBC_DOMAIN
       elsif (ENV['ENVIRONMENT'].split('.')[0].include? 'pal') #address specific box
-        @base_url = "http://#{ENV['ENVIRONMENT']}" 
+        @base_url = "#{scheme}://#{ENV['ENVIRONMENT']}" 
       else
         @base_url = WWW_PREFIX + ENV['ENVIRONMENT'] + BBC_DOMAIN
         @static_base_url = STATIC_PREFIX + ENV['ENVIRONMENT'] + BBC_DOMAIN

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

@@ -1,12 +1,16 @@
 require 'capybara/mechanize/cucumber' 
+require 'uri'
 
 class Capybara::Driver::Mechanize
   def process_remote_request(method, url, *options)
     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 && @prev_url) #patch
+        if(method == :post && url == "" && @prev_url) #patch
           #require 'uri'
           #url = "http://#{URI.parse(@prev_url).host}#{URI.parse(@prev_url).path}"
           #p url
@@ -14,7 +18,8 @@ class Capybara::Driver::Mechanize
         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 = "http://#{url}" unless url.include?("http")
+          url = "#{@scheme}://#{url}" unless url.match(/^http.*/)
         end
       else
         @last_remote_host = "#{remote_uri.host}:#{remote_uri.port}"

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

@@ -0,0 +1,6 @@
+require 'mechanize'
+class Mechanize
+  def set_ssl_client_certification(clientcert, clientkey, cacert)
+    @cert, @key, @ca_file = clientcert, clientkey, cacert
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: 
   segments: 
   - 0
   - 0
-  - 32
-  version: 0.0.32
+  - 33
+  version: 0.0.33
 platform: ruby
 authors: 
 - mcrmfc
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 +01:00
+date: 2011-08-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ files:
 - lib/monkey-patches/capybara-mechanize-patches.rb
 - lib/monkey-patches/capybara-patches.rb
 - lib/monkey-patches/cucumber-patches.rb
+- lib/monkey-patches/mechanize-patches.rb
 - lib/monkey-patches/send-keys.rb
 - lib/monkey-patches/webdriver-patches.rb
 - test/helper.rb