From e414b1c553a195e29e0a7fe7c5eef81b56fef43e Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Thu, 21 Oct 2010 06:45:15 -0700
Subject: [PATCH] Fix some comment specs (still one failing). Remove warning
 from receive spec.

---
 .../{comments_spec.rb => comment_spec.rb}     | 52 ++++++++++---------
 spec/models/user/receive_spec.rb              |  2 +-
 2 files changed, 28 insertions(+), 26 deletions(-)
 rename spec/models/{comments_spec.rb => comment_spec.rb} (78%)

diff --git a/spec/models/comments_spec.rb b/spec/models/comment_spec.rb
similarity index 78%
rename from spec/models/comments_spec.rb
rename to spec/models/comment_spec.rb
index 248e9b640..e8c3c3ef4 100644
--- a/spec/models/comments_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -10,18 +10,22 @@ describe Comment do
 
   let(:user2)   {Factory.create(:user)}
   let(:aspect2) {user2.aspect(:name => "Lame-faces")}
-  describe 'User#comment' do
-      let(:status) {user.post(:status_message, :message => "hello", :to => aspect)}
-    it "should be able to comment on his own status" do
-      status.comments.should == []
 
-      user.comment "Yeah, it was great", :on => status
-      status.reload.comments.first.text.should == "Yeah, it was great"
+  describe 'User#comment' do
+    before do
+      @status = user.post(:status_message, :message => "hello", :to => aspect.id)
+    end
+
+    it "should be able to comment on his own status" do
+      @status.comments.should == []
+
+      user.comment "Yeah, it was great", :on => @status
+      @status.reload.comments.first.text.should == "Yeah, it was great"
     end
 
     it "should be able to comment on a person's status" do
-      user2.comment "sup dog", :on => status
-      status.reload.comments.first.text.should == "sup dog"
+      user2.comment "sup dog", :on => @status
+      @status.reload.comments.first.text.should == "sup dog"
     end
   end
 
@@ -42,34 +46,32 @@ describe Comment do
       @person_status = Factory.build(:status_message, :person => @person)
 
       user.reload
-      user_status = user.post :status_message, :message => "hi", :to => aspect.id
+      @user_status = user.post :status_message, :message => "hi", :to => aspect.id
 
       aspect.reload
       user.reload
     end
 
     it 'should receive a comment from a person not on the pod' do
-      user3 = Factory.create :user
+      user3 = Factory.create(:user)
       aspect3 = user3.aspect(:name => "blah")
 
       friend_users(user, aspect, user3, aspect3)
 
-      comment = Comment.new(:person_id => user3.person.id, :text => "hey", :post => user_status)
+      comment = Comment.new(:person_id => user3.person.id, :text => "hey", :post => @user_status)
       comment.creator_signature = comment.sign_with_key(user3.encryption_key)
-
-
       comment.post_creator_signature = comment.sign_with_key(user.encryption_key)
-      xml = user.salmon(comment).xml_for(user2)
+
+      xml = user.salmon(comment).xml_for(user3)
 
       user3.person.delete
       user3.delete
 
-
-      user_status.reload
-      user_status.comments.should == []
+      @user_status.reload
+      @user_status.comments.should == []
       user.receive_salmon(xml)
-      user_status.reload
-      user_status.comments.include?(comment).should be true
+      @user_status.reload
+      @user_status.comments.include?(comment).should be true
     end
 
     it "should send a user's comment on a person's post to that person" do
@@ -80,17 +82,17 @@ describe Comment do
     it 'should send a user comment on his own post to lots of people' do
 
       User::QUEUE.should_receive(:add_post_request).twice
-      user.comment "yo", :on => user_status
+      user.comment "yo", :on => @user_status
     end
 
     it 'should send a comment a person made on your post to all people' do
-      comment = Comment.new(:person_id => @person.id, :text => "balls", :post => user_status)
+      comment = Comment.new(:person_id => @person.id, :text => "balls", :post => @user_status)
       User::QUEUE.should_receive(:add_post_request).twice
       user.receive comment.to_diaspora_xml, @person
     end
 
     it 'should send a comment a user made on your post to all people' do
-      comment = user2.comment( "balls", :on => user_status)
+      comment = user2.comment( "balls", :on => @user_status)
       User::QUEUE.should_receive(:add_post_request).twice
       user.receive comment.to_diaspora_xml, user2.person
     end
@@ -108,13 +110,13 @@ describe Comment do
     end
 
     it 'should not clear the aspect post array on receiving a comment' do
-      aspect.post_ids.include?(user_status.id).should be true
-      comment = Comment.new(:person_id => @person.id, :text => "balls", :post => user_status)
+      aspect.post_ids.include?(@user_status.id).should be true
+      comment = Comment.new(:person_id => @person.id, :text => "balls", :post => @user_status)
 
       user.receive comment.to_diaspora_xml, @person
 
       aspect.reload
-      aspect.post_ids.include?(user_status.id).should be true
+      aspect.post_ids.include?(@user_status.id).should be true
     end
   end
   describe 'serialization' do
diff --git a/spec/models/user/receive_spec.rb b/spec/models/user/receive_spec.rb
index beca56c49..07b481b17 100644
--- a/spec/models/user/receive_spec.rb
+++ b/spec/models/user/receive_spec.rb
@@ -27,7 +27,7 @@ describe User do
     status_message.destroy
 
     user
-    lambda {user.receive xml , user2.person}.should change (Post,:count).by(1)
+    lambda {user.receive xml , user2.person}.should change(Post,:count).by(1)
   end
 
   it 'should not create new aspects on message receive' do