frameworks-capybara 1.1.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTA2NDkzZDc2NDc1ZmJiMmI0MGY2ODJiMGNmODA0NjI0Y2ZhYWQxYQ==
+  data.tar.gz: !binary |-
+    YTY4OGNkMjA2OGVhNjNiMmJjYjY0M2E5YTYwNGYwMzkwMzUyOGY2Mw==
+SHA512:
+  metadata.gz: !binary |-
+    ZjdmMjFmMGNkZjBlMDQwYjI3OTY2ZWQ4M2NiNWMzNmJmODE4ZTQ4MjhhZDU1
+    NTllNTAxMzZiNWY2NWRhYjFhZmQyZjQ0NTcxNmIxZWY3NDNiMzVhNWM2NWU2
+    M2NlODZhNWYzYjI2MTMzNGY2MWUwMTA5MTg5ZTY2NTUwNGYwZGM=
+  data.tar.gz: !binary |-
+    NWRhYmZlN2VhMDg4YWM0NTc3MTViNGEzMjY5ODA3YTEwMzMxMTkxOTkwOGY2
+    NzdlZTQzYjIwMzNjN2I5ZmNmMWI3MGU4NDQ0NDBhYWY1MzgzZDY3MTMyYWRh
+    ZmRkMWFjNTg1ZTgxNDI2YmZhNmViYzI2MWJkZDIxMzhjZGRiN2U=

data/CHANGES

@@ -1,3 +1,9 @@
+2.0.0
+Upgraded to Capybara 2.0+ and the latest versions of remaining gems.
+Removed monkey patches, reclassifying some as "extensions".
+Disabled the setting of SauceLabs custom capabilities.
+Dropped celerity driver support.
+
 1.1.1
 Handover release, no code changes
 

data/Gemfile

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

data/Gemfile.lock

@@ -1,17 +1,12 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (1.1.1)
-      capybara (~> 1.1.2)
-      capybara-celerity
-      capybara-mechanize (>= 0.3.0, < 1.0.0)
-      cucumber (>= 0.10.5)
-      headless
+    frameworks-capybara (2.0.0)
+      capybara
+      capybara-mechanize
+      cucumber
       json
-      mechanize (= 2.7.2)
-      mime-types
-      nokogiri
-      rubyzip
+      mechanize
       selenium-webdriver
       w3c_validators
 
@@ -19,20 +14,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    capybara (1.1.4)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    capybara-celerity (0.0.1)
-      capybara (>= 0.4.1)
-      celerity (>= 0.7.9)
-    capybara-mechanize (0.3.0)
-      capybara (~> 1.1)
-      mechanize (~> 2.3)
-    celerity (0.9.2)
+      xpath (~> 2.0)
+    capybara-mechanize (1.4.0)
+      capybara (~> 2.4.4)
+      mechanize (~> 2.7.0)
     childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     cucumber (1.3.17)
@@ -42,25 +32,24 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
-    domain_name (0.5.21)
+    domain_name (0.5.22)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.9.5)
+    ffi (1.9.6)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    headless (1.0.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     json (1.8.1)
-    mechanize (2.7.2)
+    mechanize (2.7.3)
       domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0.0)
-      mime-types (~> 1.17, >= 1.17.2)
+      http-cookie (~> 1.0)
+      mime-types (~> 2.0)
       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)
+    mime-types (2.4.3)
     mini_portile (0.6.0)
     multi_json (1.10.1)
     multi_test (0.1.1)
@@ -95,7 +84,7 @@ GEM
       nokogiri
     webrobots (0.1.1)
     websocket (1.2.1)
-    xpath (0.1.4)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -103,7 +92,5 @@ PLATFORMS
 
 DEPENDENCIES
   frameworks-capybara!
-  jruby-openssl
   rake
-  rspec (>= 1.0.0)
-  rspec-mocks (< 2.14.0)
+  rspec

data/README.rdoc

@@ -15,8 +15,6 @@ Below are the current drivers that can be registered:
 
 * Selenium-Webdriver (Selenium2) - REMOTE: This can be used to drive 'in-browser' tests on a remote macine, this could be another macine on your local network which is running a Selenium-Webdriver server or indeed a cloud service such as 'Sauce Labs'
 
-* 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.
-
 * Mechanize-Caybara: This can be used, by setting BROWSER=mechanize
 
 How to use this gem in your project:
@@ -40,7 +38,6 @@ The following environment variables can be set to configure your tests:
   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)"

data/frameworks-capybara.gemspec

