Download as
Browse Code »

Commit d6e22eff2bc833af0224342e510e457d66111f73

Authored by Victor Costa
1 parent 9883b50d
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

rails3: fix public_path from plugins 

Not sure if compute_public_path should be replaced by a simple File.join.
Consider the use of asset_path if the current solution isn't safe.
Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
lib/noosfero/plugin.rb
  Diff comments   View file @d6e22ef
@@ -107,7 +107,7 @@ class Noosfero::Plugin @@ -107,7 +107,7 @@ class Noosfero::Plugin
107 end 107 end
108 108
109 def public_path(file = '') 109 def public_path(file = '')
110 - compute_public_path((public_name + '/' + file), 'plugins') 110 + File.join('/plugins', public_name, file)
111 end 111 end
112 112
113 def root_path 113 def root_path
test/functional/application_controller_test.rb
  Diff comments   View file @d6e22ef
@@ -360,6 +360,9 @@ class ApplicationControllerTest < ActionController::TestCase @@ -360,6 +360,9 @@ class ApplicationControllerTest < ActionController::TestCase
360 environment.enable_plugin(Plugin1.name) 360 environment.enable_plugin(Plugin1.name)
361 environment.enable_plugin(Plugin2.name) 361 environment.enable_plugin(Plugin2.name)
362 362
  363 + ActionView::Helpers::AssetTagHelper::StylesheetIncludeTag.any_instance.stubs('asset_file_path!')
  364 + ActionView::Helpers::AssetTagHelper::JavascriptIncludeTag.any_instance.stubs('asset_file_path!')
  365 +
363 get :index 366 get :index
364 367
365 assert_tag :tag => 'link', :attributes => {:href => /#{plugin1_path}/, :type => 'text/css', :rel => 'stylesheet'} 368 assert_tag :tag => 'link', :attributes => {:href => /#{plugin1_path}/, :type => 'text/css', :rel => 'stylesheet'}
@@ -391,6 +394,8 @@ class ApplicationControllerTest < ActionController::TestCase @@ -391,6 +394,8 @@ class ApplicationControllerTest < ActionController::TestCase
391 environment.enable_plugin(Plugin1.name) 394 environment.enable_plugin(Plugin1.name)
392 environment.enable_plugin(Plugin2.name) 395 environment.enable_plugin(Plugin2.name)
393 396
  397 + ActionView::Helpers::AssetTagHelper::JavascriptIncludeTag.any_instance.stubs('asset_file_path!')
  398 +
394 get :index 399 get :index
395 400
396 assert_tag :tag => 'script', :attributes => {:src => /#{plugin1_path}/, :type => 'text/javascript'} 401 assert_tag :tag => 'script', :attributes => {:src => /#{plugin1_path}/, :type => 'text/javascript'}