Commit fef0290fe54f6d4d894436dc3847e32f521efc0d

Authored by Braulio Bhavamitra
1 parent e839a89d
Exists in staging

open_graph: fix test after fixes on notifications

plugins/open_graph/lib/ext/uploaded_file.rb
... ... @@ -3,6 +3,6 @@ require_dependency 'uploaded_file'
3 3 class UploadedFile
4 4  
5 5 extend OpenGraphPlugin::AttachStories::ClassMethods
6   - open_graph_attach_stories only: :add_an_image
  6 + open_graph_attach_stories only: [:add_an_image, :add_a_document]
7 7  
8 8 end
... ...
plugins/open_graph/lib/open_graph_plugin/stories.rb
... ... @@ -28,11 +28,9 @@ class OpenGraphPlugin::Stories
28 28 models: :UploadedFile,
29 29 on: :create,
30 30 criteria: proc do |article, actor|
31   - article.is_a? UploadedFile
  31 + article.is_a? UploadedFile and not article.image?
32 32 end,
33 33 publish_if: proc do |uploaded_file, actor|
34   - # done in add_an_image
35   - next false if uploaded_file.image?
36 34 uploaded_file.published?
37 35 end,
38 36 object_data_url: proc do |uploaded_file, actor|
... ... @@ -49,10 +47,10 @@ class OpenGraphPlugin::Stories
49 47 models: :UploadedFile,
50 48 on: :create,
51 49 criteria: proc do |article, actor|
52   - article.is_a? UploadedFile
  50 + article.is_a? UploadedFile and article.image?
53 51 end,
54 52 publish_if: proc do |uploaded_file, actor|
55   - uploaded_file.image? and uploaded_file.parent.is_a? Gallery
  53 + uploaded_file.published? and uploaded_file.parent.is_a? Gallery
56 54 end,
57 55 object_data_url: proc do |uploaded_file, actor|
58 56 uploaded_file.url.merge view: true
... ...
plugins/open_graph/test/unit/open_graph_graph/publisher_test.rb
... ... @@ -54,13 +54,13 @@ class OpenGraphPlugin::PublisherTest < ActiveSupport::TestCase
54 54 blog_post = TextArticle.create! profile: user, parent: blog, name: 'blah', author: user
55 55 assert_last_activity user, :create_an_article, url_for(blog_post)
56 56  
  57 + document = UploadedFile.create! uploaded_data: fixture_file_upload('/files/doctest.en.xhtml', 'text/html'), profile: user
  58 + assert_last_activity user, :add_a_document, url_for(document, document.url.merge(view: true))
  59 +
57 60 gallery = Gallery.create! name: 'gallery', profile: user
58 61 image = UploadedFile.create! uploaded_data: fixture_file_upload('/files/rails.png', 'image/png'), parent: gallery, profile: user
59 62 assert_last_activity user, :add_an_image, url_for(image, image.url.merge(view: true))
60 63  
61   - document = UploadedFile.create! uploaded_data: fixture_file_upload('/files/doctest.en.xhtml', 'text/html'), profile: user
62   - assert_last_activity user, :add_a_document, url_for(document, document.url.merge(view: true))
63   -
64 64 event = Event.create! name: 'event', profile: user
65 65 assert_last_activity user, :create_an_event, url_for(event)
66 66  
... ...