RubyGems - frameworks-capybara - Versions diffs - 0.2.34 → 0.3.0.rc1 - Mend

frameworks-capybara 0.2.34 → 0.3.0.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (24) hide show

data/Gemfile +0 -6
data/Gemfile.lock +50 -60
data/README.rdoc +3 -22
data/frameworks-capybara.gemspec +4 -17
data/lib/frameworks/capybara.rb +13 -63
data/lib/frameworks/cucumber.rb +25 -84
data/lib/monkey-patches/capybara-mechanize-patches.rb +9 -36
data/lib/monkey-patches/capybara-patches.rb +1 -7
data/lib/monkey-patches/cucumber-patches.rb +1 -5
data/lib/monkey-patches/mechanize-patches.rb +2 -123
data/lib/monkey-patches/webdriver-patches.rb +2 -31
data/lib/tasks/frameworks-tasks.rb +1 -1
data/lib/version.rb +2 -1
data/spec/frameworks_capybara_spec.rb +22 -191
data/spec/frameworks_cucumber_spec.rb +3 -160
data/spec/spec_helper.rb +0 -2
metadata +37 -153
data/.travis.yml +0 -8
data/CHANGES +0 -47
data/lib/monkey-patches/net-http-persistent-patches.rb +0 -72
data/spec/capybara_mechanize_patches_spec.rb +0 -124
data/spec/mock.default/prefs.js +0 -10
data/spec/profiles.ini +0 -8
data/spec/unit_test_monkeypatches.rb +0 -17

data/lib/monkey-patches/cucumber-patches.rb CHANGED Viewed

@@ -7,11 +7,7 @@ module Cucumber
         @project_name = ENV['PROJECT_NAME'] || ''
         unless @project_name.empty? then @project_name += ' - ' end
