diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb index ceaafc437..6ea925212 100644 --- a/spec/controllers/status_messages_controller_spec.rb +++ b/spec/controllers/status_messages_controller_spec.rb @@ -162,10 +162,6 @@ describe StatusMessagesController do @photo1.reload.pending.should be_false @photo2.reload.pending.should be_false end - - it 'queues all photos to be processed' do - pending - end end end diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index a1b18ccb3..fef115151 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -191,36 +191,9 @@ describe Photo do end it 'is deleted with parent status message' do - proc { + expect { @status_message.destroy }.should change(Photo, :count).by(-1) end - - it 'deletes the parent object if there are no other photos or message' do - pending - proc { - @photo2.destroy - }.should change(StatusMessage, :count).by(-1) - end - - it 'does not delete the parent if the parent has other photos' do - pending - @status_message.photos << @photo - @status_message.save - - proc { - @photo2.destroy - }.should_not change(StatusMessage, :count) - end - - it 'does not delete the parent if the parent has a message' do - pending - @status_message.text = "hello there kids" - @status_message.save - - proc { - @photo2.destroy - }.should_not change(StatusMessage, :count) - end end end