twitter 4.1.0 → 4.1.1

data/spec/twitter/action/retweet_spec.rb

@@ -5,36 +5,36 @@ describe Twitter::Action::Retweet do
   describe "#sources" do
     it "returns a collection of users who retweeted a user" do
       sources = Twitter::Action::Retweet.new(:sources => [{:id => 7505382}]).sources
-      sources.should be_an Array
-      sources.first.should be_a Twitter::User
+      expect(sources).to be_an Array
+      expect(sources.first).to be_a Twitter::User
     end
     it "is empty when not set" do
       sources = Twitter::Action::Retweet.new.sources
-      sources.should be_empty
+      expect(sources).to be_empty
     end
   end
 
   describe "#target_objects" do
     it "returns a collection of retweets" do
       targets = Twitter::Action::Retweet.new(:target_objects => [{:id => 25938088801}]).target_objects
-      targets.should be_an Array
-      targets.first.should be_a Twitter::Tweet
+      expect(targets).to be_an Array
+      expect(targets.first).to be_a Twitter::Tweet
     end
     it "is empty when not set" do
       targets = Twitter::Action::Retweet.new.target_objects
-      targets.should be_empty
+      expect(targets).to be_empty
     end
   end
 
   describe "#targets" do
     it "returns a collection containing the retweeted user" do
       targets = Twitter::Action::Retweet.new(:targets => [{:id => 7505382}]).targets
-      targets.should be_an Array
-      targets.first.should be_a Twitter::User
+      expect(targets).to be_an Array
+      expect(targets.first).to be_a Twitter::User
     end
     it "is empty when not set" do
       targets = Twitter::Action::Retweet.new.targets
-      targets.should be_empty
+      expect(targets).to be_empty
     end
   end
 

data/spec/twitter/action_factory_spec.rb

@@ -5,32 +5,30 @@ describe Twitter::ActionFactory do
   describe ".new" do
     it "generates a Favorite" do
       action = Twitter::ActionFactory.fetch_or_new(:action => 'favorite')
-      action.should be_a Twitter::Action::Favorite
+      expect(action).to be_a Twitter::Action::Favorite
     end
     it "generates a Follow" do
       action = Twitter::ActionFactory.fetch_or_new(:action => 'follow')
-      action.should be_a Twitter::Action::Follow
+      expect(action).to be_a Twitter::Action::Follow
     end
     it "generates a ListMemberAdded" do
       action = Twitter::ActionFactory.fetch_or_new(:action => 'list_member_added')
-      action.should be_a Twitter::Action::ListMemberAdded
+      expect(action).to be_a Twitter::Action::ListMemberAdded
     end
     it "generates a Mention" do
       action = Twitter::ActionFactory.fetch_or_new(:action => 'mention')
-      action.should be_a Twitter::Action::Mention
+      expect(action).to be_a Twitter::Action::Mention
     end
     it "generates a Reply" do
       action = Twitter::ActionFactory.fetch_or_new(:action => 'reply')
-      action.should be_a Twitter::Action::Reply
+      expect(action).to be_a Twitter::Action::Reply
     end
     it "generates a Retweet" do
       action = Twitter::ActionFactory.fetch_or_new(:action => 'retweet')
-      action.should be_a Twitter::Action::Retweet
+      expect(action).to be_a Twitter::Action::Retweet
     end
     it "raises an ArgumentError when action is not specified" do
-      lambda do
-        Twitter::ActionFactory.fetch_or_new
-      end.should raise_error(ArgumentError, "argument must have :action key")
+      expect{Twitter::ActionFactory.fetch_or_new}.to raise_error(ArgumentError, "argument must have :action key")
     end
   end
 

data/spec/twitter/action_spec.rb

@@ -5,11 +5,11 @@ describe Twitter::Action do
   describe "#created_at" do
     it "returns a Time when created_at is set" do
       user = Twitter::User.new(:id => 7505382, :created_at => "Mon Jul 16 12:59:01 +0000 2007")
-      user.created_at.should be_a Time
+      expect(user.created_at).to be_a Time
     end
     it "returns nil when created_at is not set" do
       user = Twitter::User.new(:id => 7505382)
-      user.created_at.should be_nil
+      expect(user.created_at).to be_nil
     end
   end
 

data/spec/twitter/api/account_spec.rb