@@ -15,23 +15,18 @@ Gem::Specification.new do |s|
   s.files = Dir.glob("{features,lib,bin,config,vendor,.bundle}/**/*") +  %w(Gemfile Gemfile.lock)
 
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.3.6"
+  s.rubygems_version = "2.4.2"
   s.summary = "Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches"
 
   s.files         = `git ls-files`.split("\n")
 
-  s.add_runtime_dependency("mime-types")
-  s.add_runtime_dependency("nokogiri")
-  s.add_runtime_dependency("rubyzip")
   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("capybara")  
+  s.add_runtime_dependency("mechanize")
+  s.add_runtime_dependency("capybara-mechanize")
   s.add_runtime_dependency("json")
-  s.add_runtime_dependency("headless")
-  s.add_runtime_dependency("capybara-celerity")
-  s.add_runtime_dependency("w3c_validators")
-  s.add_runtime_dependency("cucumber", [">= 0.10.5"])
+  s.add_runtime_dependency("cucumber")
+  s.add_runtime_dependency("w3c_validators")  
   s.add_development_dependency("rake")
-  s.add_development_dependency("rspec", [">=1.0.0"])
+  s.add_development_dependency("rspec")
 end

data/lib/{monkey-patches/capybara-mechanize-patches.rb → extensions/capybara-mechanize-extensions.rb}

@@ -1,39 +1,8 @@
 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)
-      uri = resolve_relative_url(url) if uri.host.nil?
-      @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
-
-      @last_request_remote = true
-    end
-  end
-end
 
+# Cookie handling extensions
 class Capybara::Mechanize::Driver
-  #Patch for friendly cookie handling api
+
   def cookies
     cookies = []
 

data/lib/frameworks/capybara.rb

@@ -1,13 +1,9 @@
+require 'capybara'
 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 'monkey-patches/net-http-persistent-patches'
+require 'capybara/mechanize'
+#require 'capybara/mechanize/cucumber' 
 require 'selenium-webdriver'
-require 'capybara/mechanize/cucumber' 
-require 'capybara/celerity'
+require 'extensions/capybara-mechanize-extensions'
 
 class CapybaraSetup
 
@@ -21,7 +17,6 @@ class CapybaraSetup
       :http_proxy => http_proxy,
       :profile => ENV['FIREFOX_PROFILE'],
       :browser => ENV['BROWSER'],
-      :javascript_enabled => ENV['CELERITY_JS_ENABLED'],
       :webdriver_proxy_on => ENV['PROXY_ON'],
       :url => ENV['REMOTE_URL'],
       :chrome_switches => ENV['CHROME_SWITCHES'],
@@ -52,6 +47,7 @@ class CapybaraSetup
     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.ignore_hidden_elements = false
 
     [capybara_opts, selenium_remote_opts, custom_opts].each do |opts| #delete nil options and environment (which is only used for validation)
 
@@ -59,8 +55,6 @@ class CapybaraSetup
     end
 
     case capybara_opts[:browser] 
-    when :headless then
-      @driver = register_celerity_driver(capybara_opts)
     when :mechanize then
       @driver = register_mechanize_driver(capybara_opts)
     else
@@ -147,7 +141,8 @@ class CapybaraSetup
 
   def add_custom_caps(caps, custom_opts)
     sauce_time_limit = custom_opts.delete(:max_duration).to_i #note nil.to_i == 0 
-    caps.custom_capabilities({:'job-name' => (custom_opts[:job_name] or 'frameworks-unamed-job'), :'max-duration' => ((sauce_time_limit if sauce_time_limit != 0) or 1800)}) 
+    # This no longer works with the latest selenium-webdriver release
+    #caps.custom_capabilities({:'job-name' => (custom_opts[:job_name] or 'frameworks-unamed-job'), :'max-duration' => ((sauce_time_limit if sauce_time_limit != 0) or 1800)}) 
   end
 
   def set_client_proxy(opts)
@@ -184,17 +179,13 @@ class CapybaraSetup
     profile
   end
 
-  def register_celerity_driver(opts)
-    Capybara.register_driver :celerity do |app|
-      opts.delete :browser #delete browser from options as value with  be 'headless'
-      opts[:javascript_enabled] == 'true' ? opts[:javascript_enabled] = true : opts[:javascript_enabled] = false
-      opts[:http_proxy] = "#{@proxy_host}:80" unless opts[:http_proxy].nil?
-      Capybara::Driver::Celerity.new(app,opts)
-    end
-    :celerity
-  end
-
   def register_mechanize_driver(opts)
