frameworks-capybara 0.2.6 → 0.2.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.2.6)
+    frameworks-capybara (0.2.8)
       capybara (>= 1.0.0)
       capybara-celerity
       capybara-mechanize (>= 0.3.0)
@@ -13,7 +13,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.8)
-    bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -31,24 +30,21 @@ GEM
     celerity (0.9.2)
     childprocess (0.3.2)
       ffi (~> 1.0.6)
-    cucumber (1.1.9)
+    cucumber (1.2.0)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.10.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.10.0)
       json (>= 1.4.6)
-    jruby-openssl (0.7.6.1)
-      bouncy-castle-java (>= 1.5.0146.1)
-    json (1.7.0)
+    json (1.7.3)
     libwebsocket (0.1.3)
       addressable
-    mechanize (2.4)
+    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)
@@ -57,8 +53,8 @@ GEM
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (~> 0.0, >= 0.0.9)
     mime-types (1.18)
-    multi_json (1.3.4)
-    net-http-digest_auth (1.2)
+    multi_json (1.3.5)
+    net-http-digest_auth (1.2.1)
     net-http-persistent (2.6)
     nokogiri (1.5.2)
     ntlm-http (0.1.1)
@@ -66,14 +62,14 @@ GEM
     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)
+    rspec-mocks (2.10.1)
     rubyzip (0.9.8)
     selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
@@ -81,7 +77,6 @@ GEM
       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)
@@ -93,7 +88,6 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/lib/frameworks/cucumber.rb

@@ -18,7 +18,9 @@ module Frameworks
     #Generate base urls to use in Cucumber step defs
     def generate_base_urls 
       environment = ENV['ENVIRONMENT'].downcase #be defensive
+
       set_scheme
+
       if(environment =='sandbox')
         @base_url = @sandbox + @bbc_domain 
         @ssl_base_url = @sslsandbox + @bbc_domain
@@ -37,6 +39,7 @@ module Frameworks
         @static_base_url = @static_prefix.chop + @bbci_domain if environment == 'live'
         @open_base_url = @open_prefix + environment + @bbc_domain
       end
+
       proxy = ENV['http_proxy'] || ENV['HTTP_PROXY'] 
       @proxy_host = proxy.scan(/http:\/\/(.*):80/)[0][0] if proxy
     end
@@ -88,10 +91,18 @@ 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

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/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,10 +22,14 @@ module Selenium
           end
           hash
         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
 end
-
-

data/lib/version.rb

@@ -1,4 +1,3 @@
 module FrameworksCapybara
-  VERSION = '0.2.6'
+  VERSION = '0.2.8'
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - matt robbins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-15 00:00:00 +01:00
+date: 2012-05-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency