MS DG; more tests pass after making person have many people

This commit is contained in:
maxwell 2010-08-05 13:25:31 -07:00
parent 67d4aea1db
commit cc04d4e08d
5 changed files with 12 additions and 7 deletions

View file

@ -3,7 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
describe DashboardsController do describe DashboardsController do
render_views render_views
before do 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) request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user)
end end

View file

@ -5,6 +5,7 @@ describe PublicsController do
before do before do
@user = Factory.create(:user, :profile => Profile.new( :first_name => "bob", :last_name => "smith")) @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) request.env['warden'] = mock_model(Warden, :authenticate? => @user, :authenticate! => @user, :authenticate => @user)
end end

View file

@ -4,6 +4,7 @@ describe 'SocketsController' do
render_views render_views
before do before do
@user = Factory.create(:user) @user = Factory.create(:user)
@user.person.save
SocketsController.unstub!(:new) SocketsController.unstub!(:new)
#EventMachine::WebSocket.stub!(:start) #EventMachine::WebSocket.stub!(:start)
@controller = SocketsController.new @controller = SocketsController.new

View file

@ -4,6 +4,7 @@ describe Comment do
describe "user" do describe "user" do
before do before do
@user = Factory.create :user @user = Factory.create :user
@user.person.save
end end
it "should be able to comment on his own status" do it "should be able to comment on his own status" do
status = Factory.create(:status_message, :person => @user) status = Factory.create(:status_message, :person => @user)

View file

@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
describe Post do describe Post do
before do before do
@user = Factory.create(:user, :email => "bob@aol.com") @user = Factory.create(:user, :email => "bob@aol.com")
@user.person.save
end end
describe 'defaults' do describe 'defaults' do
@ -20,8 +21,8 @@ describe Post do
before do before do
@person_one = Factory.create(:person, :email => "some@dudes.com") @person_one = Factory.create(:person, :email => "some@dudes.com")
@person_two = Factory.create(:person, :email => "other@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)} (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)} (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)} (9..11).each { |n| Blog.create(:title => "title #{n}",:body => "test #{n}", :person => @person_two)}
Factory.create(:status_message) Factory.create(:status_message)
@ -51,10 +52,10 @@ describe Post do
@person_one = Factory.create(:person, :email => "some@dudes.com") @person_one = Factory.create(:person, :email => "some@dudes.com")
@person_two = Factory.create(:person, :email => "other@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(: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(: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) Factory.create(:bookmark, :title => "Google", :link => "http://google.com", :created_at => Time.now+5, :person => @person_two)
end end
@ -78,14 +79,14 @@ describe Post do
end end
describe 'xml' do describe 'xml' do
it 'should serialize to xml with its person' 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 (message.to_xml.to_s.include? @user.email).should == true
end end
end end
describe 'deletion' do describe 'deletion' do
it 'should delete a posts comments on delete' 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 @user.comment "hey", :on=> post
post.destroy post.destroy
Post.all(:id => post.id).empty?.should == true Post.all(:id => post.id).empty?.should == true