+    # Mechanize needs a Rack application: create a dummy one
+    app = Proc.new do |env|
+      ['200', {'Content-Type' => 'text/html'}, ['A barebones rack app.']]
+    end
+    Capybara.app = app 
+    Capybara.run_server = false
     Capybara.register_driver :mechanize do |app|
       Capybara.app_host = "http://www.bbc.co.uk"
       Capybara::Mechanize::Driver.new(app)

data/lib/frameworks/cucumber.rb

@@ -1,17 +1,5 @@
 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'
-  headless = Headless.new
-  headless.start
-  at_exit do
-    headless.destroy
-  end
-end
 
 module Frameworks
   module EnvHelper
@@ -143,12 +131,8 @@ end #Frameworks
 #Add module into world to ensure visibility of instance variables within Cucumber
 World(Frameworks::EnvHelper)
 
-#Call generate method in Before hook
 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
-
   generate_base_urls
 end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '1.1.1'
+  VERSION = '2.0.0'
 end

data/spec/frameworks_capybara_spec.rb

@@ -247,8 +247,8 @@ describe CapybaraSetup do
           Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
           Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'frameworks-unamed-job' 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 1800 
+          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'frameworks-unamed-job' 
+          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 1800 
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:version].should == '4' 
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:platform].should == 'windows'
@@ -358,8 +358,8 @@ describe CapybaraSetup do
           Capybara.current_session.driver.options[:http_client].should be_a_kind_of Selenium::WebDriver::Remote::Http::Default 
           Capybara.current_session.driver.options[:http_client].instance_variable_get(:@proxy).should == nil
           Capybara.current_session.driver.options[:desired_capabilities].should be_a_kind_of Selenium::WebDriver::Remote::Capabilities 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'myjobname' 
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 2000 
+          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'job-name'].should == 'myjobname' 
+          #Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@custom_capabilities)[:'max-duration'].should == 2000 
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:browser_name].should == :firefox
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].should be_a_kind_of Selenium::WebDriver::Firefox::Profile
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@model).should include 'default'
@@ -401,53 +401,7 @@ describe CapybaraSetup do
         end
       end
 
-      describe "should allow Celerity driver to be created" do
-
-        context "with minimal Celerity driver" do
-          before do
-            ENV['BROWSER'] = 'headless'
-          end
-
-          it "should be initialized correctly" do
-            Capybara.delete_session
-            CapybaraSetup.new.driver.should == :celerity
-            Capybara.current_session.driver.should be_a_kind_of Capybara::Driver::Celerity
-            Capybara.current_session.driver.options[:javascript_enabled].should == false
-            Capybara.current_session.driver.options[:environment].should == nil
-            Capybara.current_session.driver.options[:browser].should == nil
-          end
-        end
-
-        context "with maximal Celerity driver" do
-          before do
-            ENV['BROWSER'] = 'headless'
-            ENV['CELERITY_JS_ENABLED'] = 'true'
-            ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
-          end
-
-          it "should be initialized correctly" do
-            Capybara.delete_session
-            CapybaraSetup.new.driver.should == :celerity
-            Capybara.current_session.driver.should be_a_kind_of Capybara::Driver::Celerity
-            Capybara.current_session.driver.options[:javascript_enabled].should == true
-            Capybara.current_session.driver.options[:http_proxy].should == 'example.cache.co.uk:80'
-            Capybara.current_session.driver.options[:environment].should == nil
-            Capybara.current_session.driver.options[:browser].should == nil
-          end
-        end
-
-        context "with maximal Celerity driver" do
-          before do
-            ENV['BROWSER'] = 'headless'
-            ENV['CELERITY_JS_ENABLED'] = 'true'
-            ENV['http_proxy'] = 'http://example.cache.co.uk:80'
-          end
-
-          it "should cope with http_proxy and HTTP_PROXY " do
-            Capybara.delete_session
-            Capybara.current_session.driver.options[:http_proxy].should == 'example.cache.co.uk:80'
-          end
-        end
+      describe "should permit certificate files to be incorporated into firefox profiles" do
 
         context "integration tests for update_firefox_profile_with_certificates() method" do
           before do

data/spec/spec_helper.rb

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

data/spec/unit_test_monkeypatches.rb

@@ -1,3 +1,6 @@
+# This patch overrides the normal mechanism for searching for Firefox profiles
+# causing named profiles to be created in the local directory (rather than be referenced)
+# for unit/integration testing purposes
 module Selenium
   module WebDriver
     module Firefox