twitter 4.1.0 → 4.1.1

data/spec/twitter/api/direct_messages_spec.rb

@@ -8,133 +8,111 @@ describe Twitter::API do
 
   describe "#direct_messages_received" do
     before do
-      stub_get("/1.1/direct_messages.json").
-        to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/direct_messages.json").to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.direct_messages_received
-      a_get("/1.1/direct_messages.json").
-        should have_been_made
+      expect(a_get("/1.1/direct_messages.json")).to have_been_made
     end
     it "returns the 20 most recent direct messages sent to the authenticating user" do
       direct_messages = @client.direct_messages_received
-      direct_messages.should be_an Array
-      direct_messages.first.should be_a Twitter::DirectMessage
-      direct_messages.first.sender.id.should eq 7505382
+      expect(direct_messages).to be_an Array
+      expect(direct_messages.first).to be_a Twitter::DirectMessage
+      expect(direct_messages.first.sender.id).to eq 7505382
     end
   end
 
   describe "#direct_messages_sent" do
     before do
-      stub_get("/1.1/direct_messages/sent.json").
-        to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/direct_messages/sent.json").to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.direct_messages_sent
-      a_get("/1.1/direct_messages/sent.json").
-        should have_been_made
+      expect(a_get("/1.1/direct_messages/sent.json")).to have_been_made
     end
     it "returns the 20 most recent direct messages sent by the authenticating user" do
       direct_messages = @client.direct_messages_sent
-      direct_messages.should be_an Array
-      direct_messages.first.should be_a Twitter::DirectMessage
-      direct_messages.first.sender.id.should eq 7505382
+      expect(direct_messages).to be_an Array
+      expect(direct_messages.first).to be_a Twitter::DirectMessage
+      expect(direct_messages.first.sender.id).to eq 7505382
     end
   end
 
   describe "#direct_message_destroy" do
     before do
-      stub_post("/1.1/direct_messages/destroy.json").
-        with(:body => {:id => "1825785544"}).
-        to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/direct_messages/destroy.json").with(:body => {:id => "1825785544"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.direct_message_destroy(1825785544)
-      a_post("/1.1/direct_messages/destroy.json").
-        with(:body => {:id => "1825785544"}).
-        should have_been_made
+      expect(a_post("/1.1/direct_messages/destroy.json").with(:body => {:id => "1825785544"})).to have_been_made
     end
     it "returns an array of deleted messages" do
       direct_messages = @client.direct_message_destroy(1825785544)
-      direct_messages.should be_an Array
-      direct_messages.first.should be_a Twitter::DirectMessage
-      direct_messages.first.sender.id.should eq 7505382
+      expect(direct_messages).to be_an Array
+      expect(direct_messages.first).to be_a Twitter::DirectMessage
+      expect(direct_messages.first.sender.id).to eq 7505382
     end
   end
 
   describe "#direct_message_create" do
     before do
