From cc04d4e08d308a1e076decdf988d1f490f31e4fe Mon Sep 17 00:00:00 2001 From: maxwell Date: Thu, 5 Aug 2010 13:25:31 -0700 Subject: [PATCH] MS DG; more tests pass after making person have many people --- spec/controllers/dashboards_controller_spec.rb | 3 ++- spec/controllers/publics_controller_spec.rb | 1 + spec/controllers/sockets_controller_spec.rb | 1 + spec/models/comments_spec.rb | 1 + spec/models/post_spec.rb | 13 +++++++------ 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/spec/controllers/dashboards_controller_spec.rb b/spec/controllers/dashboards_controller_spec.rb index b05603fb6..8652223c5 100644 --- a/spec/controllers/dashboards_controller_spec.rb +++ b/spec/controllers/dashboards_controller_spec.rb @@ -3,7 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper' describe DashboardsController do render_views before do - @user = Factory.create(:user, :profile => Profile.new( :first_name => "bob", :last_name => "smith")) + @user = Factory.create(:user) + @user.person.save request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user) end diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb index 132210e66..d473ae936 100644 --- a/spec/controllers/publics_controller_spec.rb +++ b/spec/controllers/publics_controller_spec.rb @@ -5,6 +5,7 @@ describe PublicsController do before do @user = Factory.create(:user, :profile => Profile.new( :first_name => "bob", :last_name => "smith")) + @user.person.save request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user) end diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb index a5109e356..71310c94e 100644 --- a/spec/controllers/sockets_controller_spec.rb +++ b/spec/controllers/sockets_controller_spec.rb @@ -4,6 +4,7 @@ describe 'SocketsController' do render_views before do @user = Factory.create(:user) + @user.person.save SocketsController.unstub!(:new) #EventMachine::WebSocket.stub!(:start) @controller = SocketsController.new diff --git a/spec/models/comments_spec.rb b/spec/models/comments_spec.rb index 4f5b79115..d1a7d2135 100644 --- a/spec/models/comments_spec.rb +++ b/spec/models/comments_spec.rb @@ -4,6 +4,7 @@ describe Comment do describe "user" do before do @user = Factory.create :user + @user.person.save end it "should be able to comment on his own status" do status = Factory.create(:status_message, :person => @user) diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index aac4898aa..84f8c8299 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Post do before do @user = Factory.create(:user, :email => "bob@aol.com") + @user.person.save end describe 'defaults' do @@ -20,8 +21,8 @@ describe Post do before do @person_one = Factory.create(:person, :email => "some@dudes.com") @person_two = Factory.create(:person, :email => "other@dudes.com") - (2..4).each {|n| Blog.create(:title => "title #{n}", :body => "test #{n}", :person => @person_one)} - (5..8).each { |n| Blog.create(:title => "title #{n}",:body => "test #{n}", :person => @user)} + (2..4).each {|n| Blog.create(:title => "title #{n}", :body => "test #{n}", :person => @person_one.person)} + (5..8).each { |n| Blog.create(:title => "title #{n}",:body => "test #{n}", :person => @user.person)} (9..11).each { |n| Blog.create(:title => "title #{n}",:body => "test #{n}", :person => @person_two)} Factory.create(:status_message) @@ -51,10 +52,10 @@ describe Post do @person_one = Factory.create(:person, :email => "some@dudes.com") @person_two = Factory.create(:person, :email => "other@dudes.com") - Factory.create(:status_message, :message => "puppies", :created_at => Time.now+1, :person => @owner) + Factory.create(:status_message, :message => "puppies", :created_at => Time.now+1, :person => @owner.person) Factory.create(:bookmark, :title => "Reddit", :link => "http://reddit.com", :created_at => Time.now+2, :person => @person_one) Factory.create(:status_message, :message => "kittens", :created_at => Time.now+3, :person => @person_two) - Factory.create(:blog, :title => "Bears", :body => "Bear's body", :created_at => Time.now+4, :person => @owner) + Factory.create(:blog, :title => "Bears", :body => "Bear's body", :created_at => Time.now+4, :person => @owner.person) Factory.create(:bookmark, :title => "Google", :link => "http://google.com", :created_at => Time.now+5, :person => @person_two) end @@ -78,14 +79,14 @@ describe Post do end describe 'xml' do it 'should serialize to xml with its person' do - message = Factory.create(:status_message, :person => @user) + message = Factory.create(:status_message, :person => @user.person) (message.to_xml.to_s.include? @user.email).should == true end end describe 'deletion' do it 'should delete a posts comments on delete' do - post = Factory.create(:status_message, :person => @user) + post = Factory.create(:status_message, :person => @user.person) @user.comment "hey", :on=> post post.destroy Post.all(:id => post.id).empty?.should == true