twitter 4.1.0 → 4.1.1

data/spec/twitter/error/client_error_spec.rb

@@ -11,14 +11,10 @@ describe Twitter::Error::ClientError do
       context "when HTTP status is #{status} and body is #{body.inspect}" do
         before do
           body_message = '{"' + body + '":"Client Error"}' unless body.nil?
-          stub_get("/1.1/statuses/user_timeline.json").
-            with(:query => {:screen_name => 'sferik'}).
-            to_return(:status => status, :body => body_message)
+          stub_get("/1.1/statuses/user_timeline.json").with(:query => {:screen_name => 'sferik'}).to_return(:status => status, :body => body_message)
         end
         it "raises #{exception.name}" do
-          lambda do
-            @client.user_timeline('sferik')
-          end.should raise_error(exception)
+          expect{@client.user_timeline('sferik')}.to raise_error(exception)
         end
       end
     end
@@ -26,14 +22,10 @@ describe Twitter::Error::ClientError do
 
   context "when response status is 404 from lookup" do
     before do
-      stub_post("/1.1/users/lookup.json").
-        with(:body => {:screen_name => "not_on_twitter"}).
-        to_return(:status => 404, :body => fixture('no_user_matches.json'))
+      stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "not_on_twitter"}).to_return(:status => 404, :body => fixture('no_user_matches.json'))
     end
     it "raises Twitter::Error::NotFound" do
-      lambda do
-        @client.users('not_on_twitter')
-      end.should raise_error(Twitter::Error::NotFound)
+      expect{@client.users('not_on_twitter')}.to raise_error(Twitter::Error::NotFound)
     end
   end
 

data/spec/twitter/error/server_error_spec.rb

@@ -9,14 +9,10 @@ describe Twitter::Error::ServerError do
   Twitter::Error::ServerError.errors.each do |status, exception|
     context "when HTTP status is #{status}" do
       before do
-        stub_get("/1.1/statuses/user_timeline.json").
-          with(:query => {:screen_name => 'sferik'}).
-          to_return(:status => status)
+        stub_get("/1.1/statuses/user_timeline.json").with(:query => {:screen_name => 'sferik'}).to_return(:status => status)
       end
       it "raises #{exception.name}" do
-        lambda do
-          @client.user_timeline('sferik')
-        end.should raise_error(exception)
+        expect{@client.user_timeline('sferik')}.to raise_error(exception)
       end
     end
   end

data/spec/twitter/error_spec.rb

@@ -10,8 +10,8 @@ describe Twitter::Error do
         begin
           raise Twitter::Error
         rescue Twitter::Error => error
-          error.message.should eq "Oups"
-          error.wrapped_exception.class.should eq Faraday::Error::ClientError
+          expect(error.message).to eq "Oups"
+          expect(error.wrapped_exception.class).to eq Faraday::Error::ClientError
         end
       end
     end

data/spec/twitter/geo/point_spec.rb

@@ -10,31 +10,31 @@ describe Twitter::Geo::Point do
     it "returns false for empty objects" do
       point = Twitter::Geo::Point.new
       other = Twitter::Geo::Point.new
-      (point == other).should be_false
+      expect(point == other).to be_false
     end
     it "returns true when objects coordinates are the same" do
       other = Twitter::Geo::Point.new(:coordinates => [-122.399983, 37.788299])
-      (@point == other).should be_true
+      expect(@point == other).to be_true
     end
     it "returns false when objects coordinates are different" do
       other = Twitter::Geo::Point.new(:coordinates => [37.788299, -122.399983])
-      (@point == other).should be_false
+      expect(@point == other).to be_false
     end
     it "returns false when classes are different" do
       other = Twitter::Geo.new(:coordinates => [-122.399983, 37.788299])
-      (@point == other).should be_false
+      expect(@point == other).to be_false
     end
   end
 
   describe "#latitude" do
     it "returns the latitude" do
-      @point.latitude.should eq(-122.399983)
+      expect(@point.latitude).to eq -122.399983
     end
   end
 
   describe "#longitude" do
     it "returns the longitude" do
-      @point.longitude.should eq 37.788299
+      expect(@point.longitude).to eq 37.788299
     end
   end
 

data/spec/twitter/geo/polygon_spec.rb

@@ -10,19 +10,19 @@ describe Twitter::Geo::Polygon do
     it "returns false for empty objects" do
       polygon = Twitter::Geo::Polygon.new
       other = Twitter::Geo::Polygon.new
-      (polygon == other).should be_false
+      expect(polygon == other).to be_false
     end
     it "returns true when objects coordinates are the same" do
       other = Twitter::Geo::Polygon.new(:coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]])