-      stub_post("/1.1/direct_messages/new.json").
-        with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"}).
-        to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/direct_messages/new.json").with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.direct_message_create("pengwynn", "Creating a fixture for the Twitter gem")
-      a_post("/1.1/direct_messages/new.json").
-        with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"}).
-        should have_been_made
+      expect(a_post("/1.1/direct_messages/new.json").with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"})).to have_been_made
     end
     it "returns the sent message" do
       direct_message = @client.direct_message_create("pengwynn", "Creating a fixture for the Twitter gem")
-      direct_message.should be_a Twitter::DirectMessage
-      direct_message.text.should eq "Creating a fixture for the Twitter gem"
+      expect(direct_message).to be_a Twitter::DirectMessage
+      expect(direct_message.text).to eq "Creating a fixture for the Twitter gem"
     end
   end
 
   describe "#direct_message" do
     before do
-      stub_get("/1.1/direct_messages/show.json").
-        with(:query => {:id => "1825786345"}).
-        to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/direct_messages/show.json").with(:query => {:id => "1825786345"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.direct_message(1825786345)
-      a_get("/1.1/direct_messages/show.json").
-        with(:query => {:id => "1825786345"}).
-        should have_been_made
+      expect(a_get("/1.1/direct_messages/show.json").with(:query => {:id => "1825786345"})).to have_been_made
     end
     it "returns the specified direct message" do
       direct_message = @client.direct_message(1825786345)
-      direct_message.should be_a Twitter::DirectMessage
-      direct_message.sender.id.should eq 7505382
+      expect(direct_message).to be_a Twitter::DirectMessage
+      expect(direct_message.sender.id).to eq 7505382
     end
   end
 
   describe "#direct_messages" do
     context "with ids passed" do
       before do
-        stub_get("/1.1/direct_messages/show.json").
-          with(:query => {:id => "1825786345"}).
-          to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/direct_messages/show.json").with(:query => {:id => "1825786345"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.direct_messages(1825786345)
-        a_get("/1.1/direct_messages/show.json").
-          with(:query => {:id => "1825786345"}).
-          should have_been_made
+        expect(a_get("/1.1/direct_messages/show.json").with(:query => {:id => "1825786345"})).to have_been_made
       end
       it "returns an array of direct messages" do
         direct_messages = @client.direct_messages(1825786345)
-        direct_messages.should be_an Array
-        direct_messages.first.should be_a Twitter::DirectMessage
-        direct_messages.first.sender.id.should eq 7505382
+        expect(direct_messages).to be_an Array
+        expect(direct_messages.first).to be_a Twitter::DirectMessage
+        expect(direct_messages.first.sender.id).to eq 7505382
       end
     end
     context "without ids passed" do
       before do
-        stub_get("/1.1/direct_messages.json").
-          to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/direct_messages.json").to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.direct_messages
-        a_get("/1.1/direct_messages.json").
-          should have_been_made
+        expect(a_get("/1.1/direct_messages.json")).to have_been_made
       end
       it "returns the 20 most recent direct messages sent to the authenticating user" do
         direct_messages = @client.direct_messages
-        direct_messages.should be_an Array
-        direct_messages.first.should be_a Twitter::DirectMessage
-        direct_messages.first.sender.id.should eq 7505382
+        expect(direct_messages).to be_an Array
+        expect(direct_messages.first).to be_a Twitter::DirectMessage
+        expect(direct_messages.first.sender.id).to eq 7505382
       end
     end
   end

data/spec/twitter/api/friendships_spec.rb

@@ -9,40 +9,32 @@ describe Twitter::API do
   describe "#follower_ids" do
     context "with a screen_name passed" do
       before do
-        stub_get("/1.1/followers/ids.json").
-          with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.follower_ids("sferik")
-        a_get("/1.1/followers/ids.json").
-          with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-          should have_been_made
+        expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
       end
       it "returns an array of numeric IDs for every user following the specified user" do
         follower_ids = @client.follower_ids("sferik")
-        follower_ids.should be_a Twitter::Cursor
-        follower_ids.ids.should be_an Array
-        follower_ids.ids.first.should eq 14100886
+        expect(follower_ids).to be_a Twitter::Cursor
+        expect(follower_ids.ids).to be_an Array
+        expect(follower_ids.ids.first).to eq 14100886
       end
     end
     context "without arguments passed" do
       before do
-        stub_get("/1.1/followers/ids.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/followers/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.follower_ids
-        a_get("/1.1/followers/ids.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       end
       it "returns an array of numeric IDs for every user following the specified user" do
         follower_ids = @client.follower_ids
-        follower_ids.should be_a Twitter::Cursor
-        follower_ids.ids.should be_an Array
-        follower_ids.ids.first.should eq 14100886
+        expect(follower_ids).to be_a Twitter::Cursor
+        expect(follower_ids.ids).to be_an Array
+        expect(follower_ids.ids.first).to eq 14100886
       end
     end
   end
@@ -50,40 +42,32 @@ describe Twitter::API do
   describe "#friend_ids" do
     context "with a screen_name passed" do
       before do
-        stub_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friend_ids("sferik")
-        a_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-          should have_been_made
+        expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
       end
       it "returns an array of numeric IDs for every user the specified user is following" do
         friend_ids = @client.friend_ids("sferik")
-        friend_ids.should be_a Twitter::Cursor
-        friend_ids.ids.should be_an Array
-        friend_ids.ids.first.should eq 14100886
+        expect(friend_ids).to be_a Twitter::Cursor
+        expect(friend_ids.ids).to be_an Array
+        expect(friend_ids.ids.first).to eq 14100886
       end
     end
     context "without arguments passed" do
       before do
-        stub_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friends/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.friend_ids
-        a_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       end
       it "returns an array of numeric IDs for every user the specified user is following" do
         friend_ids = @client.friend_ids
-        friend_ids.should be_a Twitter::Cursor
-        friend_ids.ids.should be_an Array
-        friend_ids.ids.first.should eq 14100886
+        expect(friend_ids).to be_a Twitter::Cursor
+        expect(friend_ids.ids).to be_an Array
+        expect(friend_ids.ids.first).to eq 14100886
       end
     end
   end
@@ -91,156 +75,118 @@ describe Twitter::API do
   describe "#friendship?" do
     context "with screen names passed" do
       before do
-        stub_get("/1.1/friendships/show.json").
-          with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"}).
-          to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/friendships/show.json").
-          with(:query => {:source_screen_name => "pengwynn", :target_screen_name => "sferik"}).
-          to_return(:body => fixture("not_following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "pengwynn", :target_screen_name => "sferik"}).to_return(:body => fixture("not_following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendship?("sferik", "pengwynn")
-        a_get("/1.1/friendships/show.json").
-          with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"})).to have_been_made
       end
       it "returns true if user A follows user B" do
         friendship = @client.friendship?("sferik", "pengwynn")
-        friendship.should be_true
+        expect(friendship).to be_true
       end
       it "returns false if user A does not follow user B" do
         friendship = @client.friendship?("pengwynn", "sferik")
-        friendship.should be_false
+        expect(friendship).to be_false
       end
     end
     context "with user IDs passed" do
       before do
-        stub_get("/1.1/friendships/show.json").
-          with(:query => {:source_id => "7505382", :target_id => "14100886"}).
-          to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendship?(7505382, 14100886)
-        a_get("/1.1/friendships/show.json").
-          with(:query => {:source_id => "7505382", :target_id => "14100886"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
       end
     end
     context "with user objects passed" do
       before do
-        stub_get("/1.1/friendships/show.json").
-          with(:query => {:source_id => "7505382", :target_id => "14100886"}).
-          to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         user1 = Twitter::User.new(:id => '7505382')
         user2 = Twitter::User.new(:id => '14100886')
         @client.friendship?(user1, user2)
-        a_get("/1.1/friendships/show.json").
-          with(:query => {:source_id => "7505382", :target_id => "14100886"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
       end
     end
   end
 
   describe "#friendships_incoming" do
     before do
-      stub_get("/1.1/friendships/incoming.json").
-        with(:query => {:cursor => "-1"}).
-        to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/friendships/incoming.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.friendships_incoming
-      a_get("/1.1/friendships/incoming.json").
-        with(:query => {:cursor => "-1"}).
-        should have_been_made
+      expect(a_get("/1.1/friendships/incoming.json").with(:query => {:cursor => "-1"})).to have_been_made
     end
     it "returns an array of numeric IDs for every user who has a pending request to follow the authenticating user" do
       friendships_incoming = @client.friendships_incoming
-      friendships_incoming.should be_a Twitter::Cursor
-      friendships_incoming.ids.should be_an Array
-      friendships_incoming.ids.first.should eq 14100886
+      expect(friendships_incoming).to be_a Twitter::Cursor
+      expect(friendships_incoming.ids).to be_an Array
+      expect(friendships_incoming.ids.first).to eq 14100886
     end
   end
 
   describe "#friendships_outgoing" do
     before do
-      stub_get("/1.1/friendships/outgoing.json").
-        with(:query => {:cursor => "-1"}).
-        to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/friendships/outgoing.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.friendships_outgoing
-      a_get("/1.1/friendships/outgoing.json").
-        with(:query => {:cursor => "-1"}).
-        should have_been_made
+      expect(a_get("/1.1/friendships/outgoing.json").with(:query => {:cursor => "-1"})).to have_been_made
     end
     it "returns an array of numeric IDs for every protected user for whom the authenticating user has a pending follow request" do
       friendships_outgoing = @client.friendships_outgoing
-      friendships_outgoing.should be_a Twitter::Cursor
-      friendships_outgoing.ids.should be_an Array
-      friendships_outgoing.ids.first.should eq 14100886
+      expect(friendships_outgoing).to be_a Twitter::Cursor
+      expect(friendships_outgoing.ids).to be_an Array
+      expect(friendships_outgoing.ids.first).to eq 14100886
     end
   end
 
   describe "#friendship" do
     context "with screen names passed" do
       before do
-        stub_get("/1.1/friendships/show.json").
-          with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"}).
-          to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendship("sferik", "pengwynn")
-        a_get("/1.1/friendships/show.json").
-          with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "pengwynn"})).to have_been_made
       end
       it "returns detailed information about the relationship between two users" do
         relationship = @client.friendship("sferik", "pengwynn")
-        relationship.should be_a Twitter::Relationship
-        relationship.source.id.should eq 7505382
+        expect(relationship).to be_a Twitter::Relationship
+        expect(relationship.source.id).to eq 7505382
       end
     end
     context "with numeric screen names passed" do
       before do
-        stub_get("/1.1/friendships/show.json").
-          with(:query => {:source_screen_name => "0", :target_screen_name => "311"}).
-          to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "0", :target_screen_name => "311"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendship("0", "311")
-        a_get("/1.1/friendships/show.json").
-          with(:query => {:source_screen_name => "0", :target_screen_name => "311"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "0", :target_screen_name => "311"})).to have_been_made
       end
     end
     context "with user IDs passed" do
       before do
-        stub_get("/1.1/friendships/show.json").
-          with(:query => {:source_id => "7505382", :target_id => "14100886"}).
-          to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendship(7505382, 14100886)
-        a_get("/1.1/friendships/show.json").
-          with(:query => {:source_id => "7505382", :target_id => "14100886"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
       end
     end
     context "with user objects passed" do
       before do
-        stub_get("/1.1/friendships/show.json").
-          with(:query => {:source_id => "7505382", :target_id => "14100886"}).
-          to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         user1 = Twitter::User.new(:id => '7505382')
         user2 = Twitter::User.new(:id => '14100886')
         @client.friendship(user1, user2)
-        a_get("/1.1/friendships/show.json").
-          with(:query => {:source_id => "7505382", :target_id => "14100886"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_id => "7505382", :target_id => "14100886"})).to have_been_made
       end
     end
   end
@@ -248,95 +194,59 @@ describe Twitter::API do
   describe "#follow" do
     context "with :follow => true passed" do
       before do
-        stub_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik,pengwynn"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_post("/1.1/friendships/create.json").
-          with(:body => {:user_id => "7505382", :follow => "true"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382", :follow => "true"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.follow("sferik", "pengwynn", :follow => true)
-        a_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
-        a_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik,pengwynn"}).
-          should have_been_made
-        a_post("/1.1/friendships/create.json").
-          with(:body => {:user_id => "7505382", :follow => "true"}).
-          should have_been_made
+        expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
+        expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
+        expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382", :follow => "true"})).to have_been_made
       end
       it "returns an array of befriended users" do
         users = @client.follow("sferik", "pengwynn", :follow => true)
-        users.should be_an Array
-        users.first.should be_a Twitter::User
-        users.first.id.should eq 7505382
+        expect(users).to be_an Array
+        expect(users.first).to be_a Twitter::User
+        expect(users.first.id).to eq 7505382
       end
     end
     context "with :follow => false passed" do
       before do
-        stub_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik,pengwynn"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_post("/1.1/friendships/create.json").
-          with(:body => {:user_id => "7505382"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.follow("sferik", "pengwynn", :follow => false)
-        a_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
-        a_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik,pengwynn"}).
-          should have_been_made
-        a_post("/1.1/friendships/create.json").
-          with(:body => {:user_id => "7505382"}).
-          should have_been_made
+        expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
+        expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
+        expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"})).to have_been_made
       end
       it "returns an array of befriended users" do
         users = @client.follow("sferik", "pengwynn", :follow => false)
-        users.should be_an Array
-        users.first.should be_a Twitter::User
-        users.first.id.should eq 7505382
+        expect(users).to be_an Array
+        expect(users.first).to be_a Twitter::User
+        expect(users.first.id).to eq 7505382
       end
     end
     context "without :follow passed" do
       before do
-        stub_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik,pengwynn"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_post("/1.1/friendships/create.json").
-          with(:body => {:user_id => "7505382"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.follow("sferik", "pengwynn")
-        a_get("/1.1/friends/ids.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
-        a_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik,pengwynn"}).
-          should have_been_made
-        a_post("/1.1/friendships/create.json").
-          with(:body => {:user_id => "7505382"}).
-          should have_been_made
+        expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
+        expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
+        expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "7505382"})).to have_been_made
       end
       it "returns an array of befriended users" do
         users = @client.follow("sferik", "pengwynn")
-        users.should be_an Array
-        users.first.should be_a Twitter::User
-        users.first.id.should eq 7505382
+        expect(users).to be_an Array
+        expect(users.first).to be_a Twitter::User
+        expect(users.first.id).to eq 7505382
       end
     end
   end
@@ -344,141 +254,109 @@ describe Twitter::API do
   describe "#follow!" do
     context "with :follow => true passed" do
       before do
-        stub_post("/1.1/friendships/create.json").
-          with(:body => {:screen_name => "sferik", :follow => "true"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik", :follow => "true"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.follow!("sferik", :follow => true)
-        a_post("/1.1/friendships/create.json").
-          with(:body => {:screen_name => "sferik", :follow => "true"}).
-          should have_been_made
+        expect(a_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik", :follow => "true"})).to have_been_made
       end
       it "returns an array of befriended users" do
         users = @client.follow!("sferik", :follow => true)
-        users.should be_an Array
-        users.first.should be_a Twitter::User
-        users.first.id.should eq 7505382
+        expect(users).to be_an Array
+        expect(users.first).to be_a Twitter::User
+        expect(users.first.id).to eq 7505382
       end
     end
     context "with :follow => false passed" do
       before do
-        stub_post("/1.1/friendships/create.json").
-          with(:body => {:screen_name => "sferik"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/friendships/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.follow!("sferik", :follow => false)
-        a_post("/1.1/friendships/create.json").
-          with(:body => {:screen_name => "sferik"}).
-          should have_been_made
+        expect(a_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik"})).to have_been_made
       end
       it "returns an array of befriended users" do
         users = @client.follow!("sferik", :follow => false)
-        users.should be_an Array
-        users.first.should be_a Twitter::User
-        users.first.id.should eq 7505382
+        expect(users).to be_an Array
+        expect(users.first).to be_a Twitter::User
+        expect(users.first.id).to eq 7505382
       end
     end
     context "without :follow passed" do
       before do
-        stub_post("/1.1/friendships/create.json").
-          with(:body => {:screen_name => "sferik"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/friendships/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.follow!("sferik")
-        a_post("/1.1/friendships/create.json").
-          with(:body => {:screen_name => "sferik"}).
-          should have_been_made
+        expect(a_post("/1.1/friendships/create.json").with(:body => {:screen_name => "sferik"})).to have_been_made
       end
       it "returns an array of befriended users" do
         users = @client.follow!("sferik")
-        users.should be_an Array
-        users.first.should be_a Twitter::User
-        users.first.id.should eq 7505382
+        expect(users).to be_an Array
+        expect(users.first).to be_a Twitter::User
+        expect(users.first.id).to eq 7505382
       end
     end
   end
 
   describe "#unfollow" do
     before do
-      stub_post("/1.1/friendships/destroy.json").
-        with(:body => {:screen_name => "sferik"}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/friendships/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.unfollow("sferik")
-      a_post("/1.1/friendships/destroy.json").
-        with(:body => {:screen_name => "sferik"}).
-        should have_been_made
+      expect(a_post("/1.1/friendships/destroy.json").with(:body => {:screen_name => "sferik"})).to have_been_made
     end
     it "returns an array of unfollowed users" do
       users = @client.friendship_destroy("sferik")
-      users.should be_an Array
-      users.first.should be_a Twitter::User
-      users.first.id.should eq 7505382
+      expect(users).to be_an Array
+      expect(users.first).to be_a Twitter::User
+      expect(users.first.id).to eq 7505382
     end
   end
 
   describe "#friendships" do
     context "with screen names passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "sferik,pengwynn"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendships("sferik", "pengwynn")
-        a_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "sferik,pengwynn"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"})).to have_been_made
       end
       it "returns up to 100 users worth of extended information" do
         friendships = @client.friendships("sferik", "pengwynn")
-        friendships.should be_an Array
-        friendships.first.should be_a Twitter::User
-        friendships.first.id.should eq 7505382
-        friendships.first.connections.should eq ["none"]
+        expect(friendships).to be_an Array
+        expect(friendships.first).to be_a Twitter::User
+        expect(friendships.first.id).to eq 7505382
+        expect(friendships.first.connections).to eq ["none"]
       end
     end
     context "with numeric screen names passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "0,311"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendships("0", "311")
-        a_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "0,311"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"})).to have_been_made
       end
     end
     context "with user IDs passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").
-          with(:query => {:user_id => "7505382,14100886"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendships(7505382, 14100886)
-        a_get("/1.1/friendships/lookup.json").
-          with(:query => {:user_id => "7505382,14100886"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"})).to have_been_made
       end
     end
     context "with both screen names and user IDs passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "sferik", :user_id => "14100886"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendships("sferik", 14100886)
-        a_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "sferik", :user_id => "14100886"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"})).to have_been_made
       end
     end
   end
@@ -486,81 +364,61 @@ describe Twitter::API do
   describe "#friendships" do
     context "with screen names passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "sferik,pengwynn"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendships("sferik", "pengwynn")
-        a_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "sferik,pengwynn"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik,pengwynn"})).to have_been_made
       end
       it "returns up to 100 users worth of extended information" do
         friendships = @client.friendships("sferik", "pengwynn")
-        friendships.should be_an Array
-        friendships.first.should be_a Twitter::User
-        friendships.first.id.should eq 7505382
-        friendships.first.connections.should eq ["none"]
+        expect(friendships).to be_an Array
+        expect(friendships.first).to be_a Twitter::User
+        expect(friendships.first.id).to eq 7505382
+        expect(friendships.first.connections).to eq ["none"]
       end
     end
     context "with numeric screen names passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "0,311"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendships("0", "311")
-        a_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "0,311"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "0,311"})).to have_been_made
       end
     end
     context "with user IDs passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").
-          with(:query => {:user_id => "7505382,14100886"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendships(7505382, 14100886)
-        a_get("/1.1/friendships/lookup.json").
-          with(:query => {:user_id => "7505382,14100886"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:user_id => "7505382,14100886"})).to have_been_made
       end
     end
     context "with both screen names and user IDs passed" do
       before do
-        stub_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "sferik", :user_id => "14100886"}).
-          to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"}).to_return(:body => fixture("friendships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.friendships("sferik", 14100886)
-        a_get("/1.1/friendships/lookup.json").
-          with(:query => {:screen_name => "sferik", :user_id => "14100886"}).
-          should have_been_made
+        expect(a_get("/1.1/friendships/lookup.json").with(:query => {:screen_name => "sferik", :user_id => "14100886"})).to have_been_made
       end
     end
   end
 
   describe "#friendship_update" do
     before do
-      stub_post("/1.1/friendships/update.json").
-        with(:body => {:screen_name => "sferik", :retweets => "true"}).
-        to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/friendships/update.json").with(:body => {:screen_name => "sferik", :retweets => "true"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.friendship_update("sferik", :retweets => true)
-      a_post("/1.1/friendships/update.json").
-        with(:body => {:screen_name => "sferik", :retweets => "true"}).
-        should have_been_made
+      expect(a_post("/1.1/friendships/update.json").with(:body => {:screen_name => "sferik", :retweets => "true"})).to have_been_made
     end
     it "returns detailed information about the relationship between two users" do
       relationship = @client.friendship_update("sferik", :retweets => true)
-      relationship.should be_a Twitter::Relationship
-      relationship.source.id.should eq 7505382
+      expect(relationship).to be_a Twitter::Relationship
+      expect(relationship.source.id).to eq 7505382
     end
   end