@@ -8,172 +8,144 @@ describe Twitter::API do
 
   describe "#verify_credentials" 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.verify_credentials
-      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
     it "returns the requesting user" do
       user = @client.verify_credentials
-      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
 
   describe "#update_delivery_device" do
     before do
-      stub_post("/1.1/account/update_delivery_device.json").
-        with(:body => {:device => "sms"}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_delivery_device.json").with(:body => {:device => "sms"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.update_delivery_device("sms")
-      a_post("/1.1/account/update_delivery_device.json").
-        with(:body => {:device => "sms"}).
-        should have_been_made
+      expect(a_post("/1.1/account/update_delivery_device.json").with(:body => {:device => "sms"})).to have_been_made
     end
     it "returns a user" do
       user = @client.update_delivery_device("sms")
-      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
 
   describe "#update_profile" do
     before do
-      stub_post("/1.1/account/update_profile.json").
-        with(:body => {:url => "http://github.com/sferik/"}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile.json").with(:body => {:url => "http://github.com/sferik/"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.update_profile(:url => "http://github.com/sferik/")
-      a_post("/1.1/account/update_profile.json").
-        with(:body => {:url => "http://github.com/sferik/"}).
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile.json").with(:body => {:url => "http://github.com/sferik/"})).to have_been_made
     end
     it "returns a user" do
       user = @client.update_profile(:url => "http://github.com/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
 
   describe "#update_profile_background_image" do
     before do
-      stub_post("/1.1/account/update_profile_background_image.json").
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile_background_image.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.update_profile_background_image(fixture("we_concept_bg2.png"))
-      a_post("/1.1/account/update_profile_background_image.json").
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile_background_image.json")).to have_been_made
     end
     it "returns a user" do
       user = @client.update_profile_background_image(fixture("we_concept_bg2.png"))
-      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
 
   describe "#update_profile_colors" do
     before do
-      stub_post("/1.1/account/update_profile_colors.json").
-        with(:body => {:profile_background_color => "000000"}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile_colors.json").with(:body => {:profile_background_color => "000000"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.update_profile_colors(:profile_background_color => "000000")
-      a_post("/1.1/account/update_profile_colors.json").
-        with(:body => {:profile_background_color => "000000"}).
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile_colors.json").with(:body => {:profile_background_color => "000000"})).to have_been_made
     end
     it "returns a user" do
       user = @client.update_profile_colors(:profile_background_color => "000000")
-      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
 
   describe "#update_profile_image" do
     before do
-      stub_post("/1.1/account/update_profile_image.json").
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile_image.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.update_profile_image(fixture("me.jpeg"))
-      a_post("/1.1/account/update_profile_image.json").
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile_image.json")).to have_been_made
     end
     it "returns a user" do
       user = @client.update_profile_image(fixture("me.jpeg"))
-      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
 
   describe "#update_profile_banner" do
     before do
-      stub_post("/1.1/account/update_profile_banner.json").
-        to_return(:body => fixture("empty.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile_banner.json").to_return(:body => fixture("empty.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.update_profile_banner(fixture("me.jpeg"))
-      a_post("/1.1/account/update_profile_banner.json").
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile_banner.json")).to have_been_made
     end
     it "returns a user" do
       user = @client.update_profile_banner(fixture("me.jpeg"))
-      user.should be_nil
+      expect(user).to be_nil
     end
   end
 
   describe "#remove_profile_banner" do
     before do
-      stub_post("/1.1/account/remove_profile_banner.json").
-        to_return(:body => fixture("empty.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/remove_profile_banner.json").to_return(:body => fixture("empty.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.remove_profile_banner
-      a_post("/1.1/account/remove_profile_banner.json").
-        should have_been_made
+      expect(a_post("/1.1/account/remove_profile_banner.json")).to have_been_made
     end
     it "returns a user" do
       user = @client.remove_profile_banner
-      user.should be_nil
+      expect(user).to be_nil
     end
   end
 
   describe "#settings" do
     before do
-      stub_get("/1.1/account/settings.json").
-        to_return(:body => fixture("settings.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_post("/1.1/account/settings.json").
-        with(:body => {:trend_location_woeid => "23424803"}).
-        to_return(:body => fixture("settings.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/account/settings.json").to_return(:body => fixture("settings.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/settings.json").with(:body => {:trend_location_woeid => "23424803"}).to_return(:body => fixture("settings.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource on GET" do
       @client.settings
-      a_get("/1.1/account/settings.json").
-        should have_been_made
+      expect(a_get("/1.1/account/settings.json")).to have_been_made
     end
     it "returns settings" do
       settings = @client.settings
-      settings.should be_a Twitter::Settings
-      settings.language.should eq 'en'
+      expect(settings).to be_a Twitter::Settings
+      expect(settings.language).to eq 'en'
     end
     it "requests the correct resource on POST" do
       @client.settings(:trend_location_woeid => "23424803")
-      a_post("/1.1/account/settings.json").
-        with(:body => {:trend_location_woeid => "23424803"}).
-        should have_been_made
+      expect(a_post("/1.1/account/settings.json").with(:body => {:trend_location_woeid => "23424803"})).to have_been_made
     end
     it "returns settings" do
       settings = @client.settings(:trend_location_woeid => "23424803")
-      settings.should be_a Twitter::Settings
-      settings.language.should eq 'en'
+      expect(settings).to be_a Twitter::Settings
+      expect(settings.language).to eq 'en'
     end
   end
 

data/spec/twitter/api/activity_spec.rb

@@ -8,33 +8,29 @@ describe Twitter::API do
 
   describe "#activity_about_me" do
     before do
-      stub_get("/i/activity/about_me.json").
-        to_return(:body => fixture("about_me.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/i/activity/about_me.json").to_return(:body => fixture("about_me.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.activity_about_me
-      a_get("/i/activity/about_me.json").
-        should have_been_made
+      expect(a_get("/i/activity/about_me.json")).to have_been_made
     end
     it "returns activity about me" do
       activity_about_me = @client.activity_about_me
-      activity_about_me.first.should be_a Twitter::Action::Mention
+      expect(activity_about_me.first).to be_a Twitter::Action::Mention
     end
   end
 
   describe "#activity_by_friends" do
     before do
-      stub_get("/i/activity/by_friends.json").
-        to_return(:body => fixture("by_friends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/i/activity/by_friends.json").to_return(:body => fixture("by_friends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.activity_by_friends
-      a_get("/i/activity/by_friends.json").
-        should have_been_made
+      expect(a_get("/i/activity/by_friends.json")).to have_been_made
     end
     it "returns activity by friends" do
       activity_by_friends = @client.activity_by_friends
-      activity_by_friends.first.should be_a Twitter::Action::Favorite
+      expect(activity_by_friends.first).to be_a Twitter::Action::Favorite
     end
   end
 

data/spec/twitter/api/blocks_spec.rb

@@ -8,159 +8,114 @@ describe Twitter::API do
 
   describe "#blocking" do
     before do
-      stub_get("/1.1/blocks/list.json").
-        with(:query => {:cursor => "-1"}).
-        to_return(:body => fixture("users_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/blocks/list.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("users_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.blocking
-      a_get("/1.1/blocks/list.json").
-        with(:query => {:cursor => "-1"}).
-        should have_been_made
+      expect(a_get("/1.1/blocks/list.json").with(:query => {:cursor => "-1"})).to have_been_made
     end
     it "returns an array of user objects that the authenticating user is blocking" do
       blocking = @client.blocking
-      blocking.should be_a Twitter::Cursor
-      blocking.users.should be_an Array
-      blocking.users.first.should be_a Twitter::User
-      blocking.users.first.id.should eq 7505382
+      expect(blocking).to be_a Twitter::Cursor
+      expect(blocking.users).to be_an Array
+      expect(blocking.users.first).to be_a Twitter::User
+      expect(blocking.users.first.id).to eq 7505382
     end
   end
 
   describe "#blocked_ids" do
     before do
-      stub_get("/1.1/blocks/ids.json").
-        with(:query => {:cursor => "-1"}).
-        to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/blocks/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.blocked_ids
-      a_get("/1.1/blocks/ids.json").
-        with(:query => {:cursor => "-1"}).
-        should have_been_made
+      expect(a_get("/1.1/blocks/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
     end
     it "returns an array of numeric user IDs the authenticating user is blocking" do
       blocked_ids = @client.blocked_ids
-      blocked_ids.should be_a Twitter::Cursor
-      blocked_ids.ids.should be_an Array
-      blocked_ids.ids.first.should eq 14100886
+      expect(blocked_ids).to be_a Twitter::Cursor
+      expect(blocked_ids.ids).to be_an Array
+      expect(blocked_ids.ids.first).to eq 14100886
     end
   end
 
   describe "#block?" do
     context "with a screen name passed" do
       before do
-        stub_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "1305102810874389703"}).
-          to_return(:body => fixture("ids_list2.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("pengwynn.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"})
+        stub_get("/1.1/blocks/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/blocks/ids.json").with(:query => {:cursor => "1305102810874389703"}).to_return(:body => fixture("ids_list2.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("pengwynn.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.block?("sferik")
-        a_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
-        a_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "1305102810874389703"}).
-          should have_been_made
-        a_get("/1.1/users/show.json").
-          with(:query => {:screen_name => "sferik"}).
-          should have_been_made
+        expect(a_get("/1.1/blocks/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
+        expect(a_get("/1.1/blocks/ids.json").with(:query => {:cursor => "1305102810874389703"})).to have_been_made
+        expect(a_get("/1.1/users/show.json").with(:query => {:screen_name => "sferik"})).to have_been_made
       end
       it "returns true if block exists" do
         block = @client.block?("pengwynn")
-        block.should be_true
+        expect(block).to be_true
       end
       it "returns false if block does not exist" do
         block = @client.block?("sferik")
-        block.should be_false
+        expect(block).to be_false
       end
     end
     context "with a user ID passed" do
       before do
-        stub_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "1305102810874389703"}).
-          to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/blocks/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/blocks/ids.json").with(:query => {:cursor => "1305102810874389703"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resources" do
         @client.block?(7505382)
-        a_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
-        a_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "1305102810874389703"}).
-          should have_been_made
+        expect(a_get("/1.1/blocks/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
+        expect(a_get("/1.1/blocks/ids.json").with(:query => {:cursor => "1305102810874389703"})).to have_been_made
       end
     end
     context "with a user object passed" do
       before do
-        stub_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "-1"}).
-          to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "1305102810874389703"}).
-          to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/blocks/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("ids_list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/blocks/ids.json").with(:query => {:cursor => "1305102810874389703"}).to_return(:body => fixture("ids_list2.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "requests the correct resources" do
         user = Twitter::User.new(:id => '7505382')
         @client.block?(user)
-        a_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "-1"}).
-          should have_been_made
-        a_get("/1.1/blocks/ids.json").
-          with(:query => {:cursor => "1305102810874389703"}).
-          should have_been_made
+        expect(a_get("/1.1/blocks/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
+        expect(a_get("/1.1/blocks/ids.json").with(:query => {:cursor => "1305102810874389703"})).to have_been_made
       end
     end
   end
 
   describe "#block" do
     before do
-      stub_post("/1.1/blocks/create.json").
-        with(:body => {:screen_name => "sferik"}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/blocks/create.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.block("sferik")
-      a_post("/1.1/blocks/create.json").
-        should have_been_made
+      expect(a_post("/1.1/blocks/create.json")).to have_been_made
     end
     it "returns an array of blocked users" do
       users = @client.block("sferik")
-      users.should be_an Array
-      users.first.should be_a Twitter::User
-      users.first.id.should eq 7505382
+      expect(users).to be_an Array
+      expect(users.first).to be_a Twitter::User
+      expect(users.first.id).to eq 7505382
     end
   end
 
   describe "#unblock" do
     before do
-      stub_post("/1.1/blocks/destroy.json").
-        with(:body => {:screen_name => "sferik"}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/blocks/destroy.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "requests the correct resource" do
       @client.unblock("sferik")
-      a_post("/1.1/blocks/destroy.json").
-        with(:body => {:screen_name => "sferik"}).
-        should have_been_made
+      expect(a_post("/1.1/blocks/destroy.json").with(:body => {:screen_name => "sferik"})).to have_been_made
     end
     it "returns an array of un-blocked users" do
       users = @client.unblock("sferik")
-      users.should be_an Array
-      users.first.should be_a Twitter::User
-      users.first.id.should eq 7505382
+      expect(users).to be_an Array
+      expect(users.first).to be_a Twitter::User
+      expect(users.first.id).to eq 7505382
     end
   end