From 29b1b2abe6d55d88331a6e6f2265f1ec436d8188 Mon Sep 17 00:00:00 2001 From: Erik Michaels-Ober Date: Mon, 31 Oct 2011 07:45:14 -0700 Subject: [PATCH] Ensure Accept header is preserved after deep merge --- spec/twitter/client_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/twitter/client_spec.rb b/spec/twitter/client_spec.rb index a3833a585..32698ff14 100644 --- a/spec/twitter/client_spec.rb +++ b/spec/twitter/client_spec.rb @@ -82,7 +82,7 @@ it "should recursively merge connection options" do stub_get("/1/statuses/user_timeline.json"). - with(:query => {:screen_name => "sferik"}, :headers => {"User-Agent" => "Custom User Agent"}). + with(:query => {:screen_name => "sferik"}, :headers => {"Accept" => "application/json", "User-Agent" => "Custom User Agent"}). to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"}) client = Twitter::Client.new(:connection_options => {:headers => {:user_agent => 'Custom User Agent'}}) client.user_timeline("sferik")