test fixing

1 files changed, 15 insertions, 15 deletions

diff --git a/spec/models/blog_posts_spec.rb b/spec/models/blog_posts_spec.rb
index ef1cbf8..f83dc91 100644
--- a/spec/models/blog_posts_spec.rb
+++ b/spec/models/blog_posts_spec.rb
@@ -17,7 +17,7 @@ describe BlogPost do
     end
 
     it "requires body" do
-      BlogPost.new(@attr.merge(:body => "")).should_not be_valid
+      BlogPost.new(@attr.merge(:body => nil)).should_not be_valid
     end
   end
 
@@ -55,8 +55,8 @@ describe BlogPost do
 
   describe "by_archive scope" do
     it "returns all posts from specified month" do
-      blog_post1 = Factory(:post, :published_at => Time.now - 2.minutes)
-      blog_post2 = Factory(:post, :published_at => Time.now - 1.minute)
+      blog_post1 = Factory(:post, :published_at => Time.now.advance(:minutes => -2))
+      blog_post2 = Factory(:post, :published_at => Time.now.advance(:minutes => -1))
       Factory(:post, :published_at => Time.now - 2.months)
       date = "#{Time.now.month}/#{Time.now.year}"
       BlogPost.by_archive(Time.parse(date)).count.should == 2
@@ -66,8 +66,8 @@ describe BlogPost do
 
   describe "all_previous scope" do
     it "returns all posts from previous months" do
-      blog_post1 = Factory(:post, :published_at => Time.now - 1.month)
-      blog_post2 = Factory(:post, :published_at => Time.now - 1.month)
+      blog_post1 = Factory(:post, :published_at => Time.now.advance(:months => -2))
+      blog_post2 = Factory(:post, :published_at => Time.now.advance(:months => -1))
       Factory(:post, :published_at => Time.now)
       BlogPost.all_previous.count.should == 2
       BlogPost.all_previous.should == [blog_post2, blog_post1]
@@ -76,8 +76,8 @@ describe BlogPost do
 
   describe "live scope" do
     it "returns all posts which aren't in draft and pub date isn't in future" do
-      blog_post1 = Factory(:post, :published_at => Time.now - 2.minutes)
-      blog_post2 = Factory(:post, :published_at => Time.now - 1.minute)
+      blog_post1 = Factory(:post, :published_at => Time.now.advance(:minutes => -2))
+      blog_post2 = Factory(:post, :published_at => Time.now.advance(:minutes => -1))
       Factory(:post, :draft => true)
       Factory(:post, :published_at => Time.now + 1.minute)
       BlogPost.live.count.should == 2
@@ -87,16 +87,16 @@ describe BlogPost do
 
   describe "next scope" do
     it "returns next article based on given article" do
-      blog_post1 = Factory(:post)
-      blog_post2 = Factory(:post, :published_at => Time.now + 1.minute)
+      blog_post1 = Factory(:post, :published_at => Time.now.advance(:minutes => -1))
+      blog_post2 = Factory(:post)
       BlogPost.next(blog_post1).should == [blog_post2]
     end
   end
 
   describe "previous scope" do
     it "returns previous article based on given article" do
-      blog_post1 = Factory(:post)
-      blog_post2 = Factory(:post, :published_at => Time.now + 1.minute)
+      blog_post1 = Factory(:post, :published_at => Time.now.advance(:minutes => -1))
+      blog_post2 = Factory(:post)
       BlogPost.previous(blog_post2).should == [blog_post1]
     end
   end
@@ -123,14 +123,14 @@ describe BlogPost do
     end
 
     it "returns false if post pub date is in future" do
-      Factory(:post, :published_at => Time.now + 1.minute).live?.should be_false
+      Factory(:post, :published_at => Time.now.advance(:minutes => 1)).live?.should be_false
     end
   end
 
   describe "#next" do
     it "returns next article when called on current article" do
-      Factory(:post)
-      blog_post = Factory(:post, :published_at => Time.now + 1.minute)
+      Factory(:post, :published_at => Time.now.advance(:minutes => -1))
+      blog_post = Factory(:post)
       blog_posts = BlogPost.all
       blog_posts.last.next.should == blog_post
     end
@@ -139,7 +139,7 @@ describe BlogPost do
   describe "#prev" do
     it "returns previous article when called on current article" do
       Factory(:post)
-      blog_post = Factory(:post, :published_at => Time.now - 1.minute)
+      blog_post = Factory(:post, :published_at => Time.now.advance(:minutes => -1))
       blog_posts = BlogPost.all
       blog_posts.first.prev.should == blog_post
     end