2 failures left in merge

This commit is contained in:
Raphael 2011-01-14 16:35:41 -08:00
parent 738e8c65c8
commit f87ddffc64
2 changed files with 4 additions and 4 deletions

View file

@ -130,10 +130,10 @@ describe Photo do
thumb_url = @photo.url :thumb_medium
xml = @photo.to_diaspora_xml
id = @photo.id
@photo.destroy
@photo.receive(user2, @user.person)
zord = Postzord::Receiver.new(user2, :person => @photo.person)
zord.parse_and_receive(xml)
new_photo = Photo.where(:guid => @photo.guid).first
new_photo.url.nil?.should be false