capybara-typhoeus 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f3b94df91d387fd0497c1a1f774c4f4df7375e6eeee1b5949abfbdeb70ee24
-  data.tar.gz: 7c06afed2246fac7ea2382be5edbeaf60bedb24a385a6249c78e2c9fb5e44072
+  metadata.gz: a75449aed1dfda86f9408839ea5773663f5e6003acffeabab56da064f6ea3245
+  data.tar.gz: bb467117bbe1443aea0a68103c16e8b0a7cc9a0494d1ebe1af4dab57ef4a2463
 SHA512:
-  metadata.gz: 2c47183792966d74e52b71add37aba8c7300fcf877cc24a5a898e9aa65507bea423c20d2ce4cbc6805376aa155d441ecffff70316019134e7bab2d523dca3238
-  data.tar.gz: f96e5e4a1f570d5a4a8f7275abb7e15d8cdd908cf6fb3eb5cbd08485747708dd28d3728e173cf6a8f36a9c19537f49603ffde82873be516c57cd20bec4109e00
+  metadata.gz: ca1628dd44027237678eba1ded8acff8e40c70723bbe34fb72a7d7c529e2492ce637f92e47d18e35d2932340512ffb410dc3e049cc4ea16b986c9e4b5629e4b9
+  data.tar.gz: 340cf912651cde51e4637c160af7ec66010e3a630e391a19df772564b14de831d19582227b3d8b1613b3c0ece4fc8fe8094d70394b359e5cf11a8e888563650e

data/README.md

@@ -31,7 +31,7 @@ The following scenario will then be using the Typhoeus driver
 When you want to use this driver to test a remote application. You have to set the app_host:
 
     Capybara.app_host = "http://www.yourapp.com"
-    
+
 Note that I haven't tested this case for my self yet. The Capybara tests pass for this situation though so it should work! Please provide me with feedback if it doesn't.
 
 ## Running tests
@@ -58,11 +58,11 @@ Everything related to submitting forms, clicking buttons, clicking checkboxes or
 Build Status
 ---------
 
