fixed the build. made photos dependent destroy with parent status message

This commit is contained in:
maxwell 2010-12-04 23:31:57 -08:00
parent cc3db3d2f3
commit a415ff5c5f
3 changed files with 15 additions and 8 deletions

View file

@ -12,7 +12,7 @@ class StatusMessage < Post
xml_reader :message
key :message, String
many :photos, :class => Photo, :foreign_key => :status_message_id
many :photos, :class => Photo, :foreign_key => :status_message_id, :dependent => :destroy
validate :message_or_photos_present?
attr_accessible :message

View file

@ -13,14 +13,10 @@ describe PublicsController do
describe '#receive' do
let(:xml) { "<walruses></walruses>" }
context 'success cases' do
it 'should 200 on successful receipt of a request' do
post :receive, :id =>user.person.id, :xml => xml
response.code.should == '200'
end
it 'enqueues a receive job' do
it 'should 200 on successful receipt of a request, and queues a job' do
Resque.should_receive(:enqueue).with(Jobs::ReceiveSalmon, user.id, xml).once
post :receive, :id =>user.person.id, :xml => xml
response.code.should == '200'
end
end

View file

@ -121,7 +121,6 @@ describe Photo do
it 'should set the remote_photo on marshalling' do
@photo.image.store! File.open(@fixture_name)
#security hax
user2 = Factory.create(:user)
aspect2 = user2.aspects.create(:name => "foobars")
@ -157,4 +156,16 @@ describe Photo do
proc{ @user.comment("big willy style", :on => @photo) }.should change(@photo.comments, :count).by(1)
end
end
context "deletion" do
it 'is deleted with parent status message' do
status_message = @user.build_post(:status_message, :message => "whattup", :to => @aspect.id)
status_message.photos << @photo2
status_message.save
proc {
status_message.destroy
}.should change(Photo, :count).by(-1)
end
end
end