Skip to content

Commit

Permalink
Merge pull request sferik#175 from ngauthier/master
Browse files Browse the repository at this point in the history
updated faraday
  • Loading branch information
sferik committed Jun 29, 2011
2 parents d1d69c7 + 59a50a8 commit 0132ab3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions spec/twitter/client_spec.rb
Expand Up @@ -3,9 +3,9 @@
describe Twitter::Client do
it "should connect using the endpoint configuration" do
client = Twitter::Client.new
endpoint = URI.parse(client.api_endpoint)
endpoint = URI.parse(client.api_endpoint).to_s.gsub(/\/$/, '')
connection = client.send(:connection).build_url(nil).to_s
connection.should == endpoint.to_s
connection.should == endpoint
end

it "should not cache the screen name across clients" do
Expand Down
6 changes: 4 additions & 2 deletions spec/twitter/search_spec.rb
Expand Up @@ -4,9 +4,11 @@

it "should connect using the search_endpoint configuration" do
search = Twitter::Search.new
endpoint = URI.parse(search.api_endpoint)
endpoint = URI.parse(search.api_endpoint).to_s.gsub(/\/$/, '')
connection = search.send(:connection).build_url(nil).to_s
connection.should == endpoint.to_s
puts "URI says: #{endpoint.to_s}"
puts "Connection says: #{connection.to_s}"
connection.should == endpoint
end

context "with module configuration" do
Expand Down
4 changes: 2 additions & 2 deletions twitter.gemspec
Expand Up @@ -11,8 +11,8 @@ Gem::Specification.new do |gem|
gem.add_development_dependency 'yard', '~> 0.7'
gem.add_development_dependency 'ZenTest', '~> 4.5'
gem.add_runtime_dependency 'hashie', '~> 1.0.0'
gem.add_runtime_dependency 'faraday', '~> 0.6.1'
gem.add_runtime_dependency 'faraday_middleware', '~> 0.6.3'
gem.add_runtime_dependency 'faraday', '~> 0.7.3'
gem.add_runtime_dependency 'faraday_middleware', '~> 0.7.0.rc.1'
gem.add_runtime_dependency 'multi_json', '~> 1.0.0'
gem.add_runtime_dependency 'multi_xml', '~> 0.2.0'
gem.add_runtime_dependency 'simple_oauth', '~> 0.1.5'
Expand Down

0 comments on commit 0132ab3

Please sign in to comment.