Putting fixtures in specs...

1 files changed, 13 insertions, 13 deletions

diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index ad4fa790e..61a89fdd8 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -7,14 +7,14 @@ require 'spec_helper'
 describe CommentsController do
   render_views
 
-  let!(:user1)   { Factory.create(:user) }
-  let!(:aspect1) { user1.aspects.create(:name => "AWESOME!!") }
+  before do
+    @user1 = alice
+    @user2 = bob
 
-  let!(:user2)   { Factory.create(:user) }
-  let!(:aspect2) { user2.aspects.create(:name => "WIN!!") }
+    @aspect1 = @user1.aspects.first
+    @aspect2 = @user2.aspects.first
 
-  before do
-    sign_in :user, user1
+    sign_in :user, @user1
   end
 
   describe '#create' do
@@ -24,7 +24,7 @@ describe CommentsController do
     }
     context "on my own post" do
       before do
-        @post = user1.post :status_message, :message => 'GIANTS', :to => aspect1.id
+        @post = @user1.post :status_message, :message => 'GIANTS', :to => @aspect1.id
       end
       it 'responds to format js' do
         post :create, comment_hash.merge(:format => 'js')
@@ -35,8 +35,8 @@ describe CommentsController do
 
     context "on a post from a contact" do
       before do
-        connect_users(user1, aspect1, user2, aspect2)
-        @post = user2.post :status_message, :message => 'GIANTS', :to => aspect2.id
+        connect_users(@user1, @aspect1, @user2, @aspect2)
+        @post = @user2.post :status_message, :message => 'GIANTS', :to => @aspect2.id
       end
       it 'comments' do
         post :create, comment_hash
@@ -46,10 +46,10 @@ describe CommentsController do
         new_user = Factory.create(:user)
         comment_hash[:person_id] = new_user.person.id.to_s
         post :create, comment_hash
-        Comment.find_by_text(comment_hash[:text]).person_id.should == user1.person.id
+        Comment.find_by_text(comment_hash[:text]).person_id.should == @user1.person.id
       end
       it "doesn't overwrite id" do
-        old_comment = user1.comment("hello", :on => @post)
+        old_comment = @user1.comment("hello", :on => @post)
         comment_hash[:id] = old_comment.id
         post :create, comment_hash
         old_comment.reload.text.should == 'hello'
@@ -57,10 +57,10 @@ describe CommentsController do
     end
     context 'on a post from a stranger' do
       before do
-        @post = user2.post :status_message, :message => 'GIANTS', :to => aspect2.id
+        @post = @user2.post :status_message, :message => 'GIANTS', :to => @aspect2.id
       end
       it 'posts no comment' do
-        user1.should_not_receive(:comment)
+        @user1.should_not_receive(:comment)
         post :create, comment_hash
         response.code.should == '406'
       end