twitter 5.8.0 → 5.9.0

data/spec/twitter/rest/timelines_spec.rb

@@ -108,8 +108,8 @@ describe Twitter::REST::Timelines do
     end
     it 'requests the correct resource' do
       @client.retweeted_to_me
-      expect(stub_get('/1.1/statuses/home_timeline.json').with(:query => {:include_rts => 'true', :count => '200'})).to have_been_made
-      expect(stub_get('/1.1/statuses/home_timeline.json').with(:query => {:include_rts => 'true', :count => '200', :max_id => '244102729860009983'})).to have_been_made.times(3)
+      expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:include_rts => 'true', :count => '200'})).to have_been_made
+      expect(a_get('/1.1/statuses/home_timeline.json').with(:query => {:include_rts => 'true', :count => '200', :max_id => '244102729860009983'})).to have_been_made.times(3)
     end
     it 'returns the 20 most recent retweets posted by users the authenticating user follow' do
       tweets = @client.retweeted_to_me

data/spec/twitter/rest/tweets_spec.rb

@@ -135,36 +135,34 @@ describe Twitter::REST::Tweets do
 
   describe '#statuses' do
     before do
-      stub_get('/1.1/statuses/show/25938088801.json').to_return(:body => fixture('status.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_post('/1.1/statuses/lookup.json').with(:body => {:id => '25938088801,91151181040201728'}).to_return(:body => fixture('statuses.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
-      @client.statuses(25_938_088_801)
-      expect(a_get('/1.1/statuses/show/25938088801.json')).to have_been_made
+      @client.statuses(25_938_088_801, 91_151_181_040_201_728)
+      expect(a_post('/1.1/statuses/lookup.json').with(:body => {:id => '25938088801,91151181040201728'})).to have_been_made
     end
     it 'returns an array of Tweets' do
-      tweets = @client.statuses(25_938_088_801)
+      tweets = @client.statuses(25_938_088_801, 91_151_181_040_201_728)
       expect(tweets).to be_an Array
       expect(tweets.first).to be_a Twitter::Tweet
-      expect(tweets.first.text).to eq("The problem with your code is that it's doing exactly what you told it to do.")
+      expect(tweets.first.text).to eq('Happy Birthday @imdane. Watch out for those @rally pranksters!')
     end
-    context 'with a URI object passed' do
+    context 'with URI objects passed' do
       it 'requests the correct resource' do
-        tweet = URI.parse('https://twitter.com/sferik/status/25938088801')
-        @client.statuses(tweet)
-        expect(a_get('/1.1/statuses/show/25938088801.json')).to have_been_made
+        @client.statuses(URI.parse('https://twitter.com/sferik/status/25938088801'), URI.parse('https://twitter.com/sferik/status/91151181040201728'))
+        expect(a_post('/1.1/statuses/lookup.json').with(:body => {:id => '25938088801,91151181040201728'})).to have_been_made
       end
     end
-    context 'with a URI string passed' do
+    context 'with URI strings passed' do
       it 'requests the correct resource' do
-        @client.statuses('https://twitter.com/sferik/status/25938088801')
-        expect(a_get('/1.1/statuses/show/25938088801.json')).to have_been_made
+        @client.statuses('https://twitter.com/sferik/status/25938088801', 'https://twitter.com/sferik/status/91151181040201728')
+        expect(a_post('/1.1/statuses/lookup.json').with(:body => {:id => '25938088801,91151181040201728'})).to have_been_made
       end
     end
-    context 'with a Tweet passed' do
+    context 'with Tweets passed' do
       it 'requests the correct resource' do
-        tweet = Twitter::Tweet.new(:id => 25_938_088_801)
-        @client.statuses(tweet)
-        expect(a_get('/1.1/statuses/show/25938088801.json')).to have_been_made
+        @client.statuses(Twitter::Tweet.new(:id => 25_938_088_801), Twitter::Tweet.new(:id => 91_151_181_040_201_728))
+        expect(a_post('/1.1/statuses/lookup.json').with(:body => {:id => '25938088801,91151181040201728'})).to have_been_made
       end
     end
   end
@@ -474,6 +472,12 @@ describe Twitter::REST::Tweets do
         expect(a_post('/1.1/statuses/update_with_media.json')).to have_been_made
       end
     end
+    context 'A non IO object' do
+      it 'raises an error' do
+        update = lambda { @client.update_with_media('You always have options', 'Unacceptable IO') }
+        expect { update.call }.to raise_error(Twitter::Error::UnacceptableIO)
+      end
+    end
     context 'already posted' do
       before do
         stub_post('/1.1/statuses/update_with_media.json').to_return(:status => 403, :body => fixture('already_posted.json'), :headers => {:content_type => 'application/json; charset=utf-8'})

data/spec/twitter/rest/undocumented_spec.rb

@@ -9,11 +9,11 @@ describe Twitter::REST::Undocumented do
   describe '#following_followers_of' do
     context 'with a screen_name passed' do
       before do
-        stub_get('/users/following_followers_of.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('users_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/users/following_followers_of.json').with(:query => {:screen_name => 'sferik', :cursor => '-1'}).to_return(:body => fixture('users_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @client.following_followers_of('sferik')
-        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 => {:screen_name => 'sferik', :cursor => '-1'})).to have_been_made
       end
       it 'returns an array of numeric IDs for every user following the specified user' do
         following_followers_of = @client.following_followers_of('sferik')
@@ -22,43 +22,43 @@ describe Twitter::REST::Undocumented do
       end
       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'})
+          stub_get('/users/following_followers_of.json').with(:query => {:screen_name => 'sferik', :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.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
+          expect(a_get('/users/following_followers_of.json').with(:query => {:screen_name => 'sferik', :cursor => '-1'})).to have_been_made
+          expect(a_get('/users/following_followers_of.json').with(:query => {:screen_name => 'sferik', :cursor => '1322801608223717003'})).to have_been_made
         end
       end
     end
     context 'with a user ID passed' do
       before do
-        stub_get('/users/following_followers_of.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('users_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/users/following_followers_of.json').with(:query => {:user_id => '7505382', :cursor => '-1'}).to_return(:body => fixture('users_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @client.following_followers_of(7_505_382)
-        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 => {:user_id => '7505382', :cursor => '-1'})).to have_been_made
       end
       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'})
+          stub_get('/users/following_followers_of.json').with(:query => {:user_id => '7505382', :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.following_followers_of(7_505_382).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
+          expect(a_get('/users/following_followers_of.json').with(:query => {:user_id => '7505382', :cursor => '-1'})).to have_been_made
+          expect(a_get('/users/following_followers_of.json').with(:query => {:user_id => '7505382', :cursor => '1322801608223717003'})).to have_been_made
         end
       end
     end
     context 'without arguments passed' do
       before do
-        stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
-        stub_get('/users/following_followers_of.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('users_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/users/following_followers_of.json').with(:query => {:user_id => '7505382', :cursor => '-1'}).to_return(:body => fixture('users_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @client.following_followers_of
-        expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
-        expect(a_get('/users/following_followers_of.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/users/following_followers_of.json').with(:query => {:user_id => '7505382', :cursor => '-1'})).to have_been_made
       end
       it 'returns an array of numeric IDs for every user following the specified user' do
         following_followers_of = @client.following_followers_of
@@ -67,12 +67,12 @@ describe Twitter::REST::Undocumented do
       end
       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'})
+          stub_get('/users/following_followers_of.json').with(:query => {:user_id => '7505382', :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.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
+          expect(a_get('/users/following_followers_of.json').with(:query => {:user_id => '7505382', :cursor => '-1'})).to have_been_made
+          expect(a_get('/users/following_followers_of.json').with(:query => {:user_id => '7505382', :cursor => '1322801608223717003'})).to have_been_made
         end
       end
     end

data/spec/twitter/rest/users_spec.rb

@@ -171,26 +171,26 @@ describe Twitter::REST::Users do
     end
   end
 
-  describe '#blocking' do
+  describe '#blocked' do
     before do
       stub_get('/1.1/blocks/list.json').with(:query => {:cursor => '-1'}).to_return(:body => fixture('users_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
-      @client.blocking
+      @client.blocked
       expect(a_get('/1.1/blocks/list.json').with(:query => {:cursor => '-1'})).to have_been_made
     end
     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.first).to be_a Twitter::User
-      expect(blocking.first.id).to eq(7_505_382)
+      blocked = @client.blocked
+      expect(blocked).to be_a Twitter::Cursor
+      expect(blocked.first).to be_a Twitter::User
+      expect(blocked.first.id).to eq(7_505_382)
     end
     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.each {}
+        @client.blocked.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
@@ -579,12 +579,13 @@ describe Twitter::REST::Users do
     end
     context 'without arguments passed' do
       before do
-        stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
-        stub_get('/1.1/users/contributees.json').with(:query => {:screen_name => 'sferik'}).to_return(:body => fixture('contributees.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/users/contributees.json').with(:query => {:user_id => '7505382'}).to_return(:body => fixture('contributees.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @client.contributees
-        expect(a_get('/1.1/users/contributees.json').with(:query => {:screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/users/contributees.json').with(:query => {:user_id => '7505382'})).to have_been_made
       end
       it 'returns contributees' do
         contributees = @client.contributees
@@ -622,12 +623,13 @@ describe Twitter::REST::Users do
     end
     context 'without arguments passed' do
       before do
-        stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
-        stub_get('/1.1/users/contributors.json').with(:query => {:screen_name => 'sferik'}).to_return(:body => fixture('members.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/users/contributors.json').with(:query => {:user_id => '7505382'}).to_return(:body => fixture('members.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @client.contributors
-        expect(a_get('/1.1/users/contributors.json').with(:query => {:screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/users/contributors.json').with(:query => {:user_id => '7505382'})).to have_been_made
       end
       it 'returns contributors' do
         contributors = @client.contributors
@@ -693,13 +695,13 @@ describe Twitter::REST::Users do
     end
     context 'without arguments passed' do
       before do
-        stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
-        stub_get('/1.1/users/profile_banner.json').with(:query => {:screen_name => 'sferik'}).to_return(:body => fixture('profile_banner.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/users/profile_banner.json').with(:query => {:user_id => '7505382'}).to_return(:body => fixture('profile_banner.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @client.profile_banner
-        expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
-        expect(a_get('/1.1/users/profile_banner.json').with(:query => {:screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/users/profile_banner.json').with(:query => {:user_id => '7505382'})).to have_been_made
       end
       it 'returns an array of numeric IDs for every user following the specified user' do
         banner = @client.profile_banner
@@ -710,4 +712,86 @@ describe Twitter::REST::Users do
     end
   end
 
+  describe '#mute' do
+    before do
+      stub_post('/1.1/mutes/users/create.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+    end
+    it 'requests the correct resource' do
+      @client.mute('sferik')
+      expect(a_post('/1.1/mutes/users/create.json')).to have_been_made
+    end
+    it 'returns an array of muteed users' do
+      users = @client.mute('sferik')
+      expect(users).to be_an Array
+      expect(users.first).to be_a Twitter::User
+      expect(users.first.id).to eq(7_505_382)
+    end
+  end
+
+  describe '#unmute' do
+    before do
+      stub_post('/1.1/mutes/users/destroy.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+    end
+    it 'requests the correct resource' do
+      @client.unmute('sferik')
+      expect(a_post('/1.1/mutes/users/destroy.json').with(:body => {:screen_name => 'sferik'})).to have_been_made
+    end
+    it 'returns an array of un-muteed users' do
+      users = @client.unmute('sferik')
+      expect(users).to be_an Array
+      expect(users.first).to be_a Twitter::User
+      expect(users.first.id).to eq(7_505_382)
+    end
+  end
+
+  describe '#muted' do
+    before do
+      stub_get('/1.1/mutes/users/list.json').with(:query => {:cursor => '-1'}).to_return(:body => fixture('users_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+    end
+    it 'requests the correct resource' do
+      @client.muted
+      expect(a_get('/1.1/mutes/users/list.json').with(:query => {:cursor => '-1'})).to have_been_made
+    end
+    it 'returns an array of user objects that the authenticating user is muting' do
+      muted = @client.muted
+      expect(muted).to be_a Twitter::Cursor
+      expect(muted.first).to be_a Twitter::User
+      expect(muted.first.id).to eq(7_505_382)
+    end
+    context 'with each' do
+      before do
+        stub_get('/1.1/mutes/users/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.muted.each {}
+        expect(a_get('/1.1/mutes/users/list.json').with(:query => {:cursor => '-1'})).to have_been_made
+        expect(a_get('/1.1/mutes/users/list.json').with(:query => {:cursor => '1322801608223717003'})).to have_been_made
+      end
+    end
+  end
+
+  describe '#muted_ids' do
+    before do
+      stub_get('/1.1/mutes/users/ids.json').with(:query => {:cursor => '-1'}).to_return(:body => fixture('ids_list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+    end
+    it 'requests the correct resource' do
+      @client.muted_ids
+      expect(a_get('/1.1/mutes/users/ids.json').with(:query => {:cursor => '-1'})).to have_been_made
+    end
+    it 'returns an array of numeric user IDs the authenticating user is muting' do
+      muted_ids = @client.muted_ids
+      expect(muted_ids).to be_a Twitter::Cursor
+      expect(muted_ids.first).to eq(20_009_713)
+    end
+    context 'with each' do
+      before do
+        stub_get('/1.1/mutes/users/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.muted_ids.each {}
+        expect(a_get('/1.1/mutes/users/ids.json').with(:query => {:cursor => '-1'})).to have_been_made
+        expect(a_get('/1.1/mutes/users/ids.json').with(:query => {:cursor => '1305102810874389703'})).to have_been_made
+      end
+    end
+  end
 end

data/spec/twitter/streaming/client_spec.rb

@@ -10,7 +10,7 @@ describe Twitter::Streaming::Client do
       @body = body
     end
 
-    def stream(request, response)
+    def stream(_, response)
       @body.each_line do |line|
         response.on_body(line)
       end

data/spec/twitter/streaming/connection_spec.rb

@@ -0,0 +1,32 @@
+require 'helper'
+
+describe Twitter::Streaming::Connection do
+
+  describe 'initialize' do
+    context 'no options provided' do
+      subject(:connection) { Twitter::Streaming::Connection.new }
+
+      it 'sets the default socket classes' do
+        expect(connection.tcp_socket_class).to eq TCPSocket
+        expect(connection.ssl_socket_class).to eq OpenSSL::SSL::SSLSocket
+      end
+    end
+
+    context 'custom socket classes provided in opts' do
+      class DummyTCPSocket; end
+      class DummySSLSocket; end
+
+      subject(:connection) do
+        Twitter::Streaming::Connection.new(
+          :tcp_socket_class => DummyTCPSocket,
+          :ssl_socket_class => DummySSLSocket
+        )
+      end
+
+      it 'sets the default socket classes' do
+        expect(connection.tcp_socket_class).to eq DummyTCPSocket
+        expect(connection.ssl_socket_class).to eq DummySSLSocket
+      end
+    end
+  end
+end

data/spec/twitter/streaming/response_spec.rb

@@ -0,0 +1,21 @@
+require 'helper'
+
+describe Twitter::Streaming::Response do
+  subject { Twitter::Streaming::Response.new }
+
+  describe '#on_headers_complete' do
+    it 'should not error if status code is 200' do
+      expect do
+        subject << "HTTP/1.1 200 OK\r\nSome-Header: Woo\r\n\r\n"
+      end.to_not raise_error
+    end
+
+    Twitter::Error.errors.each do |code, klass|
+      it "should raise an exception of type #{klass} for status code #{code}" do
+        expect do
+          subject << "HTTP/1.1 #{code} NOK\r\nSome-Header: Woo\r\n\r\n"
+        end.to raise_error(klass)
+      end
+    end
+  end
+end

data/spec/twitter/trend_spec.rb

@@ -28,7 +28,7 @@ describe Twitter::Trend do
   describe '#uri' do
     it 'returns a URI when the url is set' do
       trend = Twitter::Trend.new(:url => 'http://twitter.com/search/?q=%23sevenwordsaftersex')
-      expect(trend.uri).to be_a Addressable::URI
+      expect(trend.uri).to be_an Addressable::URI
       expect(trend.uri.to_s).to eq('http://twitter.com/search/?q=%23sevenwordsaftersex')
     end
     it 'returns nil when the url is not set' do

data/spec/twitter/tweet_spec.rb

@@ -53,27 +53,26 @@ describe Twitter::Tweet do
   end
 
   describe '#entities?' do
-    it 'returns false if there are no entities set' do
-      tweet = Twitter::Tweet.new(:id => 28_669_546_014)
-      expect(tweet.entities?).to be false
-    end
-
-    it 'returns false if there are blank lists of entities set' do
-      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => {:urls => []})
-      expect(tweet.entities?).to be false
-    end
     it 'returns true if there are entities set' do
       urls_array = [
         {
-          :url => 'http://example.com/t.co',
+          :url => 'https://t.co/L2xIBazMPf',
           :expanded_url => 'http://example.com/expanded',
-          :display_url => 'example.com/expandedâ¦',
+          :display_url => 'example.com/expanded…',
           :indices => [10, 33],
         }
       ]
       tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => {:urls => urls_array})
       expect(tweet.entities?).to be true
     end
+    it 'returns false if there are blank lists of entities set' do
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => {:urls => []})
+      expect(tweet.entities?).to be false
+    end
+    it 'returns false if there are no entities set' do
+      tweet = Twitter::Tweet.new(:id => 28_669_546_014)
+      expect(tweet.entities?).to be false
+    end
   end
 
   describe '#filter_level' do
@@ -140,11 +139,9 @@ describe Twitter::Tweet do
           :indices => [10, 33],
         }]
       end
-
       let(:subject) do
         Twitter::Tweet.new(:id => 28_669_546_014, :entities => {:hashtags => hashtags_array})
       end
-
       it 'returns an array of Entity::Hashtag' do
         hashtags = subject.hashtags
         expect(hashtags).to be_an Array
@@ -153,27 +150,21 @@ describe Twitter::Tweet do
         expect(hashtags.first.text).to eq('twitter')
       end
     end
-
     context 'when entities are set, but empty' do
       subject { Twitter::Tweet.new(:id => 28_669_546_014, :entities => {:hashtags => []}) }
-
       it 'is empty' do
         expect(subject.hashtags).to be_empty
       end
-
       it 'does not warn' do
         subject.hashtags
         expect($stderr.string).to be_empty
       end
     end
-
     context 'when entities are not set' do
       subject { Twitter::Tweet.new(:id => 28_669_546_014) }
-
       it 'is empty' do
         expect(subject.hashtags).to be_empty
       end
-
       it 'warns' do
         subject.hashtags
         expect($stderr.string).to match(/To get hashtags, you must pass `:include_entities => true` when requesting the Twitter::Tweet\./)
@@ -355,7 +346,7 @@ describe Twitter::Tweet do
     it 'returns an array of Entity::URIs when entities are set' do
       urls_array = [
         {
-          :url => 'http://example.com/t.co',
+          :url => 'https://t.co/L2xIBazMPf',
           :expanded_url => 'http://example.com/expanded',
           :display_url => 'example.com/expanded…',
           :indices => [10, 33],
@@ -379,7 +370,7 @@ describe Twitter::Tweet do
     it 'can handle strange urls' do
       urls_array = [
         {
-          :url => 'http://with_underscore.example.com/t.co',
+          :url => 'https://t.co/L2xIBazMPf',
           :expanded_url => 'http://with_underscore.example.com/expanded',
           :display_url => 'with_underscore.example.com/expanded…',
           :indices => [10, 33],
@@ -396,7 +387,7 @@ describe Twitter::Tweet do
   describe '#uri' do
     it 'returns the URI to the tweet' do
       tweet = Twitter::Tweet.new(:id => 28_669_546_014, :user => {:id => 7_505_382, :screen_name => 'sferik'})
-      expect(tweet.uri).to be_a Addressable::URI
+      expect(tweet.uri).to be_an Addressable::URI
       expect(tweet.uri.to_s).to eq('https://twitter.com/sferik/status/28669546014')
     end
   end
@@ -404,7 +395,7 @@ describe Twitter::Tweet do
   describe '#uris?' do
     it 'returns true when the tweet includes urls entities' do
       entities = {
-        :urls => [{:url => 'http://with_underscore.example.com/t.co'}]
+        :urls => [{:url => 'https://t.co/L2xIBazMPf'}]
       }
       tweet = Twitter::Tweet.new(:id => 28_669_546_014, :entities => entities)
       expect(tweet.uris?).to be true