frameworks-capybara 0.0.35 → 0.0.36

data/VERSION

@@ -1 +1 @@
-0.0.35
+0.0.36

data/frameworks-capybara.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frameworks-capybara}
-  s.version = "0.0.35"
+  s.version = "0.0.36"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcrmfc"]

data/lib/frameworks/capybara.rb

@@ -17,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'], :proxy_on => ENV['PROXY_ON'], :cert_location => ENV['CERT_LOCATION']}
+    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'], :cert_location => ENV['CERT_LOCATION'], :ca_cert_location => ENV['CA_CERT_LOCATION']}
 
     validate_env_vars(capybara_opts) #validate environment variables set using cucumber.yml or passed via command line
 
@@ -40,12 +40,9 @@ class CapybaraSetup
 
     Capybara.default_driver = @driver
 
-    if capybara_opts[:browser] == :mechanize and capybara_opts[:proxy]
-      Capybara.current_session.driver.agent.set_proxy(@proxy_host, 80)
-    end
-  
-    if capybara_opts[:browser] == :mechanize and capybara_opts[:cert_location]
-      Capybara.current_session.driver.agent.set_ssl_client_certification(ENV['CERT_LOCATION'], ENV['CERT_LOCATION'])
+    if capybara_opts[:browser] == :mechanize
+      Capybara.current_session.driver.agent.set_proxy(@proxy_host, 80) if capybara_opts[:proxy]
+      Capybara.current_session.driver.agent.set_ssl_client_certification(capybara_opts[:cert_location], capybara_opts[:cert_location], capybara_opts[:ca_cert_location]) if capybara_opts[:cert_location]
     end
   end
 

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

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 87
   prerelease: 
   segments: 
   - 0
   - 0
-  - 35
-  version: 0.0.35
+  - 36
+  version: 0.0.36
 platform: ruby
 authors: 
 - mcrmfc