-      (@polygon == other).should be_true
+      expect(@polygon == other).to be_true
     end
     it "returns false when objects coordinates are different" do
       other = Twitter::Geo::Polygon.new(:coordinates => [[[37.77752898, -122.40348192], [37.77752898, -122.387436], [37.79448597, -122.387436], [37.79448597, -122.40348192]]])
-      (@polygon == other).should be_false
+      expect(@polygon == other).to be_false
     end
     it "returns false when classes are different" do
       other = Twitter::Geo.new(:coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]])
-      (@polygon == other).should be_false
+      expect(@polygon == other).to be_false
     end
   end
 

data/spec/twitter/geo_factory_spec.rb

@@ -5,16 +5,14 @@ describe Twitter::GeoFactory do
   describe ".new" do
     it "generates a Point" do
       geo = Twitter::GeoFactory.fetch_or_new(:type => 'Point')
-      geo.should be_a Twitter::Geo::Point
+      expect(geo).to be_a Twitter::Geo::Point
     end
     it "generates a Polygon" do
       geo = Twitter::GeoFactory.fetch_or_new(:type => 'Polygon')
-      geo.should be_a Twitter::Geo::Polygon
+      expect(geo).to be_a Twitter::Geo::Polygon
     end
     it "raises an ArgumentError when type is not specified" do
-      lambda do
-        Twitter::GeoFactory.fetch_or_new
-      end.should raise_error(ArgumentError, "argument must have :type key")
+      expect{Twitter::GeoFactory.fetch_or_new}.to raise_error(ArgumentError, "argument must have :type key")
     end
   end
 

data/spec/twitter/geo_spec.rb

@@ -10,19 +10,19 @@ describe Twitter::Geo do
     it "returns false for empty objects" do
       geo = Twitter::Geo.new
       other = Twitter::Geo.new
-      (geo == other).should be_false
+      expect(geo == other).to be_false
     end
     it "returns true when objects coordinates are the same" do
       other = Twitter::Geo.new(:coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]])
-      (@geo == other).should be_true
+      expect(@geo == other).to be_true
     end
     it "returns false when objects coordinates are different" do
       other = Twitter::Geo.new(:coordinates => [[[37.77752898, -122.40348192], [37.77752898, -122.387436], [37.79448597, -122.387436], [37.79448597, -122.40348192]]])
-      (@geo == other).should be_false
+      expect(@geo == other).to be_false
     end
     it "returns false when classes are different" do
       other = Twitter::Geo::Polygon.new(:coordinates => [[[-122.40348192, 37.77752898], [-122.387436, 37.77752898], [-122.387436, 37.79448597], [-122.40348192, 37.79448597]]])
-      (@geo == other).should be_false
+      expect(@geo == other).to be_false
     end
   end
 

data/spec/twitter/identifiable_spec.rb

@@ -4,13 +4,11 @@ describe Twitter::Identity do
 
   describe "#initialize" do
     it "raises an ArgumentError when type is not specified" do
-      lambda do
-        Twitter::Identity.new
-      end.should raise_error(ArgumentError, "argument must have an :id key")
+      expect{Twitter::Identity.new}.to raise_error(ArgumentError, "argument must have an :id key")
     end
   end
 
-  context 'identity map enabled' do
+  context "identity map enabled" do
     before do
       Twitter.identity_map = Twitter::IdentityMap
     end
@@ -19,16 +17,14 @@ describe Twitter::Identity do
       Twitter.identity_map = false
     end
 
-    describe '.fetch' do
-      it 'returns existing objects' do
+    describe ".fetch" do
+      it "returns existing objects" do
         Twitter::Identity.store(Twitter::Identity.new(:id => 1))
-        Twitter::Identity.fetch(:id => 1).should be
+        expect(Twitter::Identity.fetch(:id => 1)).to be
       end
 
       it "raises an error on objects that don't exist" do
-        lambda {
-          Twitter::Identity.fetch(:id => 6)
-        }.should raise_error(Twitter::Error::IdentityMapKeyError)
+        expect{Twitter::Identity.fetch(:id => 6)}.to raise_error(Twitter::Error::IdentityMapKeyError)
       end
     end
   end
@@ -37,17 +33,17 @@ describe Twitter::Identity do
     it "returns true when objects IDs are the same" do
       one = Twitter::Identity.new(:id => 1, :screen_name => "sferik")
       two = Twitter::Identity.new(:id => 1, :screen_name => "garybernhardt")
-      (one == two).should be_true
+      expect(one == two).to be_true
     end
     it "returns false when objects IDs are different" do
       one = Twitter::Identity.new(:id => 1)
       two = Twitter::Identity.new(:id => 2)
-      (one == two).should be_false
+      expect(one == two).to be_false
     end
     it "returns false when classes are different" do
       one = Twitter::Identity.new(:id => 1)
       two = Twitter::Base.new(:id => 1)
