use Faraday.default_adapter

fixes #7
This commit is contained in:
Benjamin Neff 2015-11-01 04:05:35 +01:00
parent cc63cfe285
commit eaedc3473a
2 changed files with 6 additions and 2 deletions

View file

@ -1,6 +1,5 @@
require "faraday"
require "faraday_middleware/response/follow_redirects"
require "typhoeus/adapters/faraday"
module DiasporaFederation
# A wrapper for {https://github.com/lostisland/faraday Faraday} used for
@ -32,7 +31,7 @@ module DiasporaFederation
@connection = Faraday::Connection.new(options) do |builder|
builder.use FaradayMiddleware::FollowRedirects, limit: 4
builder.adapter :typhoeus
builder.adapter Faraday.default_adapter
end
@connection.headers["User-Agent"] = "DiasporaFederation/#{DiasporaFederation::VERSION}"

View file

@ -0,0 +1,5 @@
# Use net_http in test, that's better supported by webmock
unless Rails.env.test?
require "typhoeus/adapters/faraday"
Faraday.default_adapter = :typhoeus
end