-        if Cucumber::Ast::Feature.method_defined?(:step_count)
-          @step_count = features.step_count # cucumber >=1.3.0
-        else
-          @step_count = get_step_count(features) # cucumber <1.3.0
-        end
+        @step_count = get_step_count(features)
         # <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
         @builder.declare!(

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

@@ -4,9 +4,9 @@ require 'mechanize'
 #we check after response and it may be the last response we need it to clear here.
 class Mechanize::CookieJar
   alias_method :old_add, :add
-  def add(*args)
+  def add(uri, cookie)
     cleanup
-    old_add(*args)
+    old_add(uri, cookie)
   end
 end
 #This patch may still be required, think it is only not needed now because we don't run
@@ -57,124 +57,3 @@ end
 end
 =end
-# This patch prevents Mechanize from raising a Mechanize::ResponseCodeError
-# when the HTTP Response Code is in `allowed_error_codes`.
-# https://github.com/tenderlove/mechanize/pull/248
-class Mechanize::HTTP::Agent
-  attr_accessor :allowed_error_codes
-  alias_method :old_initialize, :initialize
-  def initialize
-    @allowed_error_codes      = []
-    old_initialize
-  end
-  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 @allowed_error_codes.any? {|code| code.to_s == page.code} then
-        if robots && page.is_a?(Mechanize::Page)
-          page.parser.noindex? and raise Mechanize::RobotsDisallowedError.new(uri)
-        end
-        page
-      else
-        raise Mechanize::ResponseCodeError.new(page, 'unhandled response')
-      end
-      # END PATCH
-    end
-  end
-end

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

@@ -7,6 +7,7 @@ module Selenium
   module WebDriver
     module Remote
       class Capabilities
         def custom_capabilities(opts)
           @custom_capabilities = opts
         end
@@ -14,6 +15,7 @@ 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|
@@ -22,40 +24,9 @@ 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/tasks/frameworks-tasks.rb CHANGED Viewed

@@ -24,7 +24,7 @@ class RakeHelpers
       f =  File.open('config/cucumber.yml', 'r')
       linenum = 0
       @profiles = {}
-      f.readlines.each do |line|
+      f.read.each do |line|
         line.scan(/.*?: /) do |match|
           linenum += 1
           puts color(linenum.to_s + '. ', :color => :yellow) + color(match.gsub(':',''), :color => :green)

data/lib/version.rb CHANGED Viewed

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

data/spec/frameworks_capybara_spec.rb CHANGED Viewed

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'securerandom'
 ##
 #Monkey Patch
 #This is required because Capybara has module methods (singletons) which create
@@ -19,6 +18,7 @@ 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,7 +27,6 @@ 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
@@ -117,7 +116,7 @@ describe CapybaraSetup do
         before do
           ENV['BROWSER'] = 'firefox'
           ENV['FIREFOX_PROFILE'] = 'BBC_INTERNAL'
-          ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80/'
+          ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
           ENV['PROXY_ON'] = 'false'
         end
@@ -128,7 +127,7 @@ describe CapybaraSetup do
           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.proxy.type'].should == 1
-          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+          Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk'
           Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == 'example.cache.co.uk'
           Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == 80
           Capybara.current_session.driver.options[:profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == 'example.cache.co.uk'
@@ -137,6 +136,24 @@ 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'
@@ -217,7 +234,7 @@ describe CapybaraSetup do
           Capybara.current_session.driver.options[:browser].should == :remote
           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(:@additional_prefs)['network.proxy.type'].should == 1
-          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk,*.sandbox.bbc.co.uk'
+          Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.no_proxies_on'].should == '*.sandbox.dev.bbc.co.uk'
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http'].should == 'example.cache.co.uk'
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.http_port'].should == 80
           Capybara.current_session.driver.options[:desired_capabilities].instance_variable_get(:@capabilities)[:firefox_profile].instance_variable_get(:@additional_prefs)['network.proxy.ssl'].should == 'example.cache.co.uk'
@@ -258,62 +275,6 @@ 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'
@@ -449,137 +410,7 @@ describe CapybaraSetup do
           end
         end
-        context "integration tests for update_firefox_profile_with_certificates() method" do
-          before do
-            def write_random_data(file_path)
-              file_data = SecureRandom.hex
-              File.open(file_path, "w") { |a_file|
-                a_file.write(file_data)
-              }
-              file_data
-            end
-            def compare_file_data(profile_path, file_name, expected_data)
-              profile_file = profile_path + File::SEPARATOR + file_name
-              actual_data = nil
-              File.open(profile_file, "r") { |a_file|
-                actual_data = a_file.read
-              }
-              expected_data.should == actual_data
-            end
-            ENV['BROWSER'] = 'firefox'
-            ENV['ENVIRONMENT'] = 'test'
-            ENV['HTTP_PROXY'] = 'http://example.cache.co.uk:80'
-            @cert_dir = Dir.mktmpdir
-            @cert8_db = @cert_dir + File::SEPARATOR + 'cert8.db'
-            @key3_db = @cert_dir + File::SEPARATOR + 'key3.db'
-            @secmod_db = @cert_dir + File::SEPARATOR + 'secmod.db'
-          end
-          after do
-            FileUtils.remove_entry @cert_dir
-          end
-          it "should raise an exception if the cert8.db file is missing in the source directory" do
-            profile = Selenium::WebDriver::Firefox::Profile.new
-            key3_data = write_random_data(@key3_db)
-            secmod_data = write_random_data(@secmod_db)
-            an_exception = nil
-            begin
-              CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path)
-              }
-            rescue RuntimeError => e
-              an_exception = e
-            end
-            an_exception.should_not be_nil
-          end
-          it "should raise an exception if the key3.db file is missing in the source directory" do
-            profile = Selenium::WebDriver::Firefox::Profile.new
-            cert8_data = write_random_data(@cert8_db)
-            secmod_data = write_random_data(@secmod_db)
-            an_exception = nil
-            begin
-              CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path)
-              }
-            rescue RuntimeError => e
-              an_exception = e
-            end
-            an_exception.should_not be_nil
-          end
-          it "should raise an exception if the secmod.db file is missing in the source directory" do
-            profile = Selenium::WebDriver::Firefox::Profile.new
-            cert8_data = write_random_data(@cert8_db)
-            key3_data = write_random_data(@key3_db)
-            an_exception = nil
-            begin
-              CapybaraSetup.new.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-                update_firefox_profile_with_certificates(profile, certificate_path)
-              }
-            rescue RuntimeError => e
-              an_exception = e
-            end
-            an_exception.should_not be_nil
-          end
-          it "should update a firefox profile with valid references to certificate db files" do
-            profile = Selenium::WebDriver::Firefox::Profile.new
-            cert8_data = write_random_data(@cert8_db)
-            key3_data = write_random_data(@key3_db)
-            secmod_data = write_random_data(@secmod_db)
-            setup = CapybaraSetup.new
-            result = setup.instance_exec(profile, @cert_dir) { |profile, certificate_path|
-              update_firefox_profile_with_certificates(profile, certificate_path)
-            }
-            profile_path = result.layout_on_disk
-            compare_file_data(profile_path, 'cert8.db', cert8_data)
-            compare_file_data(profile_path, 'key3.db', key3_data)
-            compare_file_data(profile_path, 'secmod.db', secmod_data)
-          end
-          it "should update a firefox profile with references to certificate db files with prefixes" do
-            profile = Selenium::WebDriver::Firefox::Profile.new
-            cert_prefix = 'a'
-            @cert8_db = @cert_dir + File::SEPARATOR + cert_prefix + 'cert8.db'
-            @key3_db = @cert_dir + File::SEPARATOR + cert_prefix + 'key3.db'
-            @secmod_db = @cert_dir + File::SEPARATOR + cert_prefix + 'secmod.db'
-            cert8_data = write_random_data(@cert8_db)
-            key3_data = write_random_data(@key3_db)
-            secmod_data = write_random_data(@secmod_db)
-            setup = CapybaraSetup.new
-            result = setup.instance_exec(profile, @cert_dir, cert_prefix) { |profile, certificate_path, certificate_prefix, result|
-              update_firefox_profile_with_certificates(profile, certificate_path, certificate_prefix)
-            }
-            profile_path = result.layout_on_disk
-            compare_file_data(profile_path, 'cert8.db', cert8_data)
-            compare_file_data(profile_path, 'key3.db', key3_data)
-            compare_file_data(profile_path, 'secmod.db', secmod_data)
-          end
-        end
       end
     end
   end
 end