Download as
Browse Code »

Commit 05beba715a74c2d58d1e634f0a5c2eae3b861a81

Authored by Larissa Reis
1 parent 413497b7
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

social-share-privacy: fixes units and functionals tests 

  After asset pipeline changes, `javascript_include_tag` doesn't take
  array as argument anymore.
Showing 2 changed files with 11 additions and 9 deletions   Show diff stats
plugins/social_share_privacy/lib/social_share_privacy_plugin.rb
  Diff comments   View file @05beba7
... ... @@ -19,11 +19,13 @@ class SocialSharePrivacyPlugin < Noosfero::Plugin
19 19 def article_extra_contents(article)
20 20 proc do
21 21 settings = Noosfero::Plugin::Settings.new(environment, SocialSharePrivacyPlugin)
  22 + modules = settings.get_setting(:networks).map { |service| "/plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }
22 23 locale = FastGettext.locale
23   - javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') +
24   - javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
25   - javascript_include_tag(settings.get_setting(:networks).map { |service| "plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }) +
26   - (locale != 'en' ? javascript_include_tag("plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
  24 + javascript_include_tag('/plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') +
  25 + javascript_include_tag('/plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
  26 + (modules.present? ? javascript_include_tag(*modules) : '') +
  27 + javascript_include_tag("/plugins/social_share_privacy/socialshareprivacy/javascripts/modules/facebook.js") +
  28 + (locale != 'en' ? javascript_include_tag("/plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
27 29 javascript_tag("jQuery.fn.socialSharePrivacy.settings.path_prefix = '../../plugins/social_share_privacy/socialshareprivacy/'; jQuery.fn.socialSharePrivacy.settings.order = #{settings.get_setting(:networks)}; jQuery(document).ready(function () { jQuery('.social-buttons').socialSharePrivacy({info_link_target: '_blank'});});") +
28 30 content_tag(:div, '', :class => "social-buttons")
29 31 end
... ...
plugins/social_share_privacy/test/functional/content_viewer_controller_test.rb
  Diff comments   View file @05beba7
... ... @@ -23,7 +23,7 @@ class ContentViewerControllerTest < ActionController::TestCase
23 23  
24 24 get :view_page, :profile => @profile.identifier, :page => ['test']
25 25  
26   - assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/socialshareprivacy\.js\??\d*/}
  26 + assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/socialshareprivacy\.js\??\d*/}
27 27 assert_tag :tag => 'div', :attributes => {:class => "social-buttons"}
28 28 end
29 29  
... ... @@ -34,8 +34,8 @@ class ContentViewerControllerTest < ActionController::TestCase
34 34  
35 35 get :view_page, :profile => @profile.identifier, :page => ['test']
36 36  
37   - assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/twitter\.js\??\d*/}
38   - assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/gplus\.js\??\d*/}
  37 + assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/twitter\.js\??\d*/}
  38 + assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/gplus\.js\??\d*/}
39 39 end
40 40  
41 41 should 'add javascript with string translations if not english' do
... ... @@ -45,12 +45,12 @@ class ContentViewerControllerTest < ActionController::TestCase
45 45  
46 46 get :view_page, :profile => @profile.identifier, :page => ['test']
47 47  
48   - assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.pt\.js\??\d*/}
  48 + assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.pt\.js\??\d*/}
49 49  
50 50 FastGettext.stubs(:locale).returns('en')
51 51  
52 52 get :view_page, :profile => @profile.identifier, :page => ['test']
53 53  
54   - assert_no_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.en\.js\??\d*/}
  54 + assert_no_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.en\.js\??\d*/}
55 55 end
56 56 end
... ...