capybara-typhoeus 0.1.4 → 0.1.5

data/lib/capybara/driver/typhoeus_driver.rb

@@ -7,7 +7,7 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
     end
   end
 
-  attr_accessor :as, :follow
+  attr_writer :as, :with_headers, :with_params
   attr_reader :app, :rack_server, :options, :response
 
   def client
@@ -114,22 +114,31 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
     reset_cache
   end
   
+  def reset_with!
+    @with_headers = {}
+    @with_params = {}
+  end
+  
   def as
     @as ||= "application/json"
   end
   
-  def with
-    @with ||= {}
+  def with_headers
+    @with_headers ||= {}
+  end
+
+  def with_params
+    @with_params ||= {}
   end
 
   def process(method, path, params = {}, headers = {})
     @current_uri = url path
     opts = {
       :method => method,
-      :headers => headers.merge("Content-Type" => as, "Accept" => as),
+      :headers => with_headers.merge(headers.merge("Content-Type" => as, "Accept" => as)),
       :timeout => 2000, # 2 seconds
     }
-    opts[method==:get ? :params : :body] = params
+    opts[method==:get ? :params : :body] = with_params.merge(params)
     request = Typhoeus::Request.new @current_uri, opts
     client.queue request
     client.run

data/lib/capybara/typhoeus/cucumber.rb

@@ -2,4 +2,5 @@ require 'capybara/typhoeus'
 
 Before('@typhoeus') do
   Capybara.current_driver = :typhoeus
+  page.driver.reset_with!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2156083520 !ruby/object:Gem::Requirement
+  requirement: &2158140240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156083520
+  version_requirements: *2158140240
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &2156082760 !ruby/object:Gem::Requirement
+  requirement: &2158139760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156082760
+  version_requirements: *2158139760
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2156082100 !ruby/object:Gem::Requirement
+  requirement: &2158139280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156082100
+  version_requirements: *2158139280
 description: Typhoeus driver for Capybara, allowing testing of REST APIs
 email: joseph.halter@thetalentbox.com
 executables: []