twitter 4.1.0 → 4.1.1

data/spec/twitter/api/geo_spec.rb

@@ -8,92 +8,74 @@ describe Twitter::API do
 
   describe "#places_nearby" do
     before do
-      stub_get("/1.1/geo/search.json").
-        with(:query => {:ip => "74.125.19.104"}).
-        to_return(:body => fixture("places.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/geo/search.json").with(:query => {:ip => "74.125.19.104"}).to_return(:body => fixture("places.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.places_nearby(:ip => "74.125.19.104")
-      a_get("/1.1/geo/search.json").
-        with(:query => {:ip => "74.125.19.104"}).
-        should have_been_made
+      expect(a_get("/1.1/geo/search.json").with(:query => {:ip => "74.125.19.104"})).to have_been_made
     end
     it "returns nearby places" do
       places = @client.places_nearby(:ip => "74.125.19.104")
-      places.should be_an Array
-      places.first.name.should eq "Bernal Heights"
+      expect(places).to be_an Array
+      expect(places.first.name).to eq "Bernal Heights"
     end
   end
 
   describe "#places_similar" do
     before do
-      stub_get("/1.1/geo/similar_places.json").
-        with(:query => {:lat => "37.7821120598956", :long => "-122.400612831116", :name => "Twitter HQ"}).
-        to_return(:body => fixture("places.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/geo/similar_places.json").with(:query => {:lat => "37.7821120598956", :long => "-122.400612831116", :name => "Twitter HQ"}).to_return(:body => fixture("places.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.places_similar(:lat => "37.7821120598956", :long => "-122.400612831116", :name => "Twitter HQ")
-      a_get("/1.1/geo/similar_places.json").
-        with(:query => {:lat => "37.7821120598956", :long => "-122.400612831116", :name => "Twitter HQ"}).
-        should have_been_made
+      expect(a_get("/1.1/geo/similar_places.json").with(:query => {:lat => "37.7821120598956", :long => "-122.400612831116", :name => "Twitter HQ"})).to have_been_made
     end
     it "returns similar places" do
       places = @client.places_similar(:lat => "37.7821120598956", :long => "-122.400612831116", :name => "Twitter HQ")
-      places.should be_an Array
-      places.first.name.should eq "Bernal Heights"
+      expect(places).to be_an Array
+      expect(places.first.name).to eq "Bernal Heights"
     end
   end
 
   describe "#reverse_geocode" do
     before do
-      stub_get("/1.1/geo/reverse_geocode.json").
-        with(:query => {:lat => "37.7821120598956", :long => "-122.400612831116"}).
-        to_return(:body => fixture("places.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/geo/reverse_geocode.json").with(:query => {:lat => "37.7821120598956", :long => "-122.400612831116"}).to_return(:body => fixture("places.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.reverse_geocode(:lat => "37.7821120598956", :long => "-122.400612831116")
-      a_get("/1.1/geo/reverse_geocode.json").
-        with(:query => {:lat => "37.7821120598956", :long => "-122.400612831116"}).
-        should have_been_made
+      expect(a_get("/1.1/geo/reverse_geocode.json").with(:query => {:lat => "37.7821120598956", :long => "-122.400612831116"})).to have_been_made
     end
     it "returns places" do
       places = @client.reverse_geocode(:lat => "37.7821120598956", :long => "-122.400612831116")
-      places.should be_an Array
-      places.first.name.should eq "Bernal Heights"
+      expect(places).to be_an Array
+      expect(places.first.name).to eq "Bernal Heights"
     end
   end
 
   describe "#place" do
     before do
-      stub_get("/1.1/geo/id/247f43d441defc03.json").
-        to_return(:body => fixture("place.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/geo/id/247f43d441defc03.json").to_return(:body => fixture("place.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.place("247f43d441defc03")
-      a_get("/1.1/geo/id/247f43d441defc03.json").
-        should have_been_made
+      expect(a_get("/1.1/geo/id/247f43d441defc03.json")).to have_been_made
     end
     it "returns a place" do
       place = @client.place("247f43d441defc03")
-      place.name.should eq "Twitter HQ"
+      expect(place.name).to eq "Twitter HQ"
     end
   end
 
   describe "#place_create" do
     before do
-      stub_post("/1.1/geo/place.json").
-        with(:body => {:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581"}).
-        to_return(:body => fixture("place.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/geo/place.json").with(:body => {:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581"}).to_return(:body => fixture("place.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.place_create(:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581")
-      a_post("/1.1/geo/place.json").
-        with(:body => {:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581"}).
-        should have_been_made
+      expect(a_post("/1.1/geo/place.json").with(:body => {:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581"})).to have_been_made
     end
     it "returns a place" do
       place = @client.place_create(:name => "@sferik's Apartment", :token => "22ff5b1f7159032cf69218c4d8bb78bc", :contained_within => "41bcb736f84a799e", :lat => "37.783699", :long => "-122.393581")
-      place.name.should eq "Twitter HQ"
+      expect(place.name).to eq "Twitter HQ"
     end
   end
 

data/spec/twitter/api/help_spec.rb

@@ -8,68 +8,60 @@ describe Twitter::API do
 
   describe "#configuration" do
     before do
-      stub_get("/1.1/help/configuration.json").
-        to_return(:body => fixture("configuration.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/help/configuration.json").to_return(:body => fixture("configuration.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.configuration
-      a_get("/1.1/help/configuration.json").
-        should have_been_made
+      expect(a_get("/1.1/help/configuration.json")).to have_been_made
     end
     it "returns Twitter's current configuration" do
       configuration = @client.configuration
-      configuration.should be_a Twitter::Configuration
-      configuration.characters_reserved_per_media.should eq 20
+      expect(configuration).to be_a Twitter::Configuration
+      expect(configuration.characters_reserved_per_media).to eq 20
     end
   end
 
   describe "#languages" do
     before do
-      stub_get("/1.1/help/languages.json").
-        to_return(:body => fixture("languages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/help/languages.json").to_return(:body => fixture("languages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.languages
-      a_get("/1.1/help/languages.json").
-        should have_been_made
+      expect(a_get("/1.1/help/languages.json")).to have_been_made
     end
     it "returns the list of languages supported by Twitter" do
       languages = @client.languages
-      languages.should be_an Array
-      languages.first.should be_a Twitter::Language
-      languages.first.name.should eq "Portuguese"
+      expect(languages).to be_an Array
+      expect(languages.first).to be_a Twitter::Language
+      expect(languages.first.name).to eq "Portuguese"
     end
   end
 
   describe "#privacy" do
     before do
-      stub_get("/1.1/help/privacy.json").
-        to_return(:body => fixture("privacy.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/help/privacy.json").to_return(:body => fixture("privacy.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.privacy
-      a_get("/1.1/help/privacy.json").
-        should have_been_made
+      expect(a_get("/1.1/help/privacy.json")).to have_been_made
     end
     it "returns Twitter's Privacy Policy" do
       privacy = @client.privacy
-      privacy.split.first.should eq "Twitter"
+      expect(privacy.split.first).to eq "Twitter"
     end
   end
 
   describe "#tos" do
     before do
-      stub_get("/1.1/help/tos.json").
-        to_return(:body => fixture("tos.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/help/tos.json").to_return(:body => fixture("tos.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.tos
-      a_get("/1.1/help/tos.json").
-        should have_been_made
+      expect(a_get("/1.1/help/tos.json")).to have_been_made
     end
     it "returns Twitter's Terms of Service" do
       tos = @client.tos
-      tos.split.first.should eq "Terms"
+      expect(tos.split.first).to eq "Terms"
     end
   end
 

data/spec/twitter/api/lists_spec.rb

@@ -9,36 +9,27 @@ describe Twitter::API do
   describe "#list_timeline" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/lists/statuses.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_timeline("sferik", "presidents")
-        a_get("/1.1/lists/statuses.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
       it "returns the timeline for members of the specified list" do
         tweets = @client.list_timeline("sferik", "presidents")
-        tweets.should be_an Array
-        tweets.first.should be_a Twitter::Tweet
-        tweets.first.text.should eq "Happy Birthday @imdane. Watch out for those @rally pranksters!"
+        expect(tweets).to be_an Array
+        expect(tweets.first).to be_a Twitter::Tweet
+        expect(tweets.first.text).to eq "Happy Birthday @imdane. Watch out for those @rally pranksters!"
       end
     end
     context "without 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/lists/statuses.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("statuses.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/lists/statuses.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_timeline("presidents")
-        a_get("/1.1/lists/statuses.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/statuses.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
     end
   end
@@ -46,35 +37,26 @@ describe Twitter::API do
   describe "#list_remove_member" do
     context "with a screen name passed" do
       before do
-        stub_post("/1.1/lists/members/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/members/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_remove_member("sferik", "presidents", 813286)
-        a_post("/1.1/lists/members/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"})).to have_been_made
       end
       it "returns the list" do
         list = @client.list_remove_member("sferik", "presidents", 813286)
-        list.should be_a Twitter::List
-        list.name.should eq "presidents"
+        expect(list).to be_a Twitter::List
+        expect(list.name).to eq "presidents"
       end
     end
     context "without 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_post("/1.1/lists/members/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).
-          to_return(:body => fixture("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_post("/1.1/lists/members/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_remove_member("presidents", 813286)
-        a_post("/1.1/lists/members/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"})).to have_been_made
       end
     end
   end
@@ -82,37 +64,28 @@ describe Twitter::API do
   describe "#memberships" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/lists/memberships.json").
-          with(:query => {:screen_name => 'pengwynn', :cursor => "-1"}).
-          to_return(:body => fixture("memberships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/memberships.json").with(:query => {:screen_name => 'pengwynn', :cursor => "-1"}).to_return(:body => fixture("memberships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.memberships("pengwynn")
-        a_get("/1.1/lists/memberships.json").
-          with(:query => {:screen_name => 'pengwynn', :cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/lists/memberships.json").with(:query => {:screen_name => 'pengwynn', :cursor => "-1"})).to have_been_made
       end
       it "returns the lists the specified user has been added to" do
         memberships = @client.memberships("pengwynn")
-        memberships.should be_a Twitter::Cursor
-        memberships.lists.should be_an Array
-        memberships.lists.first.should be_a Twitter::List
-        memberships.lists.first.name.should eq "developer"
+        expect(memberships).to be_a Twitter::Cursor
+        expect(memberships.lists).to be_an Array
+        expect(memberships.lists.first).to be_a Twitter::List
+        expect(memberships.lists.first.name).to eq "developer"
       end
     end
     context "without 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/lists/memberships.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("memberships.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/lists/memberships.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("memberships.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.memberships
-        a_get("/1.1/lists/memberships.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/lists/memberships.json").with(:query => {:cursor => "-1"})).to have_been_made
       end
     end
   end
@@ -120,37 +93,28 @@ describe Twitter::API do
   describe "#list_subscribers" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/lists/subscribers.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"}).
-          to_return(:body => fixture("users_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :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.list_subscribers("sferik", "presidents")
-        a_get("/1.1/lists/subscribers.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"})).to have_been_made
       end
       it "returns the subscribers of the specified list" do
         list_subscribers = @client.list_subscribers("sferik", "presidents")
-        list_subscribers.should be_a Twitter::Cursor
-        list_subscribers.users.should be_an Array
-        list_subscribers.users.first.should be_a Twitter::User
-        list_subscribers.users.first.id.should eq 7505382
+        expect(list_subscribers).to be_a Twitter::Cursor
+        expect(list_subscribers.users).to be_an Array
+        expect(list_subscribers.users.first).to be_a Twitter::User
+        expect(list_subscribers.users.first.id).to eq 7505382
       end
     end
     context "without 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/lists/subscribers.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"}).
-          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("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :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.list_subscribers("presidents")
-        a_get("/1.1/lists/subscribers.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscribers.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"})).to have_been_made
       end
     end
   end
@@ -158,37 +122,28 @@ describe Twitter::API do
   describe "#subscriptions" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/lists/subscriptions.json").
-          with(:query => {:screen_name => 'pengwynn', :cursor => "-1"}).
-          to_return(:body => fixture("subscriptions.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => 'pengwynn', :cursor => "-1"}).to_return(:body => fixture("subscriptions.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.subscriptions("pengwynn")
-        a_get("/1.1/lists/subscriptions.json").
-          with(:query => {:screen_name => 'pengwynn', :cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:screen_name => 'pengwynn', :cursor => "-1"})).to have_been_made
       end
       it "returns the lists the specified user follows" do
         subscriptions = @client.subscriptions("pengwynn")
-        subscriptions.should be_a Twitter::Cursor
-        subscriptions.lists.should be_an Array
-        subscriptions.lists.first.should be_a Twitter::List
-        subscriptions.lists.first.name.should eq "Rubyists"
+        expect(subscriptions).to be_a Twitter::Cursor
+        expect(subscriptions.lists).to be_an Array
+        expect(subscriptions.lists.first).to be_a Twitter::List
+        expect(subscriptions.lists.first.name).to eq "Rubyists"
       end
     end
     context "without 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/lists/subscriptions.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("subscriptions.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/lists/subscriptions.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("subscriptions.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.subscriptions
-        a_get("/1.1/lists/subscriptions.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscriptions.json").with(:query => {:cursor => "-1"})).to have_been_made
       end
     end
   end
@@ -196,35 +151,26 @@ describe Twitter::API do
   describe "#list_subscribe" do
     context "with a screen name passed" do
       before do
-        stub_post("/1.1/lists/subscribers/create.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/subscribers/create.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_subscribe("sferik", "presidents")
-        a_post("/1.1/lists/subscribers/create.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_post("/1.1/lists/subscribers/create.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
       it "returns the specified list" do
         list = @client.list_subscribe("sferik", "presidents")
-        list.should be_a Twitter::List
-        list.name.should eq "presidents"
+        expect(list).to be_a Twitter::List
+        expect(list.name).to eq "presidents"
       end
     end
     context "without 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_post("/1.1/lists/subscribers/create.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("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_post("/1.1/lists/subscribers/create.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_subscribe("presidents")
-        a_post("/1.1/lists/subscribers/create.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_post("/1.1/lists/subscribers/create.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
     end
   end
@@ -232,101 +178,72 @@ describe Twitter::API do
   describe "#list_subscriber?" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '18755393'}).
-          to_return(:body => fixture("not_found.json"), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '12345678'}).
-          to_return(:body => fixture("not_found.json"), :status => 403, :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '18755393'}).to_return(:body => fixture("not_found.json"), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '12345678'}).to_return(:body => fixture("not_found.json"), :status => 403, :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_subscriber?("sferik", "presidents", 813286)
-        a_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'})).to have_been_made
       end
       it "returns true if the specified user subscribes to the specified list" do
         list_subscriber = @client.list_subscriber?("sferik", "presidents", 813286)
-        list_subscriber.should be_true
+        expect(list_subscriber).to be_true
       end
       it "returns false if the specified user does not subscribe to the specified list" do
         list_subscriber = @client.list_subscriber?("sferik", "presidents", 18755393)
-        list_subscriber.should be_false
+        expect(list_subscriber).to be_false
       end
       it "returns false if user does not exist" do
         list_subscriber = @client.list_subscriber?("sferik", "presidents", 12345678)
-        list_subscriber.should be_false
+        expect(list_subscriber).to be_false
       end
     end
     context "with a owner ID passed" do
       before do
-        stub_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_id => '12345678', :slug => 'presidents', :user_id => '813286'}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_id => '12345678', :slug => 'presidents', :user_id => '813286'}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_subscriber?(12345678, "presidents", 813286)
-        a_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_id => '12345678', :slug => 'presidents', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_id => '12345678', :slug => 'presidents', :user_id => '813286'})).to have_been_made
       end
     end
     context "with a list ID passed" do
       before do
-        stub_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678', :user_id => '813286'}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678', :user_id => '813286'}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_subscriber?('sferik', 12345678, 813286)
-        a_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678', :user_id => '813286'})).to have_been_made
       end
     end
     context "with a list object passed" do
       before do
-        stub_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_id => '7505382', :list_id => '12345678', :user_id => '813286'}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_id => '7505382', :list_id => '12345678', :user_id => '813286'}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         list = Twitter::List.new(:id => 12345678, :user => {:id => 7505382, :screen_name => 'sferik'})
         @client.list_subscriber?(list, 813286)
-        a_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_id => '7505382', :list_id => '12345678', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_id => '7505382', :list_id => '12345678', :user_id => '813286'})).to have_been_made
       end
     end
     context "with a screen name passed for user_to_check" do
       before do
-        stub_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :screen_name => 'erebor'}).
-          to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :screen_name => 'erebor'}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_subscriber?("sferik", "presidents", 'erebor')
-        a_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :screen_name => 'erebor'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :screen_name => 'erebor'})).to have_been_made
       end
     end
     context "without 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/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).
-          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"})
+        stub_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_subscriber?("presidents", 813286)
-        a_get("/1.1/lists/subscribers/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/subscribers/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'})).to have_been_made
       end
     end
   end
@@ -334,35 +251,26 @@ describe Twitter::API do
   describe "#list_unsubscribe" do
     context "with a screen name passed" do
       before do
-        stub_post("/1.1/lists/subscribers/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/subscribers/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_unsubscribe("sferik", "presidents")
-        a_post("/1.1/lists/subscribers/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_post("/1.1/lists/subscribers/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
       it "returns the specified list" do
         list = @client.list_unsubscribe("sferik", "presidents")
-        list.should be_a Twitter::List
-        list.name.should eq "presidents"
+        expect(list).to be_a Twitter::List
+        expect(list.name).to eq "presidents"
       end
     end
     context "without 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_post("/1.1/lists/subscribers/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("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_post("/1.1/lists/subscribers/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_unsubscribe("presidents")
-        a_post("/1.1/lists/subscribers/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_post("/1.1/lists/subscribers/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
     end
   end
@@ -370,48 +278,35 @@ describe Twitter::API do
   describe "#list_add_members" do
     context "with a screen name passed" do
       before do
-        stub_post("/1.1/lists/members/create_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_add_members("sferik", "presidents", [813286, 18755393])
-        a_post("/1.1/lists/members/create_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"})).to have_been_made
       end
       it "returns the list" do
         list = @client.list_add_members("sferik", "presidents", [813286, 18755393])
-        list.should be_a Twitter::List
-        list.name.should eq "presidents"
+        expect(list).to be_a Twitter::List
+        expect(list.name).to eq "presidents"
       end
     end
     context "with a combination of member IDs and member screen names to add" do
       before do
-        stub_post("/1.1/lists/members/create_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_add_members('sferik', 'presidents', [813286, 'pengwynn', 18755393, 'erebor'])
-        a_post("/1.1/lists/members/create_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"})).to have_been_made
       end
     end
     context "without 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_post("/1.1/lists/members/create_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).
-          to_return(:body => fixture("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_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_add_members("presidents", [813286, 18755393])
-        a_post("/1.1/lists/members/create_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/create_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"})).to have_been_made
       end
     end
   end
@@ -419,48 +314,35 @@ describe Twitter::API do
   describe "#list_remove_members" do
     context "with a screen name passed" do
       before do
-        stub_post("/1.1/lists/members/destroy_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_remove_members("sferik", "presidents", [813286, 18755393])
-        a_post("/1.1/lists/members/destroy_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"})).to have_been_made
       end
       it "returns the list" do
         list = @client.list_remove_members("sferik", "presidents", [813286, 18755393])
-        list.should be_a Twitter::List
-        list.name.should eq "presidents"
+        expect(list).to be_a Twitter::List
+        expect(list.name).to eq "presidents"
       end
     end
     context "with a combination of member IDs and member screen names to add" do
       before do
-        stub_post("/1.1/lists/members/destroy_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_remove_members('sferik', 'presidents', [813286, 'pengwynn', 18755393, 'erebor'])
-        a_post("/1.1/lists/members/destroy_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393", :screen_name => "pengwynn,erebor"})).to have_been_made
       end
     end
     context "without 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_post("/1.1/lists/members/destroy_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).
-          to_return(:body => fixture("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_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_remove_members("presidents", [813286, 18755393])
-        a_post("/1.1/lists/members/destroy_all.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/destroy_all.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286,18755393"})).to have_been_made
       end
     end
   end
@@ -468,101 +350,72 @@ describe Twitter::API do
   describe "#list_member?" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '65493023'}).
-          to_return(:body => fixture("not_found.json"), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '12345678'}).
-          to_return(:body => fixture("not_found.json"), :status => 403, :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '65493023'}).to_return(:body => fixture("not_found.json"), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '12345678'}).to_return(:body => fixture("not_found.json"), :status => 403, :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_member?("sferik", "presidents", 813286)
-        a_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'})).to have_been_made
       end
       it "returns true if user is a list member" do
         list_member = @client.list_member?("sferik", "presidents", 813286)
-        list_member.should be_true
+        expect(list_member).to be_true
       end
       it "returns false if user is not a list member" do
         list_member = @client.list_member?("sferik", "presidents", 65493023)
-        list_member.should be_false
+        expect(list_member).to be_false
       end
       it "returns false if user does not exist" do
         list_member = @client.list_member?("sferik", "presidents", 12345678)
-        list_member.should be_false
+        expect(list_member).to be_false
       end
     end
     context "with an owner ID passed" do
       before do
-        stub_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_id => '12345678', :slug => 'presidents', :user_id => '813286'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/members/show.json").with(:query => {:owner_id => '12345678', :slug => 'presidents', :user_id => '813286'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_member?(12345678, "presidents", 813286)
-        a_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_id => '12345678', :slug => 'presidents', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/members/show.json").with(:query => {:owner_id => '12345678', :slug => 'presidents', :user_id => '813286'})).to have_been_made
       end
     end
     context "with a list ID passed" do
       before do
-        stub_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678', :user_id => '813286'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678', :user_id => '813286'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_member?('sferik', 12345678, 813286)
-        a_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678', :user_id => '813286'})).to have_been_made
       end
     end
     context "with a list object passed" do
       before do
-        stub_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_id => '7505382', :list_id => '12345678', :user_id => '813286'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/members/show.json").with(:query => {:owner_id => '7505382', :list_id => '12345678', :user_id => '813286'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         list = Twitter::List.new(:id => 12345678, :user => {:id => 7505382, :screen_name => 'sferik'})
         @client.list_member?(list, 813286)
-        a_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_id => '7505382', :list_id => '12345678', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/members/show.json").with(:query => {:owner_id => '7505382', :list_id => '12345678', :user_id => '813286'})).to have_been_made
       end
     end
     context "with a screen name passed for user_to_check" do
       before do
-        stub_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :screen_name => 'erebor'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/.json; charset=utf-8"})
+        stub_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :screen_name => 'erebor'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/.json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_member?("sferik", "presidents", 'erebor')
-        a_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :screen_name => 'erebor'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :screen_name => 'erebor'})).to have_been_made
       end
     end
     context "without 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/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).
-          to_return(:body => fixture("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("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/.json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_member?("presidents", 813286)
-        a_get("/1.1/lists/members/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => '813286'})).to have_been_made
       end
     end
   end
@@ -570,37 +423,28 @@ describe Twitter::API do
   describe "#list_members" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/lists/members.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"}).
-          to_return(:body => fixture("users_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :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.list_members("sferik", "presidents")
-        a_get("/1.1/lists/members.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"})).to have_been_made
       end
       it "returns the members of the specified list" do
         list_members = @client.list_members("sferik", "presidents")
-        list_members.should be_a Twitter::Cursor
-        list_members.users.should be_an Array
-        list_members.users.first.should be_a Twitter::User
-        list_members.users.first.id.should eq 7505382
+        expect(list_members).to be_a Twitter::Cursor
+        expect(list_members.users).to be_an Array
+        expect(list_members.users.first).to be_a Twitter::User
+        expect(list_members.users.first.id).to eq 7505382
       end
     end
     context "without 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/lists/members.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"}).
-          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("/1.1/lists/members.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :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.list_members("presidents")
-        a_get("/1.1/lists/members.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"}).
-          should have_been_made
+        expect(a_get("/1.1/lists/members.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents', :cursor => "-1"})).to have_been_made
       end
     end
   end
@@ -608,35 +452,26 @@ describe Twitter::API do
   describe "#list_add_member" do
     context "with a screen name passed" do
       before do
-        stub_post("/1.1/lists/members/create.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/members/create.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_add_member("sferik", "presidents", 813286)
-        a_post("/1.1/lists/members/create.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/create.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"})).to have_been_made
       end
       it "returns the list" do
         list = @client.list_add_member("sferik", "presidents", 813286)
-        list.should be_a Twitter::List
-        list.name.should eq "presidents"
+        expect(list).to be_a Twitter::List
+        expect(list.name).to eq "presidents"
       end
     end
     context "without 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_post("/1.1/lists/members/create.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).
-          to_return(:body => fixture("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_post("/1.1/lists/members/create.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_add_member("presidents", 813286)
-        a_post("/1.1/lists/members/create.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/members/create.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :user_id => "813286"})).to have_been_made
       end
     end
   end
@@ -644,62 +479,45 @@ describe Twitter::API do
   describe "#list_destroy" do
     context "with a screen name passed" do
       before do
-        stub_post("/1.1/lists/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_destroy("sferik", "presidents")
-        a_post("/1.1/lists/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
       it "returns the deleted list" do
         list = @client.list_destroy("sferik", "presidents")
-        list.should be_a Twitter::List
-        list.name.should eq "presidents"
+        expect(list).to be_a Twitter::List
+        expect(list.name).to eq "presidents"
       end
     end
     context "without 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_post("/1.1/lists/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("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_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_destroy("presidents")
-        a_post("/1.1/lists/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
     end
     context "with a list ID passed" do
       before do
-        stub_post("/1.1/lists/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :list_id => '12345678'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => 'sferik', :list_id => '12345678'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_destroy("sferik", 12345678)
-        a_post("/1.1/lists/destroy.json").
-          with(:body => {:owner_screen_name => 'sferik', :list_id => '12345678'}).
-          should have_been_made
+        expect(a_post("/1.1/lists/destroy.json").with(:body => {:owner_screen_name => 'sferik', :list_id => '12345678'})).to have_been_made
       end
     end
     context "with a list object passed" do
       before do
-        stub_post("/1.1/lists/destroy.json").
-          with(:body => {:owner_id => '7505382', :list_id => '12345678'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/destroy.json").with(:body => {:owner_id => '7505382', :list_id => '12345678'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         list = Twitter::List.new(:id => '12345678', :user => {:id => 7505382, :screen_name => 'sferik'})
         @client.list_destroy(list)
-        a_post("/1.1/lists/destroy.json").
-          with(:body => {:owner_id => '7505382', :list_id => '12345678'}).
-          should have_been_made
+        expect(a_post("/1.1/lists/destroy.json").with(:body => {:owner_id => '7505382', :list_id => '12345678'})).to have_been_made
       end
     end
   end
@@ -707,189 +525,141 @@ describe Twitter::API do
   describe "#list_update" do
     context "with a screen name passed" do
       before do
-        stub_post("/1.1/lists/update.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => "presidents", :description => "Presidents of the United States of America"}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/update.json").with(:body => {:owner_screen_name => 'sferik', :slug => "presidents", :description => "Presidents of the United States of America"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_update("sferik", "presidents", :description => "Presidents of the United States of America")
-        a_post("/1.1/lists/update.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => "presidents", :description => "Presidents of the United States of America"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/update.json").with(:body => {:owner_screen_name => 'sferik', :slug => "presidents", :description => "Presidents of the United States of America"})).to have_been_made
       end
       it "returns the updated list" do
         list = @client.list_update("sferik", "presidents", :description => "Presidents of the United States of America")
-        list.should be_a Twitter::List
-        list.name.should eq "presidents"
+        expect(list).to be_a Twitter::List
+        expect(list.name).to eq "presidents"
       end
     end
     context "without 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_post("/1.1/lists/update.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :description => "Presidents of the United States of America"}).
-          to_return(:body => fixture("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_post("/1.1/lists/update.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :description => "Presidents of the United States of America"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_update("presidents", :description => "Presidents of the United States of America")
-        a_post("/1.1/lists/update.json").
-          with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :description => "Presidents of the United States of America"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/update.json").with(:body => {:owner_screen_name => 'sferik', :slug => 'presidents', :description => "Presidents of the United States of America"})).to have_been_made
       end
     end
     context "with a list ID passed" do
       before do
-        stub_post("/1.1/lists/update.json").
-          with(:body => {:owner_screen_name => 'sferik', :list_id => '12345678', :description => "Presidents of the United States of America"}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/update.json").with(:body => {:owner_screen_name => 'sferik', :list_id => '12345678', :description => "Presidents of the United States of America"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list_update("sferik", 12345678, :description => "Presidents of the United States of America")
-        a_post("/1.1/lists/update.json").
-          with(:body => {:owner_screen_name => 'sferik', :list_id => '12345678', :description => "Presidents of the United States of America"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/update.json").with(:body => {:owner_screen_name => 'sferik', :list_id => '12345678', :description => "Presidents of the United States of America"})).to have_been_made
       end
     end
     context "with a list object passed" do
       before do
-        stub_post("/1.1/lists/update.json").
-          with(:body => {:owner_id => '7505382', :list_id => '12345678', :description => "Presidents of the United States of America"}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_post("/1.1/lists/update.json").with(:body => {:owner_id => '7505382', :list_id => '12345678', :description => "Presidents of the United States of America"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         list = Twitter::List.new(:id => '12345678', :user => {:id => 7505382, :screen_name => 'sferik'})
         @client.list_update(list, :description => "Presidents of the United States of America")
-        a_post("/1.1/lists/update.json").
-          with(:body => {:owner_id => '7505382', :list_id => '12345678', :description => "Presidents of the United States of America"}).
-          should have_been_made
+        expect(a_post("/1.1/lists/update.json").with(:body => {:owner_id => '7505382', :list_id => '12345678', :description => "Presidents of the United States of America"})).to have_been_made
       end
     end
   end
 
   describe "#list_create" do
     before do
-      stub_post("/1.1/lists/create.json").
-        with(:body => {:name => "presidents"}).
-        to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/lists/create.json").with(:body => {:name => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.list_create("presidents")
-      a_post("/1.1/lists/create.json").
-        with(:body => {:name => "presidents"}).
-        should have_been_made
+      expect(a_post("/1.1/lists/create.json").with(:body => {:name => "presidents"})).to have_been_made
     end
     it "returns the created list" do
       list = @client.list_create("presidents")
-      list.should be_a Twitter::List
-      list.name.should eq "presidents"
+      expect(list).to be_a Twitter::List
+      expect(list.name).to eq "presidents"
     end
   end
 
   describe "#lists" do
     before do
-      stub_get("/1.1/lists/list.json").
-        to_return(:body => fixture("lists.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/lists/list.json").to_return(:body => fixture("lists.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.lists
-      a_get("/1.1/lists/list.json").
-        should have_been_made
+      expect(a_get("/1.1/lists/list.json")).to have_been_made
     end
     it "returns the requested list" do
       lists = @client.lists
-      lists.should be_an Array
-      lists.first.should be_a Twitter::List
-      lists.first.name.should eq "Rubyists"
+      expect(lists).to be_an Array
+      expect(lists.first).to be_a Twitter::List
+      expect(lists.first.name).to eq "Rubyists"
     end
   end
 
   describe "#list" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/lists/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list("sferik", "presidents")
-        a_get("/1.1/lists/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
       it "returns the updated list" do
         list = @client.list("sferik", "presidents")
-        list.should be_a Twitter::List
-        list.name.should eq "presidents"
+        expect(list).to be_a Twitter::List
+        expect(list.name).to eq "presidents"
       end
     end
     context "with a user ID passed" do
       before do
-        stub_get("/1.1/lists/show.json").
-          with(:query => {:owner_id => '12345678', :slug => 'presidents'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/show.json").with(:query => {:owner_id => '12345678', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list(12345678, 'presidents')
-        a_get("/1.1/lists/show.json").
-          with(:query => {:owner_id => '12345678', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/show.json").with(:query => {:owner_id => '12345678', :slug => 'presidents'})).to have_been_made
       end
     end
     context "with a user object passed" do
       before do
-        stub_get("/1.1/lists/show.json").
-          with(:query => {:owner_id => '12345678', :slug => 'presidents'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/show.json").with(:query => {:owner_id => '12345678', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         user = Twitter::User.new(:id => '12345678')
         @client.list(user, 'presidents')
-        a_get("/1.1/lists/show.json").
-          with(:query => {:owner_id => '12345678', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/show.json").with(:query => {:owner_id => '12345678', :slug => 'presidents'})).to have_been_made
       end
     end
     context "without 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/lists/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          to_return(:body => fixture("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("/1.1/lists/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list("presidents")
-        a_get("/1.1/lists/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => 'sferik', :slug => 'presidents'})).to have_been_made
       end
     end
     context "with a list ID passed" do
       before do
-        stub_get("/1.1/lists/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         @client.list("sferik", 12345678)
-        a_get("/1.1/lists/show.json").
-          with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/show.json").with(:query => {:owner_screen_name => 'sferik', :list_id => '12345678'})).to have_been_made
       end
     end
     context "with a list object passed" do
       before do
-        stub_get("/1.1/lists/show.json").
-          with(:query => {:owner_id => '7505382', :list_id => '12345678'}).
-          to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/lists/show.json").with(:query => {:owner_id => '7505382', :list_id => '12345678'}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resource" do
         list = Twitter::List.new(:id => '12345678', :user => {:id => 7505382, :screen_name => 'sferik'})
         @client.list(list)
-        a_get("/1.1/lists/show.json").
-          with(:query => {:owner_id => '7505382', :list_id => '12345678'}).
-          should have_been_made
+        expect(a_get("/1.1/lists/show.json").with(:query => {:owner_id => '7505382', :list_id => '12345678'})).to have_been_made
       end
     end
   end