spec/twog/twog_spec.rb in twog-0.3.2 vs spec/twog/twog_spec.rb in twog-0.3.3

@@ -1,52 +1,43 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
+require File.join(File.dirname(__FILE__), '/../spec_helper')
 
-describe Twog do 
+describe Twog do
   include Twog::Twog
 
-  it "should not tweet if there are no new blog posts" do
-    stub!(:get_posts_to_tweet).with(test_conf).and_return([])
-    stub!(:tweet).and_return(1)
+  it 'should not tweet if there are no new blog posts' do
+    allow(self).to receive(:get_posts_to_tweet).with(test_conf).and_return([])
+    allow(self).to receive(:tweet).and_return(1)
     result = run(test_conf)
-    result.should be nil
+    expect(result).to be_nil
   end
-  
-  it "should parse the rss feed and tweet new blog posts" do
+
+  it 'should parse the rss feed and tweet new blog posts' do
     entry = rss_entry
-    stub!(:get_posts_to_tweet).with(test_conf).and_return([entry])
-    stub!(:get_bitly_from)
-    stub!(:tweet).and_return(1)
+    allow(self).to receive(:get_posts_to_tweet).with(test_conf).and_return([entry])
+    allow(self).to receive(:get_bitly_from)
+    allow(self).to receive(:tweet).and_return(1)
     result = run(test_conf)
-    result.should == 1
+    expect(result).to eq(1)
   end
 
-  it "should return nil if bitly username is nil" do
+  it 'should return nil if bitly username is nil' do
     conf = test_conf
     conf['bitly_username'] = nil
-    get_bitly_from(conf).should be nil
+    expect(get_bitly_from(conf)).to be_nil
   end
-  
-  it "should return nil if bitly api key is nil" do
+
+  it 'should return nil if bitly api key is nil' do
     conf = test_conf
     conf['bitly_username'] = nil
-    get_bitly_from(conf).should be nil
+    expect(get_bitly_from(conf)).to be_nil
   end
 
-  it "should return nil if bitly api key is nil" do
-    Bitly.stub!(:new).and_return("hello")
-    get_bitly_from(test_conf).should == "hello"
+  it 'should return nil if bitly api key is nil' do
+    allow(Bitly).to receive(:new).and_return('hello')
+    expect(get_bitly_from(test_conf)).to eq('hello')
   end
 
-  it "should get the version" do
-    YAML.stub!(:load).and_return({:major => "1", :minor => "0", :patch => "0"})
-    version.should == "1.0.0"
-  end
-
-  it "should get the posts to tweet" do
-    conf = test_conf
-    self.should_receive(:parse_feed).with(conf['rss_feed']).and_return(1)
-    self.should_receive(:map).with(1).and_return(2)
-    self.should_receive(:get_new_blog_posts).with(2, conf['last_blog_post_tweeted'])
-
-    get_posts_to_tweet(conf)
+  it 'should get the version' do
+    allow(YAML).to receive(:load).and_return({major: '1', minor:'0', patch: '0'})
+    expect(version).to eq('1.0.0')
   end
 end