diff options
author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-05-24 00:54:03 +0400 |
---|---|---|
committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-05-24 00:56:42 +0400 |
commit | d22878f3f0141443094e315ba93fb92a7e2f1368 (patch) | |
tree | 789fd47fea3a4c429361a4b93c6fdf5afcf10644 | |
parent | 6a88abb6dd6a63e0f47fbc0358c70c1537bf5b5b (diff) |
Fix AS::Photo federation, hopefully
-rw-r--r-- | app/models/activity_streams/photo.rb | 1 | ||||
-rw-r--r-- | spec/factories.rb | 9 | ||||
-rw-r--r-- | spec/models/activity_streams/photo_spec.rb | 8 |
3 files changed, 18 insertions, 0 deletions
diff --git a/app/models/activity_streams/photo.rb b/app/models/activity_streams/photo.rb index 4932fff89..44ada54b2 100644 --- a/app/models/activity_streams/photo.rb +++ b/app/models/activity_streams/photo.rb @@ -5,6 +5,7 @@ class ActivityStreams::Photo < Post include Diaspora::Socketable + xml_name "activity_streams::_photo" xml_attr :image_url xml_attr :image_height xml_attr :image_width diff --git a/spec/factories.rb b/spec/factories.rb index 7b6173d09..b7f7aac31 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -104,3 +104,12 @@ Factory.define(:notification) do |n| end end +Factory.define(:activity_streams_photo, :class => ActivityStreams::Photo) do |p| + p.association(:author, :factory => :person) + p.image_url "http://example.com/awesome.png" + p.image_height 9001 + p.image_width 4 + p.object_url "http://example.com/awesome_things.html" + p.actor_url "http://notcubbi.es/cubber" + p.provider_display_name "not cubbies" +end diff --git a/spec/models/activity_streams/photo_spec.rb b/spec/models/activity_streams/photo_spec.rb index 4081676ec..f334bc2e5 100644 --- a/spec/models/activity_streams/photo_spec.rb +++ b/spec/models/activity_streams/photo_spec.rb @@ -25,4 +25,12 @@ JSON end end + + describe 'serialization' do + it 'Diaspora::Parser should pick the right class' do + photo = Factory(:activity_streams_photo) + xml = photo.to_diaspora_xml.to_s + Diaspora::Parser.from_xml(xml).class.should == ActivityStreams::Photo + end + end end |