twitter 4.1.0 → 4.1.1

data/spec/twitter/api/trends_spec.rb

@@ -9,71 +9,59 @@ describe Twitter::API do
   describe "#trends" do
     context "with woeid passed" do
       before do
-        stub_get("/1.1/trends/place.json").
-          with(:query => {:id => "2487956"}).
-          to_return(:body => fixture("matching_trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/trends/place.json").with(:query => {:id => "2487956"}).to_return(:body => fixture("matching_trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.trends(2487956)
-        a_get("/1.1/trends/place.json").
-          with(:query => {:id => "2487956"}).
-          should have_been_made
+        expect(a_get("/1.1/trends/place.json").with(:query => {:id => "2487956"})).to have_been_made
       end
       it "returns the top 10 trending topics for a specific WOEID" do
         matching_trends = @client.trends(2487956)
-        matching_trends.should be_an Array
-        matching_trends.first.should be_a Twitter::Trend
-        matching_trends.first.name.should eq "#sevenwordsaftersex"
+        expect(matching_trends).to be_an Array
+        expect(matching_trends.first).to be_a Twitter::Trend
+        expect(matching_trends.first.name).to eq "#sevenwordsaftersex"
       end
     end
     context "without arguments passed" do
       before do
-        stub_get("/1.1/trends/place.json").
-          with(:query => {:id => "1"}).
-          to_return(:body => fixture("matching_trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/trends/place.json").with(:query => {:id => "1"}).to_return(:body => fixture("matching_trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.trends
-        a_get("/1.1/trends/place.json").
-          with(:query => {:id => "1"}).
-          should have_been_made
+        expect(a_get("/1.1/trends/place.json").with(:query => {:id => "1"})).to have_been_made
       end
     end
   end
 
   describe "#trends_available" do
     before do
-      stub_get("/1.1/trends/available.json").
-        to_return(:body => fixture("locations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/trends/available.json").to_return(:body => fixture("locations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.trends_available
-      a_get("/1.1/trends/available.json").
-        should have_been_made
+      expect(a_get("/1.1/trends/available.json")).to have_been_made
     end
     it "returns the locations that Twitter has trending topic information for" do
       locations = @client.trends_available
-      locations.should be_an Array
-      locations.first.should be_a Twitter::Place
-      locations.first.name.should eq "Ireland"
+      expect(locations).to be_an Array
+      expect(locations.first).to be_a Twitter::Place
+      expect(locations.first.name).to eq "Ireland"
     end
   end
 
   describe "#trends_closest" do
     before do
-      stub_get("/1.1/trends/closest.json").
-        to_return(:body => fixture("locations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/trends/closest.json").to_return(:body => fixture("locations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.trends_closest
-      a_get("/1.1/trends/closest.json").
-        should have_been_made
+      expect(a_get("/1.1/trends/closest.json")).to have_been_made
     end
     it "returns the locations that Twitter has trending topic information for" do
       locations = @client.trends_closest
-      locations.should be_an Array
-      locations.first.should be_a Twitter::Place
-      locations.first.name.should eq "Ireland"
+      expect(locations).to be_an Array
+      expect(locations.first).to be_a Twitter::Place
+      expect(locations.first.name).to eq "Ireland"
     end
   end
 

data/spec/twitter/api/users_spec.rb

@@ -9,319 +9,248 @@ describe Twitter::API do
   describe "#suggestions" do
     context "with a category slug passed" do
       before do
-        stub_get("/1.1/users/suggestions/art-design.json").
-          to_return(:body => fixture("category.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/users/suggestions/art-design.json").to_return(:body => fixture("category.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.suggestions("art-design")
-        a_get("/1.1/users/suggestions/art-design.json").
-          should have_been_made
+        expect(a_get("/1.1/users/suggestions/art-design.json")).to have_been_made
       end
       it "returns the users in a given category of the Twitter suggested user list" do
         suggestion = @client.suggestions("art-design")
-        suggestion.should be_a Twitter::Suggestion
-        suggestion.name.should eq "Art & Design"
-        suggestion.users.should be_an Array
-        suggestion.users.first.should be_a Twitter::User
+        expect(suggestion).to be_a Twitter::Suggestion
+        expect(suggestion.name).to eq "Art & Design"
+        expect(suggestion.users).to be_an Array
+        expect(suggestion.users.first).to be_a Twitter::User
       end
     end
     context "without arguments passed" do
       before do
-        stub_get("/1.1/users/suggestions.json").
-          to_return(:body => fixture("suggestions.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/users/suggestions.json").to_return(:body => fixture("suggestions.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.suggestions
-        a_get("/1.1/users/suggestions.json").
-          should have_been_made
+        expect(a_get("/1.1/users/suggestions.json")).to have_been_made
       end
       it "returns the list of suggested user categories" do
         suggestions = @client.suggestions
-        suggestions.should be_an Array
-        suggestions.first.should be_a Twitter::Suggestion
-        suggestions.first.name.should eq "Art & Design"
+        expect(suggestions).to be_an Array
+        expect(suggestions.first).to be_a Twitter::Suggestion
+        expect(suggestions.first.name).to eq "Art & Design"
       end
     end
   end
 
   describe "#suggest_users" do
     before do
-      stub_get("/1.1/users/suggestions/art-design/members.json").
-        to_return(:body => fixture("members.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/users/suggestions/art-design/members.json").to_return(:body => fixture("members.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.suggest_users("art-design")
-      a_get("/1.1/users/suggestions/art-design/members.json").
-        should have_been_made
+      expect(a_get("/1.1/users/suggestions/art-design/members.json")).to have_been_made
     end
     it "returns users in a given category of the Twitter suggested user list and return their most recent status if they are not a protected user" do
       suggest_users = @client.suggest_users("art-design")
-      suggest_users.should be_an Array
-      suggest_users.first.should be_a Twitter::User
-      suggest_users.first.name.should eq "OMGFacts"
+      expect(suggest_users).to be_an Array
+      expect(suggest_users.first).to be_a Twitter::User
+      expect(suggest_users.first.name).to eq "OMGFacts"
     end
   end
 
   describe "#users" do
     context "with screen names passed" do
       before do
-        stub_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik,pengwynn"}).
-          to_return(:body => fixture("users.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("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.users("sferik", "pengwynn")
-        a_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik,pengwynn"}).
-          should have_been_made
+        expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
       end
       it "returns up to 100 users worth of extended information" do
         users = @client.users("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
     context "with numeric screen names passed" do
       before do
-        stub_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "0,311"}).
-          to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "0,311"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.users("0", "311")
-        a_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "0,311"}).
-          should have_been_made
+        expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "0,311"})).to have_been_made
       end
     end
     context "with user IDs passed" do
       before do
-        stub_post("/1.1/users/lookup.json").
-          with(:body => {:user_id => "7505382,14100886"}).
-          to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382,14100886"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.users(7505382, 14100886)
-        a_post("/1.1/users/lookup.json").
-          with(:body => {:user_id => "7505382,14100886"}).
-          should have_been_made
+        expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382,14100886"})).to have_been_made
       end
     end
     context "with both screen names and user IDs passed" do
       before do
-        stub_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik", :user_id => "14100886"}).
-          to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik", :user_id => "14100886"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.users("sferik", 14100886)
-        a_post("/1.1/users/lookup.json").
-          with(:body => {:screen_name => "sferik", :user_id => "14100886"}).
-          should have_been_made
+        expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik", :user_id => "14100886"})).to have_been_made
       end
     end
     context "with user objects passed" do
       before do
-        stub_post("/1.1/users/lookup.json").
-          with(:body => {:user_id => "7505382,14100886"}).
-          to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382,14100886"}).to_return(:body => fixture("users.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.users(user1, user2)
-        a_post("/1.1/users/lookup.json").
-          with(:body => {:user_id => "7505382,14100886"}).
-          should have_been_made
+        expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382,14100886"})).to have_been_made
       end
     end
   end
 
   describe "#user_search" do
     before do
-      stub_get("/1.1/users/search.json").
-        with(:query => {:q => "Erik Michaels-Ober"}).
-        to_return(:body => fixture("user_search.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/users/search.json").with(:query => {:q => "Erik Michaels-Ober"}).to_return(:body => fixture("user_search.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.user_search("Erik Michaels-Ober")
-      a_get("/1.1/users/search.json").
-        with(:query => {:q => "Erik Michaels-Ober"}).
-        should have_been_made
+      expect(a_get("/1.1/users/search.json").with(:query => {:q => "Erik Michaels-Ober"})).to have_been_made
     end
     it "returns an array of user search results" do
       user_search = @client.user_search("Erik Michaels-Ober")
-      user_search.should be_an Array
-      user_search.first.should be_a Twitter::User
-      user_search.first.id.should eq 7505382
+      expect(user_search).to be_an Array
+      expect(user_search.first).to be_a Twitter::User
+      expect(user_search.first.id).to eq 7505382
     end
   end
 
   describe "#user" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/users/show.json").
-          with(:query => {:screen_name => "sferik"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/users/show.json").with(:query => {: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.user("sferik")
-        a_get("/1.1/users/show.json").
-          with(:query => {:screen_name => "sferik"}).
-          should have_been_made
+        expect(a_get("/1.1/users/show.json").with(:query => {:screen_name => "sferik"})).to have_been_made
       end
       it "returns extended information of a given user" do
         user = @client.user("sferik")
-        user.should be_a Twitter::User
-        user.id.should eq 7505382
+        expect(user).to be_a Twitter::User
+        expect(user.id).to eq 7505382
       end
     end
     context "with a screen name including '@' passed" do
       before do
-        stub_get("/1.1/users/show.json").
-          with(:query => {:screen_name => "@sferik"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/users/show.json").with(:query => {: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.user("@sferik")
-        a_get("/1.1/users/show.json").
-          with(:query => {:screen_name => "@sferik"}).
-          should have_been_made
+        expect(a_get("/1.1/users/show.json").with(:query => {:screen_name => "@sferik"})).to have_been_made
       end
     end
     context "with a numeric screen name passed" do
       before do
-        stub_get("/1.1/users/show.json").
-          with(:query => {:screen_name => "0"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/users/show.json").with(:query => {:screen_name => "0"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.user("0")
-        a_get("/1.1/users/show.json").
-          with(:query => {:screen_name => "0"}).
-          should have_been_made
+        expect(a_get("/1.1/users/show.json").with(:query => {:screen_name => "0"})).to have_been_made
       end
     end
     context "with a user ID passed" do
       before do
-        stub_get("/1.1/users/show.json").
-          with(:query => {:user_id => "7505382"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/users/show.json").with(:query => {: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.user(7505382)
-        a_get("/1.1/users/show.json").
-          with(:query => {:user_id => "7505382"}).
-          should have_been_made
+        expect(a_get("/1.1/users/show.json").with(:query => {:user_id => "7505382"})).to have_been_made
       end
     end
     context "with a user object passed" do
       before do
-        stub_get("/1.1/users/show.json").
-          with(:query => {:user_id => "7505382"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/users/show.json").with(:query => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         user = Twitter::User.new(:id => 7505382)
         @client.user(user)
-        a_get("/1.1/users/show.json").
-          with(:query => {:user_id => "7505382"}).
-          should have_been_made
+        expect(a_get("/1.1/users/show.json").with(:query => {:user_id => "7505382"})).to have_been_made
       end
     end
   end
   context "without a screen name or user ID passed" do
     context "without options 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/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.user
-        a_get("/1.1/account/verify_credentials.json").
-          should have_been_made
+        expect(a_get("/1.1/account/verify_credentials.json")).to have_been_made
       end
     end
     context "with options passed" do
       before do
-        stub_get("/1.1/account/verify_credentials.json").
-          with(:query => {:skip_status => "true"}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/account/verify_credentials.json").with(:query => {:skip_status => "true"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.user(:skip_status => true)
-        a_get("/1.1/account/verify_credentials.json").
-          with(:query => {:skip_status => "true"}).
-          should have_been_made
+        expect(a_get("/1.1/account/verify_credentials.json").with(:query => {:skip_status => "true"})).to have_been_made
       end
     end
   end
 
   describe "#user?" do
     before do
-      stub_get("/1.1/users/show.json").
-        with(:query => {:screen_name => "sferik"}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1.1/users/show.json").
-        with(:query => {:screen_name => "pengwynn"}).
-        to_return(:body => fixture("not_found.json"), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/users/show.json").with(:query => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/users/show.json").with(:query => {:screen_name => "pengwynn"}).to_return(:body => fixture("not_found.json"), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.user?("sferik")
-      a_get("/1.1/users/show.json").
-        with(:query => {:screen_name => "sferik"}).
-        should have_been_made
+      expect(a_get("/1.1/users/show.json").with(:query => {:screen_name => "sferik"})).to have_been_made
     end
     it "returns true if user exists" do
       user = @client.user?("sferik")
-      user.should be_true
+      expect(user).to be_true
     end
     it "returns false if user does not exist" do
       user = @client.user?("pengwynn")
-      user.should be_false
+      expect(user).to be_false
     end
   end
 
   describe "#contributees" do
     context "with a screen name passed" do
       before do
-        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/users/contributees.json").with(:query => {:screen_name => "sferik"}).to_return(:body => fixture("contributees.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.contributees("sferik")
-        a_get("/1.1/users/contributees.json").
-          with(:query => {:screen_name => "sferik"}).
-          should have_been_made
+        expect(a_get("/1.1/users/contributees.json").with(:query => {:screen_name => "sferik"})).to have_been_made
       end
       it "returns a user's contributees" do
         contributees = @client.contributees("sferik")
-        contributees.should be_an Array
-        contributees.first.should be_a Twitter::User
-        contributees.first.name.should eq "Twitter API"
+        expect(contributees).to be_an Array
+        expect(contributees.first).to be_a Twitter::User
+        expect(contributees.first.name).to eq "Twitter API"
       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("/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").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"})
       end
       it "requests the correct resource" do
         @client.contributees
-        a_get("/1.1/users/contributees.json").
-          with(:query => {:screen_name => "sferik"}).
-          should have_been_made
+        expect(a_get("/1.1/users/contributees.json").with(:query => {:screen_name => "sferik"})).to have_been_made
       end
       it "returns a user's contributees" do
         contributees = @client.contributees
-        contributees.should be_an Array
-        contributees.first.should be_a Twitter::User
-        contributees.first.name.should eq "Twitter API"
+        expect(contributees).to be_an Array
+        expect(contributees.first).to be_a Twitter::User
+        expect(contributees.first.name).to eq "Twitter API"
       end
     end
   end
@@ -329,44 +258,34 @@ describe Twitter::API do
   describe "#contributors" do
     context "with a screen name 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("contributors.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        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("contributors.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.contributors("sferik")
-        a_get("/1.1/users/contributors.json").
-          with(:query => {:screen_name => "sferik"}).
-          should have_been_made
+        expect(a_get("/1.1/users/contributors.json").with(:query => {:screen_name => "sferik"})).to have_been_made
       end
       it "returns a user's contributors" do
         contributors = @client.contributors("sferik")
-        contributors.should be_an Array
-        contributors.first.should be_a Twitter::User
-        contributors.first.name.should eq "Biz Stone"
+        expect(contributors).to be_an Array
+        expect(contributors.first).to be_a Twitter::User
+        expect(contributors.first.name).to eq "Biz Stone"
       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("/1.1/users/contributors.json").
-          with(:query => {:screen_name => "sferik"}).
-          to_return(:body => fixture("contributors.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        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("contributors.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.contributors
-        a_get("/1.1/users/contributors.json").
-          with(:query => {:screen_name => "sferik"}).
-          should have_been_made
+        expect(a_get("/1.1/users/contributors.json").with(:query => {:screen_name => "sferik"})).to have_been_made
       end
       it "returns a user's contributors" do
         contributors = @client.contributors
-        contributors.should be_an Array
-        contributors.first.should be_a Twitter::User
-        contributors.first.name.should eq "Biz Stone"
+        expect(contributors).to be_an Array
+        expect(contributors.first).to be_a Twitter::User
+        expect(contributors.first.name).to eq "Biz Stone"
       end
     end
   end
@@ -374,44 +293,34 @@ describe Twitter::API 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 => {:cursor => "-1", :screen_name => "sferik"}).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")
-        a_get("/users/following_followers_of.json").
-          with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-          should have_been_made
+        expect(a_get("/users/following_followers_of.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
         following_followers_of = @client.following_followers_of("sferik")
-        following_followers_of.should be_a Twitter::Cursor
-        following_followers_of.users.should be_an Array
-        following_followers_of.users.first.should be_a Twitter::User
+        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
       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").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"})
       end
       it "requests the correct resource" do
         @client.following_followers_of
-        a_get("/1.1/account/verify_credentials.json").
-          should have_been_made
-        a_get("/users/following_followers_of.json").
-          with(:query => {:cursor => "-1", :screen_name => "sferik"}).
-          should have_been_made
+        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
       end
       it "returns an array of numeric IDs for every user following the specified user" do
         following_followers_of = @client.following_followers_of
-        following_followers_of.should be_a Twitter::Cursor
-        following_followers_of.users.should be_an Array
-        following_followers_of.users.first.should be_a Twitter::User
+        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
       end
     end
   end