[Git][noosfero/noosfero][master] 2 commits: social-share-privacy: fixes units and functionals tests

[Larissa Reis]

Larissa Reis pushed to branch master at Noosfero / noosfero


Commits:
05beba71 by Larissa Reis at 2015-06-24T17:01:09Z
social-share-privacy: fixes units and functionals tests

  After asset pipeline changes, `javascript_include_tag` doesn't take
  array as argument anymore.

- - - - -
dc5507b5 by Larissa Reis at 2015-06-24T17:01:09Z
social-share-privacy: always use absolute path

  Avoids social buttons breaking when used in contexts with deeper
  route, like inside a post on a route defined by a plugin or a deep
  folder tree. It was never a good idea to use relative path in the
  first place.

  Fixes Issue #61

- - - - -


2 changed files:

- plugins/social_share_privacy/lib/social_share_privacy_plugin.rb
- plugins/social_share_privacy/test/functional/content_viewer_controller_test.rb


Changes:

=====================================
plugins/social_share_privacy/lib/social_share_privacy_plugin.rb
=====================================
--- a/plugins/social_share_privacy/lib/social_share_privacy_plugin.rb
+++ b/plugins/social_share_privacy/lib/social_share_privacy_plugin.rb
@@ -19,12 +19,14 @@ class SocialSharePrivacyPlugin < Noosfero::Plugin
   def article_extra_contents(article)
     proc do
       settings = Noosfero::Plugin::Settings.new(environment, SocialSharePrivacyPlugin)
+      modules = settings.get_setting(:networks).map { |service| "/plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }
       locale = FastGettext.locale
-      javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') + 
-      javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
-      javascript_include_tag(settings.get_setting(:networks).map { |service| "plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }) + 
-      (locale != 'en' ? javascript_include_tag("plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
-      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'});});") +
+      javascript_include_tag('/plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') +
+      javascript_include_tag('/plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
+      (modules.present? ? javascript_include_tag(*modules) : '') +
+      javascript_include_tag("/plugins/social_share_privacy/socialshareprivacy/javascripts/modules/facebook.js") +
+      (locale != 'en' ? javascript_include_tag("/plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
+      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'});});") +
       content_tag(:div, '', :class => "social-buttons")
     end
   end


=====================================
plugins/social_share_privacy/test/functional/content_viewer_controller_test.rb
=====================================
--- a/plugins/social_share_privacy/test/functional/content_viewer_controller_test.rb
+++ b/plugins/social_share_privacy/test/functional/content_viewer_controller_test.rb
@@ -23,7 +23,7 @@ class ContentViewerControllerTest < ActionController::TestCase
 
     get :view_page, :profile => @profile.identifier, :page => ['test']
 
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/socialshareprivacy\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/socialshareprivacy\.js\??\d*/}
     assert_tag :tag => 'div', :attributes => {:class => "social-buttons"}
   end
 
@@ -34,8 +34,8 @@ class ContentViewerControllerTest < ActionController::TestCase
 
     get :view_page, :profile => @profile.identifier, :page => ['test']
 
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/twitter\.js\??\d*/}
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/gplus\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/twitter\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/gplus\.js\??\d*/}
   end
 
   should 'add javascript with string translations if not english' do
@@ -45,12 +45,12 @@ class ContentViewerControllerTest < ActionController::TestCase
 
     get :view_page, :profile => @profile.identifier, :page => ['test']
 
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.pt\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.pt\.js\??\d*/}
 
     FastGettext.stubs(:locale).returns('en')
 
     get :view_page, :profile => @profile.identifier, :page => ['test']
 
-    assert_no_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.en\.js\??\d*/}
+    assert_no_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.en\.js\??\d*/}
   end
 end



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/413497b7c3b72458758320f51f22c09a5e4668c0...dc5507b5e683bb381798f9af688fe5918d7e7a7b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150624/f008e3c4/attachment-0001.html>