-      (one == two).should be_false
+      expect(one == two).to be_false
     end
   end
 

data/spec/twitter/list_spec.rb

@@ -6,39 +6,39 @@ describe Twitter::List do
     it "returns true when objects IDs are the same" do
       list = Twitter::List.new(:id => 1, :slug => "foo")
       other = Twitter::List.new(:id => 1, :slug => "bar")
-      (list == other).should be_true
+      expect(list == other).to be_true
     end
     it "returns false when objects IDs are different" do
       list = Twitter::List.new(:id => 1)
       other = Twitter::List.new(:id => 2)
-      (list == other).should be_false
+      expect(list == other).to be_false
     end
     it "returns false when classes are different" do
       list = Twitter::List.new(:id => 1)
       other = Twitter::Identity.new(:id => 1)
-      (list == other).should be_false
+      expect(list == other).to be_false
     end
   end
 
   describe "#created_at" do
     it "returns a Time when created_at is set" do
       user = Twitter::List.new(:id => 8863586, :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::List.new(:id => 8863586)
-      user.created_at.should be_nil
+      expect(user.created_at).to be_nil
     end
   end
 
   describe "#user" do
     it "returns a User when user is set" do
       user = Twitter::List.new(:id => 8863586, :user => {:id => 7505382}).user
-      user.should be_a Twitter::User
+      expect(user).to be_a Twitter::User
     end
     it "returns nil when status is not set" do
       user = Twitter::List.new(:id => 8863586).user
-      user.should be_nil
+      expect(user).to be_nil
     end
   end
 

data/spec/twitter/media/photo_spec.rb

@@ -6,29 +6,29 @@ describe Twitter::Media::Photo do
     it "returns true when objects IDs are the same" do
       photo = Twitter::Media::Photo.new(:id => 1, :url => "foo")
       other = Twitter::Media::Photo.new(:id => 1, :url => "bar")
-      (photo == other).should be_true
+      expect(photo == other).to be_true
     end
     it "returns false when objects IDs are different" do
       photo = Twitter::Media::Photo.new(:id => 1)
       other = Twitter::Media::Photo.new(:id => 2)
-      (photo == other).should be_false
+      expect(photo == other).to be_false
     end
     it "returns false when classes are different" do
       photo = Twitter::Media::Photo.new(:id => 1)
       other = Twitter::Identity.new(:id => 1)
-      (photo == other).should be_false
+      expect(photo == other).to be_false
     end
   end
 
   describe "#sizes" do
     it "returns a hash of Sizes when sizes is set" do
       sizes = Twitter::Media::Photo.new(:id => 110102452988157952, :sizes => {:small => {:h => 226, :w => 340, :resize => 'fit'}, :large => {:h => 466, :w => 700, :resize => 'fit'}, :medium => {:h => 399, :w => 600, :resize => 'fit'}, :thumb => {:h => 150, :w => 150, :resize => 'crop'}}).sizes
-      sizes.should be_a Hash
-      sizes[:small].should be_a Twitter::Size
+      expect(sizes).to be_a Hash
+      expect(sizes[:small]).to be_a Twitter::Size
     end
     it "is empty when sizes is not set" do
       sizes = Twitter::Media::Photo.new(:id => 110102452988157952).sizes
-      sizes.should be_empty
+      expect(sizes).to be_empty
     end
   end
 

data/spec/twitter/media_factory_spec.rb

@@ -5,12 +5,10 @@ describe Twitter::MediaFactory do
   describe ".new" do
     it "generates a Photo" do
       media = Twitter::MediaFactory.fetch_or_new(:id => 1, :type => 'photo')
-      media.should be_a Twitter::Media::Photo
+      expect(media).to be_a Twitter::Media::Photo
     end
     it "raises an ArgumentError when type is not specified" do
-      lambda do
-        Twitter::MediaFactory.fetch_or_new
-      end.should raise_error(ArgumentError, "argument must have :type key")
+      expect{Twitter::MediaFactory.fetch_or_new}.to raise_error(ArgumentError, "argument must have :type key")
     end
   end
 

data/spec/twitter/oembed_spec.rb

@@ -5,142 +5,142 @@ describe Twitter::OEmbed do
   describe "#author_url" do
     it "returns the author's url" do
       oembed = Twitter::OEmbed.new(:author_url => 'https://twitter.com/sferik')
-      oembed.author_url.should eq "https://twitter.com/sferik"
+      expect(oembed.author_url).to eq "https://twitter.com/sferik"
     end
 
     it "returns nil when not set" do
       author_url = Twitter::OEmbed.new.author_url
-      author_url.should be_nil
+      expect(author_url).to be_nil
     end
   end
 
   describe "#author_name" do
     it "returns the author's name" do
       oembed = Twitter::OEmbed.new(:author_name => 'Erik Michaels-Ober')
-      oembed.author_name.should eq "Erik Michaels-Ober"
+      expect(oembed.author_name).to eq "Erik Michaels-Ober"
     end
 
     it "returns nil when not set" do
       author_name = Twitter::OEmbed.new.author_name
-      author_name.should be_nil
+      expect(author_name).to be_nil
     end
   end
 
   describe "#cache_age" do
     it "returns the cache_age" do
       oembed = Twitter::OEmbed.new(:cache_age => '31536000000')
-      oembed.cache_age.should eq "31536000000"
+      expect(oembed.cache_age).to eq "31536000000"
     end
 
     it "returns nil when not set" do
       cache_age = Twitter::OEmbed.new.cache_age
-      cache_age.should be_nil
+      expect(cache_age).to be_nil
     end
   end
 
   describe "#height" do
     it "returns the height" do
       oembed = Twitter::OEmbed.new(:height => 200)
-      oembed.height.should eq 200
+      expect(oembed.height).to eq 200
     end
 
     it "returns it as an Integer" do
       oembed = Twitter::OEmbed.new(:height => 200)
-      oembed.height.should be_an Integer
+      expect(oembed.height).to be_an Integer
     end
 
     it "returns nil when not set" do
       height = Twitter::OEmbed.new.height
-      height.should be_nil
+      expect(height).to be_nil
     end
   end
 
   describe "#html" do
     it "returns the html" do
       oembed = Twitter::OEmbed.new(:html => '<blockquote>all my <b>witty tweet</b> stuff here</blockquote>')
-      oembed.html.should eq "<blockquote>all my <b>witty tweet</b> stuff here</blockquote>"
+      expect(oembed.html).to eq "<blockquote>all my <b>witty tweet</b> stuff here</blockquote>"
     end
 
     it "returns nil when not set" do
       html = Twitter::OEmbed.new.html
-      html.should be_nil
+      expect(html).to be_nil
     end
   end
 
   describe "#provider_name" do
     it "returns the provider_name" do
       oembed = Twitter::OEmbed.new(:provider_name => 'Twitter')
-      oembed.provider_name.should eq "Twitter"
+      expect(oembed.provider_name).to eq "Twitter"
     end
 
     it "returns nil when not set" do
       provider_name = Twitter::OEmbed.new.provider_name
-      provider_name.should be_nil
+      expect(provider_name).to be_nil
     end
   end
 
   describe "#provider_url" do
     it "returns the provider_url" do
       oembed = Twitter::OEmbed.new(:provider_url => 'http://twitter.com')
-      oembed.provider_url.should eq "http://twitter.com"
+      expect(oembed.provider_url).to eq "http://twitter.com"
     end
 
     it "returns nil when not set" do
       provider_url = Twitter::OEmbed.new.provider_url
-      provider_url.should be_nil
+      expect(provider_url).to be_nil
     end
   end
 
   describe "#type" do
     it "returns the type" do
       oembed = Twitter::OEmbed.new(:type => 'rich')
-      oembed.type.should eq "rich"
+      expect(oembed.type).to eq "rich"
     end
 
     it "returns nil when not set" do
       type = Twitter::OEmbed.new.type
-      type.should be_nil
+      expect(type).to be_nil
     end
   end
 
   describe "#width" do
     it "returns the width" do
       oembed = Twitter::OEmbed.new(:width => 550)
-      oembed.width.should eq 550
+      expect(oembed.width).to eq 550
     end
 
     it "returns it as an Integer" do
       oembed = Twitter::OEmbed.new(:width => 550)
-      oembed.width.should be_an Integer
+      expect(oembed.width).to be_an Integer
     end
 
     it "returns nil when not set" do
       width = Twitter::OEmbed.new.width
-      width.should be_nil
+      expect(width).to be_nil
     end
   end
 
   describe "#url" do
     it "returns the url" do
       oembed = Twitter::OEmbed.new(:url => 'https://twitter.com/twitterapi/status/133640144317198338')
-      oembed.url.should eq "https://twitter.com/twitterapi/status/133640144317198338"
+      expect(oembed.url).to eq "https://twitter.com/twitterapi/status/133640144317198338"
     end
 
     it "returns nil when not set" do
       url = Twitter::OEmbed.new.url
-      url.should be_nil
+      expect(url).to be_nil
     end
   end
 
   describe "#version" do
     it "returns the version" do
       oembed = Twitter::OEmbed.new(:version => '1.0')
-      oembed.version.should eq "1.0"
+      expect(oembed.version).to eq "1.0"
     end
 
     it "returns nil when not set" do
       version = Twitter::OEmbed.new.version
-      version.should be_nil
+      expect(version).to be_nil
     end
   end
 end