Merge pull request #75 from petergoldstein/feature/rspec_3_compatible

Make RSpec 3 compatible

Author: petergoldstein

spec/comment_spec.rb

@@ -9,27 +9,27 @@
 
   describe "that is valid" do
     it "should have a user" do
-      @comment.user.should_not be_nil
+      expect(@comment.user).not_to be_nil
     end
 
     it "should have a body" do
-      @comment.body.should_not be_nil
+      expect(@comment.body).not_to be_nil
     end
   end
 
   it "should not have a parent if it is a root Comment" do
-    @comment.parent.should be_nil
+    expect(@comment.parent).to be_nil
   end
 
   it "can have see how child Comments it has" do
-    @comment.children.size.should == 0
+    expect(@comment.children.size).to eq(0)
   end
 
   it "can add child Comments" do
     grandchild = Comment.new(:body => "This is a grandchild", :user => @user)
     grandchild.save!
     grandchild.move_to_child_of(@comment)
-    @comment.children.size.should == 1
+    expect(@comment.children.size).to eq(1)
   end    
 
   describe "after having a child added" do
@@ -39,11 +39,11 @@
     end
 
     it "can be referenced by its child" do    
-      @child.parent.should == @comment
+      expect(@child.parent).to eq(@comment)
     end
 
     it "can see its child" do
-      @comment.children.first.should == @child
+      expect(@comment.children.first).to eq(@child)
     end
   end
 
@@ -57,11 +57,11 @@
       end
 
       it "should return all the comments created by the passed user" do
-        @comments.should include(@user_comment)
+        expect(@comments).to include(@user_comment)
       end
 
       it "should not return comments created by non-passed users" do
-        @comments.should_not include(@non_user_comment)
+        expect(@comments).not_to include(@non_user_comment)
       end
     end
 
@@ -76,11 +76,11 @@
       end
 
       it "should return the comments for the passed commentable" do
-        @comments.should include(@user_comment)
+        expect(@comments).to include(@user_comment)
       end
 
       it "should not return the comments for non-passed commentables" do
-        @comments.should_not include(@other_comment)
+        expect(@comments).not_to include(@other_comment)
       end
     end
   end

spec/commentable_spec.rb

@@ -2,7 +2,7 @@
 
 describe "A class that is commentable" do
   it "can have many root comments" do
-    Commentable.new.comment_threads.respond_to?(:each).should be_true
+    expect(Commentable.new.comment_threads.respond_to?(:each)).to eq(true)
   end
 
   describe "when is destroyed" do
@@ -14,7 +14,7 @@
 
     it "also destroys its root comments" do
       @commentable.destroy
-      Comment.all.should_not include(@comment)
+      expect(Comment.all).not_to include(@comment)
     end
 
     it "also destroys its nested comments" do
@@ -23,8 +23,8 @@
       child.move_to_child_of(@comment)
 
       @commentable.destroy
-      Comment.all.should_not include(@comment)
-      Comment.all.should_not include(child)
+      expect(Comment.all).not_to include(@comment)
+      expect(Comment.all).not_to include(child)
     end
   end
 
@@ -45,11 +45,11 @@
       end
 
       it "should return the comments for the passed commentable" do
-        @comments.should include(@comment)
+        expect(@comments).to include(@comment)
       end
 
       it "should not return the comments for other commentables" do
-        @comments.should_not include(@other_comment)
+        expect(@comments).not_to include(@other_comment)
       end
     end
 
@@ -65,12 +65,12 @@
       end
 
       it "should return comments by the passed user" do
-        @comments.all? { |c| c.user == @user }.should be_true
+        expect(@comments.all? { |c| c.user == @user }).to eq(true)
       end
 
 
       it "should not return comments by other users" do
-        @comments.any? { |c| c.user != @user }.should be_false
+        expect(@comments.any? { |c| c.user != @user }).to eq(false)
       end
     end
   end
@@ -89,12 +89,12 @@
       end
 
       it "should return its own comments, ordered with the newest first" do
-        @comments.all? { |c| c.commentable_type == @commentable.class.to_s and c.commentable_id == @commentable.id }.should be_true
-        @comments.each_cons(2) { |c, c2| c.created_at.should > c2.created_at }
+        expect(@comments.all? { |c| c.commentable_type == @commentable.class.to_s and c.commentable_id == @commentable.id }).to eq(true)
+        @comments.each_cons(2) { |c, c2| expect(c.created_at).to be > c2.created_at }
       end
 
       it "should not include comments for other commentables" do
-        @comments.any? { |c| c.commentable_type != @commentable.class.to_s or c.commentable_id != @commentable.id }.should be_false
+        expect(@comments.any? { |c| c.commentable_type != @commentable.class.to_s or c.commentable_id != @commentable.id }).to eq(false)
       end
     end
   end