-[![Build Status](http://travis-ci.org/TalentBox/capybara-typhoeus.png)](http://travis-ci.org/TalentBox/capybara-typhoeus)
+![Build Status](https://github.com/TalentBox/capybara-typhoeus/actions/workflows/ci.yml/badge.svg)
 
 Note on Patches/Pull Requests
 -----------------------------
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -73,4 +73,4 @@ Note on Patches/Pull Requests
 
 Copyright
 ---------
-Copyright (c) 2010 Tron Jonathan and HALTER Joseph. See LICENSE for details.
+Copyright (c) 2010 Tron Jonathan and HALTER Joseph. See LICENSE for details.

data/lib/capybara/typhoeus/browser.rb

@@ -36,7 +36,11 @@ class Capybara::Typhoeus::Browser < Capybara::RackTest::Browser
   end
 
   def current_url
-    last_response ? last_response.effective_url : ""
+    return "" unless last_response
+
+    uri = build_uri(last_response.effective_url)
+    uri.fragment = @current_fragment if @current_fragment
+    uri.to_s
   end
 
   def dom
@@ -86,6 +90,7 @@ class Capybara::Typhoeus::Browser < Capybara::RackTest::Browser
         opts[:httpauth] = :basic
         opts[:userpwd] = "#{driver.login}:#{driver.password}"
       end
+      opts[:params_encoding] = params.delete(:params_encoding) || driver.params_encoding
       opts[:params] = driver.with_params.merge(params)
       if request_body
         opts[:body] = request_body

data/lib/capybara/typhoeus/driver.rb

@@ -1,11 +1,13 @@
 class Capybara::Typhoeus::Driver < Capybara::RackTest::Driver
 
   attr_writer :as, :with_headers, :with_params, :with_options
-  attr_reader :login, :password
+  attr_reader :login, :password, :params_encoding
 
-  def initialize(app, options = {})
+  def initialize(app, **options)
     raise ArgumentError, "typhoeus requires a rack application, but none was given" unless app
-    super app, {timeout: 3, forbid_reuse: true}.merge(options)
+    option_with_default = {timeout: 3, forbid_reuse: true}.merge(options)
+    super app, **option_with_default
+    @params_encoding = :typhoeus
   end
 
   def browser
@@ -16,6 +18,15 @@ class Capybara::Typhoeus::Driver < Capybara::RackTest::Driver
     true
   end
 
+  PARAMS_ENCODING_ALLOWED_VALUES = [:typhoeus, :rack, :multi, :none]
+  def params_encoding=(value)
+    if PARAMS_ENCODING_ALLOWED_VALUES.include?(value)
+      @params_encoding = value
+    else
+      raise ArgumentError, "Allowed values are: #{PARAMS_ENCODING_ALLOWED_VALUES.map(&:inspect).join(", ")}"
+    end
+  end
+
   [:get, :post, :put, :delete, :head, :patch, :request].each do |method|
     define_method(method) do |url, params={}, headers={}, &block|
       browser.reset_host!

data/spec/session/typhoeus_spec.rb

@@ -22,6 +22,9 @@ skipped_tests = %i[
   download
   css
   scroll
+  active_element
+  html_validation
+  shadow_dom
 ]
 Capybara::SpecHelper.run_specs TestSessions::TyphoeusTest, 'Typhoeus', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
@@ -37,6 +40,12 @@ Capybara::SpecHelper.run_specs TestSessions::TyphoeusTest, 'Typhoeus', capybara_
     skip "Typhoeus driver doesn't support #select"
   when /#unselect/
     skip "Typhoeus driver doesn't support #unselect"
+  when /#has_css\? with spatial requirements/
+    skip "Typhoeus driver doesn't support #has_css? with spatial requirements"
+  when /#find with spatial filters/
+    skip "Typhoeus driver doesn't support #find with spatial filters"
+  when /can set cookie if a blank path is specified/
+    skip "Typhoeus driver doesn't support cookie"
   when /has_css\? should support case insensitive :class and :id options/
     skip "Nokogiri doesn't support case insensitive CSS attribute matchers"
   end
@@ -91,6 +100,68 @@ RSpec.describe Capybara::Typhoeus::Session do
       end
     end
 
+    context "params encoding" do
+      context "setting on driver" do
+        let(:driver) { session.driver }
+        it "defaults to :typhoeus" do
+          expect( driver.params_encoding ).to eq :typhoeus
+        end
+        it "can be set to :rack, :multi or :none" do
+          driver.params_encoding = :rack
+          expect( driver.params_encoding ).to eq :rack
+          driver.params_encoding = :multi
+          expect( driver.params_encoding ).to eq :multi
+          driver.params_encoding = :none
+          expect( driver.params_encoding ).to eq :none
+
+          expect do
+            driver.params_encoding = :unknown
+          end.to raise_error ArgumentError, "Allowed values are: :typhoeus, :rack, :multi, :none"
+        end
+      end
+      context "usage in requests" do
+        subject do
+          app = Sinatra.new do
+            get("/"){ params.inspect }
+          end
+          described_class.new :typhoeus, app
+        end
+        it "defaults to driver setting" do
+          subject.get "/", ids: [1, 2, 3]
+          expect( subject.body ).to eq '{"ids"=>{"0"=>"1", "1"=>"2", "2"=>"3"}}'
+
+          subject.driver.params_encoding = :rack
+          subject.get "/", ids: [1, 2, 3]
+          expect( subject.body ).to eq '{"ids"=>["1", "2", "3"]}'
+
+          subject.driver.params_encoding = :multi
+          subject.get "/", ids: [1, 2, 3]
+          expect( subject.body ).to eq '{"ids"=>"3"}'
+
+          subject.driver.params_encoding = :none
+          subject.get "/", ids: [1, 2, 3]
+          expect( subject.body ).to eq '{"ids"=>"[1, 2, 3]"}'
+        end
+        it "can be overriden per request" do
+          subject.driver.params_encoding = :none
+
+          subject.get "/", ids: [1, 2, 3], params_encoding: :typhoeus
+          expect( subject.body ).to eq '{"ids"=>{"0"=>"1", "1"=>"2", "2"=>"3"}}'
+
+          subject.get "/", ids: [1, 2, 3], params_encoding: :rack
+          expect( subject.body ).to eq '{"ids"=>["1", "2", "3"]}'
+
+          subject.get "/", ids: [1, 2, 3], params_encoding: :multi
+          expect( subject.body ).to eq '{"ids"=>"3"}'
+
+          subject.driver.params_encoding = :typhoeus
+
+          subject.get "/", ids: [1, 2, 3], params_encoding: :none
+          expect( subject.body ).to eq '{"ids"=>"[1, 2, 3]"}'
+        end
+      end
+    end
+
     context "timeout" do
       subject{ described_class.new :typhoeus, TestApp }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capybara-typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Joseph HALTER
 - Jonathan TRON
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -130,7 +130,7 @@ files:
 homepage: https://github.com/TalentBox/capybara-typhoeus
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -149,10 +149,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Typhoeus driver for Capybara
 test_files:
-- spec/spec_helper.rb
 - spec/session/typhoeus_spec.rb
+- spec/spec_helper.rb