twitter 4.8.1 → 5.0.0.rc.1

data/spec/twitter/{api → rest/api}/undocumented_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Undocumented do
+describe Twitter::REST::API::Undocumented do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#following_followers_of" do
@@ -18,15 +18,14 @@ describe Twitter::API::Undocumented do
       it "returns an array of numeric IDs for every user following the specified user" do
         following_followers_of = @client.following_followers_of("sferik")
         expect(following_followers_of).to be_a Twitter::Cursor
-        expect(following_followers_of.users).to be_an Array
-        expect(following_followers_of.users.first).to be_a Twitter::User
+        expect(following_followers_of.first).to be_a Twitter::User
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/users/following_followers_of.json").with(:query => {:cursor => "1322801608223717003", :screen_name => "sferik"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.following_followers_of("sferik").all
+          @client.following_followers_of("sferik").each{}
           expect(a_get("/users/following_followers_of.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/users/following_followers_of.json").with(:query => {:cursor => "1322801608223717003", :screen_name => "sferik"})).to have_been_made
         end
@@ -40,12 +39,12 @@ describe Twitter::API::Undocumented do
         @client.following_followers_of(7505382)
         expect(a_get("/users/following_followers_of.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/users/following_followers_of.json").with(:query => {:cursor => "1322801608223717003", :user_id => "7505382"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.following_followers_of(7505382).all
+          @client.following_followers_of(7505382).each{}
           expect(a_get("/users/following_followers_of.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
           expect(a_get("/users/following_followers_of.json").with(:query => {:cursor => "1322801608223717003", :user_id => "7505382"})).to have_been_made
         end
@@ -64,15 +63,14 @@ describe Twitter::API::Undocumented do
       it "returns an array of numeric IDs for every user following the specified user" do
         following_followers_of = @client.following_followers_of
         expect(following_followers_of).to be_a Twitter::Cursor
-        expect(following_followers_of.users).to be_an Array
-        expect(following_followers_of.users.first).to be_a Twitter::User
+        expect(following_followers_of.first).to be_a Twitter::User
       end
-      context "with all" do
+      context "with each" do
         before do
           stub_get("/users/following_followers_of.json").with(:query => {:cursor => "1322801608223717003", :screen_name => "sferik"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
         it "requests the correct resource" do
-          @client.following_followers_of.all
+          @client.following_followers_of.each{}
           expect(a_get("/users/following_followers_of.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
           expect(a_get("/users/following_followers_of.json").with(:query => {:cursor => "1322801608223717003", :screen_name => "sferik"})).to have_been_made
         end
@@ -80,38 +78,7 @@ describe Twitter::API::Undocumented do
     end
   end
 
-  describe "#status_activity" do
-    before do
-      stub_get("/i/statuses/25938088801/activity/summary.json").to_return(:body => fixture("activity_summary.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.status_activity(25938088801)
-      expect(a_get("/i/statuses/25938088801/activity/summary.json")).to have_been_made
-    end
-    it "returns a Tweet" do
-      tweet = @client.status_activity(25938088801)
-      expect(tweet).to be_a Twitter::Tweet
-      expect(tweet.retweeters_count).to eq 1
-    end
-  end
-
-  describe "#statuses_activity" do
-    before do
-      stub_get("/i/statuses/25938088801/activity/summary.json").to_return(:body => fixture("activity_summary.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-    end
-    it "requests the correct resource" do
-      @client.statuses_activity(25938088801)
-      expect(a_get("/i/statuses/25938088801/activity/summary.json")).to have_been_made
-    end
-    it "returns an array of Tweets" do
-      tweets = @client.statuses_activity(25938088801)
-      expect(tweets).to be_an Array
-      expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.retweeters_count).to eq 1
-    end
-  end
-
-  describe "#statuses_activity" do
+  describe "#tweet_count" do
     before do
       stub_request(:get, "https://cdn.api.twitter.com/1/urls/count.json").with(:query => {:url => "http://twitter.com"}).to_return(:body => fixture("count.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
@@ -122,7 +89,14 @@ describe Twitter::API::Undocumented do
     it "returns a Tweet count" do
       tweet_count = @client.tweet_count("http://twitter.com")
       expect(tweet_count).to be_an Integer
-      expect(tweet_count).to eq 13845465
+      expect(tweet_count).to eq(13845465)
+    end
+    context "with a URI" do
+      it "requests the correct resource" do
+        uri = URI.parse("http://twitter.com")
+        @client.tweet_count(uri)
+        expect(a_request(:get, "https://cdn.api.twitter.com/1/urls/count.json").with(:query => {:url => "http://twitter.com"})).to have_been_made
+      end
     end
   end
 

data/spec/twitter/{api → rest/api}/users_spec.rb

@@ -1,9 +1,9 @@
 require 'helper'
 
-describe Twitter::API::Users do
+describe Twitter::REST::API::Users do
 
   before do
-    @client = Twitter::Client.new
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
   end
 
   describe "#settings" do
@@ -18,7 +18,7 @@ describe Twitter::API::Users do
     it "returns settings" do
       settings = @client.settings
       expect(settings).to be_a Twitter::Settings
-      expect(settings.language).to eq "en"
+      expect(settings.language).to eq("en")
     end
     it "requests the correct resource on POST" do
       @client.settings(:trend_location_woeid => "23424803")
@@ -27,7 +27,7 @@ describe Twitter::API::Users do
     it "returns settings" do
       settings = @client.settings(:trend_location_woeid => "23424803")
       expect(settings).to be_a Twitter::Settings
-      expect(settings.language).to eq "en"
+      expect(settings.language).to eq("en")
     end
   end
 
@@ -42,7 +42,7 @@ describe Twitter::API::Users do
     it "returns the requesting user" do
       user = @client.verify_credentials
       expect(user).to be_a Twitter::User
-      expect(user.id).to eq 7505382
+      expect(user.id).to eq(7505382)
     end
   end
 
@@ -57,7 +57,7 @@ describe Twitter::API::Users do
     it "returns a user" do
       user = @client.update_delivery_device("sms")
       expect(user).to be_a Twitter::User
-      expect(user.id).to eq 7505382
+      expect(user.id).to eq(7505382)
     end
   end
 
@@ -72,7 +72,7 @@ describe Twitter::API::Users do
     it "returns a user" do
       user = @client.update_profile(:url => "http://github.com/sferik/")
       expect(user).to be_a Twitter::User
-      expect(user.id).to eq 7505382
+      expect(user.id).to eq(7505382)
     end
   end
 
@@ -87,7 +87,7 @@ describe Twitter::API::Users do
     it "returns a user" do
       user = @client.update_profile_background_image(fixture("we_concept_bg2.png"))
       expect(user).to be_a Twitter::User
-      expect(user.id).to eq 7505382
+      expect(user.id).to eq(7505382)
     end
   end
 
@@ -102,7 +102,7 @@ describe Twitter::API::Users do
     it "returns a user" do
       user = @client.update_profile_colors(:profile_background_color => "000000")
       expect(user).to be_a Twitter::User
-      expect(user.id).to eq 7505382
+      expect(user.id).to eq(7505382)
     end
   end
 
@@ -117,7 +117,7 @@ describe Twitter::API::Users do
     it "returns a user" do
       user = @client.update_profile_image(fixture("me.jpeg"))
       expect(user).to be_a Twitter::User
-      expect(user.id).to eq 7505382
+      expect(user.id).to eq(7505382)
     end
   end
 
@@ -133,7 +133,7 @@ describe Twitter::API::Users do
       it "returns the users in a given category of the Twitter suggested user list" do
         suggestion = @client.suggestions("art-design")
         expect(suggestion).to be_a Twitter::Suggestion
-        expect(suggestion.name).to eq "Art & Design"
+        expect(suggestion.name).to eq("Art & Design")
         expect(suggestion.users).to be_an Array
         expect(suggestion.users.first).to be_a Twitter::User
       end
@@ -150,7 +150,7 @@ describe Twitter::API::Users do
         suggestions = @client.suggestions
         expect(suggestions).to be_an Array
         expect(suggestions.first).to be_a Twitter::Suggestion
-        expect(suggestions.first.name).to eq "Art & Design"
+        expect(suggestions.first.name).to eq("Art & Design")
       end
     end
   end
@@ -167,7 +167,7 @@ describe Twitter::API::Users do
       suggest_users = @client.suggest_users("art-design")
       expect(suggest_users).to be_an Array
       expect(suggest_users.first).to be_a Twitter::User
-      expect(suggest_users.first.id).to eq 13
+      expect(suggest_users.first.id).to eq(13)
     end
   end
 
@@ -182,16 +182,15 @@ describe Twitter::API::Users do
     it "returns an array of user objects that the authenticating user is blocking" do
       blocking = @client.blocking
       expect(blocking).to be_a Twitter::Cursor
-      expect(blocking.users).to be_an Array
-      expect(blocking.users.first).to be_a Twitter::User
-      expect(blocking.users.first.id).to eq 7505382
+      expect(blocking.first).to be_a Twitter::User
+      expect(blocking.first.id).to eq(7505382)
     end
-    context "with all" do
+    context "with each" do
       before do
         stub_get("/1.1/blocks/list.json").with(:query => {:cursor => "1322801608223717003"}).to_return(:body => fixture("users_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.blocking.all
+        @client.blocking.each{}
         expect(a_get("/1.1/blocks/list.json").with(:query => {:cursor => "-1"})).to have_been_made
         expect(a_get("/1.1/blocks/list.json").with(:query => {:cursor => "1322801608223717003"})).to have_been_made
       end
@@ -209,15 +208,14 @@ describe Twitter::API::Users do
     it "returns an array of numeric user IDs the authenticating user is blocking" do
       blocked_ids = @client.blocked_ids
       expect(blocked_ids).to be_a Twitter::Cursor
-      expect(blocked_ids.ids).to be_an Array
-      expect(blocked_ids.ids.first).to eq 14100886
+      expect(blocked_ids.first).to eq(20009713)
     end
-    context "with all" do
+    context "with each" do
       before do
         stub_get("/1.1/blocks/ids.json").with(:query => {:cursor => "1305102810874389703"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
-        @client.blocked_ids.all
+        @client.blocked_ids.each{}
         expect(a_get("/1.1/blocks/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
         expect(a_get("/1.1/blocks/ids.json").with(:query => {:cursor => "1305102810874389703"})).to have_been_made
       end
@@ -284,7 +282,7 @@ describe Twitter::API::Users do
       users = @client.block("sferik")
       expect(users).to be_an Array
       expect(users.first).to be_a Twitter::User
-      expect(users.first.id).to eq 7505382
+      expect(users.first.id).to eq(7505382)
     end
   end
 
@@ -300,7 +298,7 @@ describe Twitter::API::Users do
       users = @client.unblock("sferik")
       expect(users).to be_an Array
       expect(users.first).to be_a Twitter::User
-      expect(users.first.id).to eq 7505382
+      expect(users.first.id).to eq(7505382)
     end
   end
 
@@ -318,7 +316,21 @@ describe Twitter::API::Users do
           users = @client.users("sferik", "pengwynn")
           expect(users).to be_an Array
           expect(users.first).to be_a Twitter::User
-          expect(users.first.id).to eq 7505382
+          expect(users.first.id).to eq(7505382)
+        end
+        context "with URI objects passed" do
+          it "requests the correct resource" do
+            sferik = URI.parse("https://twitter.com/sferik")
+            pengwynn = URI.parse("https://twitter.com/pengwynn")
+            @client.users(sferik, pengwynn)
+            expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
+          end
+        end
+        context "with URI strings passed" do
+          it "requests the correct resource" do
+            @client.users("https://twitter.com/sferik", "https://twitter.com/pengwynn")
+            expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
+          end
         end
       end
       context "with numeric screen names passed" do
@@ -360,7 +372,6 @@ describe Twitter::API::Users do
         end
       end
     end
-
     context "using a get request" do
       context "with screen names passed" do
         before do
@@ -374,7 +385,21 @@ describe Twitter::API::Users do
           users = @client.users("sferik", "pengwynn", :method => :get)
           expect(users).to be_an Array
           expect(users.first).to be_a Twitter::User
-          expect(users.first.id).to eq 7505382
+          expect(users.first.id).to eq(7505382)
+        end
+        context "with URI objects passed" do
+          it "requests the correct resource" do
+            sferik = URI.parse("https://twitter.com/sferik")
+            pengwynn = URI.parse("https://twitter.com/pengwynn")
+            @client.users(sferik, pengwynn, :method => :get)
+            expect(a_get("/1.1/users/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"})).to have_been_made
+          end
+        end
+        context "with URI objects passed" do
+          it "requests the correct resource" do
+            @client.users("https://twitter.com/sferik", "https://twitter.com/pengwynn", :method => :get)
+            expect(a_get("/1.1/users/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"})).to have_been_made
+          end
         end
       end
       context "with numeric screen names passed" do
@@ -430,7 +455,7 @@ describe Twitter::API::Users do
       it "returns extended information of a given user" do
         user = @client.user("sferik")
         expect(user).to be_a Twitter::User
-        expect(user.id).to eq 7505382
+        expect(user.id).to eq(7505382)
       end
     end
     context "with a screen name including '@' passed" do
@@ -523,7 +548,7 @@ describe Twitter::API::Users do
       user_search = @client.user_search("Erik Michaels-Ober")
       expect(user_search).to be_an Array
       expect(user_search.first).to be_a Twitter::User
-      expect(user_search.first.id).to eq 7505382
+      expect(user_search.first.id).to eq(7505382)
     end
   end
 
@@ -540,7 +565,7 @@ describe Twitter::API::Users do
         contributees = @client.contributees("sferik")
         expect(contributees).to be_an Array
         expect(contributees.first).to be_a Twitter::User
-        expect(contributees.first.name).to eq "Twitter API"
+        expect(contributees.first.name).to eq("Twitter API")
       end
     end
     context "with a user ID passed" do
@@ -565,7 +590,7 @@ describe Twitter::API::Users do
         contributees = @client.contributees
         expect(contributees).to be_an Array
         expect(contributees.first).to be_a Twitter::User
-        expect(contributees.first.name).to eq "Twitter API"
+        expect(contributees.first.name).to eq("Twitter API")
       end
     end
   end
@@ -583,7 +608,7 @@ describe Twitter::API::Users do
         contributors = @client.contributors("sferik")
         expect(contributors).to be_an Array
         expect(contributors.first).to be_a Twitter::User
-        expect(contributors.first.id).to eq 13
+        expect(contributors.first.id).to eq(13)
       end
     end
     context "with a user ID passed" do
@@ -608,7 +633,7 @@ describe Twitter::API::Users do
         contributors = @client.contributors
         expect(contributors).to be_an Array
         expect(contributors.first).to be_a Twitter::User
-        expect(contributors.first.id).to eq 13
+        expect(contributors.first.id).to eq(13)
       end
     end
   end
@@ -654,7 +679,7 @@ describe Twitter::API::Users do
         banner = @client.profile_banner("sferik")
         expect(banner).to be_a Twitter::ProfileBanner
         expect(banner.sizes).to be_a Hash
-        expect(banner.sizes[:mobile].height).to eq 160
+        expect(banner.sizes[:mobile].height).to eq(160)
       end
     end
     context "with a user ID passed" do
@@ -680,7 +705,7 @@ describe Twitter::API::Users do
         banner = @client.profile_banner
         expect(banner).to be_a Twitter::ProfileBanner
         expect(banner.sizes).to be_a Hash
-        expect(banner.sizes[:mobile].height).to eq 160
+        expect(banner.sizes[:mobile].height).to eq(160)
       end
     end
   end

data/spec/twitter/rest/client_spec.rb

@@ -0,0 +1,193 @@
+require 'helper'
+
+describe Twitter::REST::Client do
+
+  before do
+    @client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
+  end
+
+  describe ".new" do
+    context "when invalid credentials are provided" do
+      it "raises a ConfigurationError exception" do
+        expect {
+          Twitter::REST::Client.new(:consumer_key => [12345, 54321])
+        }.to raise_exception(Twitter::Error::ConfigurationError)
+      end
+    end
+
+    context "when no credentials are provided" do
+      it "does not raise an exception" do
+        expect {
+          Twitter::REST::Client.new
+        }.not_to raise_error
+      end
+    end
+  end
+
+  describe ".credentials?" do
+    it "returns true if only bearer_token is supplied" do
+      client = Twitter::REST::Client.new(:bearer_token => "BT")
+      expect(client.credentials?).to be_true
+    end
+    it "returns true if all OAuth credentials are present" do
+      client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
+      expect(client.credentials?).to be_true
+    end
+    it "returns false if any credentials are missing" do
+      client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT")
+      expect(client.credentials?).to be_false
+    end
+  end
+
+  it "does not cache the screen name across clients" do
+    stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    user1 = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS").current_user
+    stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("pengwynn.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    user2 = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS").current_user
+    expect(user1).not_to eq(user2)
+  end
+
+  describe "#delete" do
+    before do
+      stub_delete("/custom/delete").with(:query => {:deleted => "object"})
+    end
+    it "allows custom delete requests" do
+      @client.delete("/custom/delete", {:deleted => "object"})
+      expect(a_delete("/custom/delete").with(:query => {:deleted => "object"})).to have_been_made
+    end
+  end
+
+  describe "#put" do
+    before do
+      stub_put("/custom/put").with(:body => {:updated => "object"})
+    end
+    it "allows custom put requests" do
+      @client.put("/custom/put", {:updated => "object"})
+      expect(a_put("/custom/put").with(:body => {:updated => "object"})).to have_been_made
+    end
+  end
+
+  describe "#user_token?" do
+    it "returns true if the user token/secret are present" do
+      client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
+      expect(client.user_token?).to be_true
+    end
+    it "returns false if the user token/secret are not completely present" do
+      client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT")
+      expect(client.user_token?).to be_false
+    end
+  end
+
+  describe "#bearer_token?" do
+    it "returns true if the app token is present" do
+      client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :bearer_token => "BT")
+      expect(client.bearer_token?).to be_true
+    end
+    it "returns false if the bearer_token is not present" do
+      client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS")
+      expect(client.bearer_token?).to be_false
+    end
+  end
+
+  describe "#credentials?" do
+    it "returns true if all credentials are present" do
+      client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT", :access_token_secret => "AS")
+      expect(client.credentials?).to be_true
+    end
+    it "returns false if any credentials are missing" do
+      client = Twitter::REST::Client.new(:consumer_key => "CK", :consumer_secret => "CS", :access_token => "AT")
+      expect(client.credentials?).to be_false
+    end
+  end
+
+  describe "#connection" do
+    it "looks like Faraday connection" do
+      expect(@client.send(:connection)).to respond_to(:run_request)
+    end
+    it "memoizes the connection" do
+      c1, c2 = @client.send(:connection), @client.send(:connection)
+      expect(c1.object_id).to eq(c2.object_id)
+    end
+  end
+
+  describe "#request" do
+    it "encodes the entire body when no uploaded media is present" do
+      stub_post("/1.1/statuses/update.json").with(:body => {:status => "Update"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      @client.update("Update")
+      expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "Update"})).to have_been_made
+    end
+    it "encodes none of the body when uploaded media is present" do
+      stub_post("/1.1/statuses/update_with_media.json").to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      @client.update_with_media("Update", fixture("pbjt.gif"))
+      expect(a_post("/1.1/statuses/update_with_media.json")).to have_been_made
+    end
+    it "catches Faraday errors" do
+      allow(@client).to receive(:connection).and_raise(Faraday::Error::ClientError.new("Oops"))
+      expect{@client.send(:request, :get, "/path")}.to raise_error Twitter::Error
+    end
+    it "catches JSON::ParserError errors" do
+      allow(@client).to receive(:connection).and_raise(JSON::ParserError.new("unexpected token"))
+      expect{@client.send(:request, :get, "/path")}.to raise_error Twitter::Error
+    end
+  end
+
+  describe "#oauth_auth_header" do
+    it "creates the correct auth headers" do
+      uri = Twitter::REST::Client::ENDPOINT + "/1.1/direct_messages.json"
+      authorization = @client.send(:oauth_auth_header, :get, uri)
+      expect(authorization.options[:signature_method]).to eq("HMAC-SHA1")
+      expect(authorization.options[:version]).to eq("1.0")
+      expect(authorization.options[:consumer_key]).to eq("CK")
+      expect(authorization.options[:consumer_secret]).to eq("CS")
+      expect(authorization.options[:token]).to eq("AT")
+      expect(authorization.options[:token_secret]).to eq("AS")
+    end
+    it "submits the correct auth header when no media is present" do
+      # We use static values for nounce and timestamp to get a stable signature
+      secret = {:consumer_key => "CK", :consumer_secret => "CS",
+                :token => "OT", :token_secret => "OS",
+                :nonce => "b6ebe4c2a11af493f8a2290fe1296965", :timestamp => "1370968658"}
+      header = {"Authorization" => /oauth_signature="FbthwmgGq02iQw%2FuXGEWaL6V6eM%3D"/}
+
+      allow(@client).to receive(:credentials).and_return(secret)
+      stub_post("/1.1/statuses/update.json").with(:body => {:status => "Just a test"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      @client.update("Just a test")
+      expect(a_post("/1.1/statuses/update.json").
+             with(:headers => header)).to have_been_made
+    end
+    it "submits the correct auth header when media is present" do
+      # We use static values for nounce and timestamp to get a stable signature
+      secret = {:consumer_key => "CK", :consumer_secret => "CS",
+                :token => "OT", :token_secret => "OS",
+                :nonce => "e08201ad0dab4897c99445056feefd95", :timestamp => "1370967652"}
+      header = {"Authorization" => /oauth_signature="9ziouUPwZT9IWWRbJL8r0BerKYA%3D"/}
+
+      allow(@client).to receive(:credentials).and_return(secret)
+      stub_post("/1.1/statuses/update_with_media.json").to_return(:body => fixture("status.json"), :headers => header)
+      @client.update_with_media("Just a test", fixture("pbjt.gif"))
+      expect(a_post("/1.1/statuses/update_with_media.json").
+             with(:headers => header)).to have_been_made
+    end
+  end
+
+  describe "#bearer_auth_header" do
+    it "creates the correct auth headers with supplied bearer_token" do
+      client = Twitter::REST::Client.new(:bearer_token => "BT")
+      authorization = client.send(:bearer_auth_header)
+      expect(authorization).to eq("Bearer BT")
+    end
+    it "creates the correct auth headers with supplied bearer token" do
+      token = Twitter::Token.new(:token_type => "bearer", :access_token => "BT")
+      client = Twitter::REST::Client.new(:bearer_token => token)
+      authorization = client.send(:bearer_auth_header)
+      expect(authorization).to eq("Bearer BT")
+    end
+  end
+
+  describe "#bearer_token_credentials_auth_header" do
+    it "creates the correct auth header with supplied consumer_key and consumer_secret" do
+      authorization = @client.send(:bearer_token_credentials_auth_header)
+      expect(authorization).to eq("Basic Q0s6Q1M=")
+    end
+  end
+end