capybara-typhoeus 0.2.7 → 0.2.8

data/lib/capybara/driver/typhoeus_driver.rb

@@ -16,7 +16,10 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
 
   def initialize(app, options={})
     @app = app
-    @options = options
+    @options = {
+      :timeout => 3, # 3 seconds
+      :forbid_reuse => true,
+    }.merge options
     @rack_server = Capybara::Server.new(@app)
     @rack_server.boot if Capybara.run_server
   end
@@ -143,9 +146,7 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
     opts = {
       :method => method,
       :headers => with_headers.merge(headers.merge("Content-Type" => as, "Accept" => as)),
-      :timeout => 2, # 2 seconds
-      :forbid_reuse => true,
-    }
+    }.merge(options)
     opts.merge!({
       :userpwd => "#{login}:#{password}",
       :httpauth => :basic,
@@ -161,9 +162,9 @@ class Capybara::Driver::Typhoeus < Capybara::Driver::Base
     client.run
     @response = request.response
     if @response.timed_out?
-      $stderr.puts "#{method.to_s.upcase} #{@current_uri}: time out"
+      $stderr.puts "#{method.to_s.upcase} #{@current_uri}: time out" if $DEBUG
     elsif @response.code==0
-      $stderr.puts "#{method.to_s.upcase} #{@current_uri}: #{@response.curl_error_message}"
+      $stderr.puts "#{method.to_s.upcase} #{@current_uri}: #{@response.curl_error_message}" if $DEBUG
     end
     @response
   end

data/spec/driver/typhoeus_driver_spec.rb

@@ -37,4 +37,36 @@ describe Capybara::Driver::Typhoeus do
     end
   end
 
+  context "timeout" do
+    context "default" do
+      subject do
+        driver = described_class.new TestApp
+      end
+
+      it "is 3 seconds" do
+        subject.options[:timeout].should == 3
+      end
+
+      it "is used during request" do
+        response = subject.get "/slow_response"
+        response.should_not be_timed_out
+      end
+    end
+
+    context "accepts custom timeout" do
+      subject do
+        driver = described_class.new TestApp, timeout: 1
+      end
+
+      it "is stored in options" do
+        subject.options[:timeout].should == 1
+      end
+
+      it "is used during request" do
+        response = subject.get "/slow_response"
+        response.should be_timed_out
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1687707288122240571
+      hash: 780856206997500836
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: