Download as
Browse Code »

Commit 720fc0fc0be4af4784516386c24029db32ca4bfa

Authored by Larissa Reis
2 parents 587415cd 0ab63284
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'networks-interaction' into feedback 

[social-share] fixes previous update, that failed to change some files.
now i really did the merge with the "organized" branch, so everything
should be working the same.

Conflicts:
	app/views/content_viewer/view_page.html.erb
	lib/noosfero/plugin.rb
Showing 3 changed files with 28 additions and 3 deletions   Show diff stats
app/views/content_viewer/view_page.html.erb
  Diff comments   View file @720fc0f
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 42
43 <%= render :partial => 'shared/disabled_enterprise' %> 43 <%= render :partial => 'shared/disabled_enterprise' %>
44 44
45 -<%= @plugins.dispatch(:social_buttons_javascript, @page).collect { |content| instance_exec(&content) }.join("") %> 45 +<%= @plugins.dispatch(:social_buttons_contents).collect { |content| instance_exec(&content) }.join("") %>
46 <% if NOOSFERO_CONF['addthis_enabled'] %> 46 <% if NOOSFERO_CONF['addthis_enabled'] %>
47 <%= render :partial => 'addthis' %> 47 <%= render :partial => 'addthis' %>
48 <% end %> 48 <% end %>
lib/noosfero/plugin.rb
  Diff comments   View file @720fc0f
@@ -395,8 +395,8 @@ class Noosfero::Plugin @@ -395,8 +395,8 @@ class Noosfero::Plugin
395 end 395 end
396 396
397 # -> Adds social networks share buttons to content 397 # -> Adds social networks share buttons to content
398 - # returns = lambda block that creates html code  
399 - def social_buttons_javascript(environment) 398 + # returns = proc that creates html code
  399 + def social_buttons_contents
400 nil 400 nil
401 end 401 end
402 402
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @720fc0f
@@ -1391,4 +1391,29 @@ class ContentViewerControllerTest &lt; ActionController::TestCase @@ -1391,4 +1391,29 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
1391 assert_tag :tag => 'meta', :attributes => { :property => 'og:image', :content => /\/images\/x.png/ } 1391 assert_tag :tag => 'meta', :attributes => { :property => 'og:image', :content => /\/images\/x.png/ }
1392 end 1392 end
1393 1393
  1394 + should 'add social content on content view page from plugins' do
  1395 + class Plugin1 < Noosfero::Plugin
  1396 + def social_buttons_contents
  1397 + proc {"<strong>Plugin1 text</strong>"}
  1398 + end
  1399 + end
  1400 + class Plugin2 < Noosfero::Plugin
  1401 + def social_buttons_contents
  1402 + proc {"<div class='social-buttons'></div>"}
  1403 + end
  1404 + end
  1405 + Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
  1406 +
  1407 + Environment.default.enable_plugin(Plugin1.name)
  1408 + Environment.default.enable_plugin(Plugin2.name)
  1409 +
  1410 + page = profile.articles.build(:name => 'test')
  1411 + page.save!
  1412 +
  1413 + get :view_page, :profile => profile.identifier, :page => ['test']
  1414 +
  1415 + assert_tag :tag => 'strong', :content => 'Plugin1 text'
  1416 + assert_tag :tag => 'div', :attributes => {:class => 'social-buttons'}
  1417 + end
  1418 +
1394 end 1419 end