From 0188ada941fab4789e2298bf811909f03cea5a3d Mon Sep 17 00:00:00 2001 From: risk danger olson Date: Mon, 14 Oct 2013 08:59:39 -0600 Subject: [PATCH] don't require things twice now that autoload is default. removes require lines added by some jackass in d0437a1cb42f74b865bcf5fa6111d77b72a88688 --- lib/faraday/request/instrumentation.rb | 2 -- lib/faraday/request/retry.rb | 1 - test/helper.rb | 3 --- 3 files changed, 6 deletions(-) diff --git a/lib/faraday/request/instrumentation.rb b/lib/faraday/request/instrumentation.rb index 6753facb..42af8bc4 100644 --- a/lib/faraday/request/instrumentation.rb +++ b/lib/faraday/request/instrumentation.rb @@ -34,5 +34,3 @@ module Faraday end end end - - diff --git a/lib/faraday/request/retry.rb b/lib/faraday/request/retry.rb index 65e0fe77..c91c0941 100644 --- a/lib/faraday/request/retry.rb +++ b/lib/faraday/request/retry.rb @@ -84,4 +84,3 @@ module Faraday end end end - diff --git a/test/helper.rb b/test/helper.rb index 0521ee59..9d3dda8a 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -23,9 +23,6 @@ if ENV['LEFTRIGHT'] end require File.expand_path('../../lib/faraday', __FILE__) -Dir[File.expand_path('../../lib/faraday/r*/*', __FILE__)].each do |file| - require file -end require 'stringio' require 'uri'