capybara-typhoeus 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f3b94df91d387fd0497c1a1f774c4f4df7375e6eeee1b5949abfbdeb70ee24
-  data.tar.gz: 7c06afed2246fac7ea2382be5edbeaf60bedb24a385a6249c78e2c9fb5e44072
+  metadata.gz: 26e640ff508b09fbfc06576cbdbb897b206ada1dfe57d31ec7ff416bb4018ae5
+  data.tar.gz: 6819055bb02895a56eff597358e6de6434ce21502c1494504dd2a779e57c2ec2
 SHA512:
-  metadata.gz: 2c47183792966d74e52b71add37aba8c7300fcf877cc24a5a898e9aa65507bea423c20d2ce4cbc6805376aa155d441ecffff70316019134e7bab2d523dca3238
-  data.tar.gz: f96e5e4a1f570d5a4a8f7275abb7e15d8cdd908cf6fb3eb5cbd08485747708dd28d3728e173cf6a8f36a9c19537f49603ffde82873be516c57cd20bec4109e00
+  metadata.gz: 8b6a0f1053763cc2373ec7d800bba199c3b235619adf6a881b6af2760b8eb56d39e2d21a04f7a8eea2af24f96cdea96b921afe79c97947508887a760e502c959
+  data.tar.gz: 9762988b272b898226c908d2859364296c3f8d12d8ff2e8f23d2fde8ba8e393cd5eebd283454ad2708316450dc5be1f4b51d8b4c1e5a3c878537f3c77a917154

data/lib/capybara/typhoeus/browser.rb

@@ -86,6 +86,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,12 @@
 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 = {})
     raise ArgumentError, "typhoeus requires a rack application, but none was given" unless app
     super app, {timeout: 3, forbid_reuse: true}.merge(options)
+    @params_encoding = :typhoeus
   end
 
   def browser
@@ -16,6 +17,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

@@ -37,6 +37,10 @@ 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 /has_css\? should support case insensitive :class and :id options/
     skip "Nokogiri doesn't support case insensitive CSS attribute matchers"
   end
@@ -91,6 +95,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Joseph HALTER
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara