2 failures left in merge
This commit is contained in:
parent
738e8c65c8
commit
f87ddffc64
2 changed files with 4 additions and 4 deletions
|
|
@ -130,10 +130,10 @@ describe Photo do
|
||||||
thumb_url = @photo.url :thumb_medium
|
thumb_url = @photo.url :thumb_medium
|
||||||
|
|
||||||
xml = @photo.to_diaspora_xml
|
xml = @photo.to_diaspora_xml
|
||||||
id = @photo.id
|
|
||||||
|
|
||||||
@photo.destroy
|
@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 = Photo.where(:guid => @photo.guid).first
|
||||||
new_photo.url.nil?.should be false
|
new_photo.url.nil?.should be false
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue