Download as
Browse Code »

Commit 80cbe729eec095784fe0711941b22d49714251f2

Authored by AntonioTerceiro
1 parent ad82a7f6
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

ActionItem691: do not point to ssl when it is disabled by the 

environment

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/branches/0.11.x@2519 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @80cbe72
... ... @@ -710,7 +710,7 @@ module ApplicationHelper
710 710  
711 711 def login_url
712 712 options = { :controller => 'account', :action => 'login' }
713   - options.merge!(:protocol => 'https://', :host => request.host) unless ENV['RAILS_ENV'] == 'development'
  713 + options.merge!(:protocol => 'https://', :host => request.host) unless ENV['RAILS_ENV'] == 'development' || environment.disable_ssl
714 714 url_for(options)
715 715 end
716 716  
... ...
test/unit/application_helper_test.rb
  Diff comments   View file @80cbe72
... ... @@ -221,6 +221,16 @@ class ApplicationHelperTest < Test::Unit::TestCase
221 221 assert_same foo, template_stylesheet_tag
222 222 end
223 223  
  224 + should 'not force ssl when environment has ssl disabled' do
  225 + environment = mock
  226 + environment.expects(:disable_ssl).returns(true).at_least_once
  227 + stubs(:environment).returns(environment)
  228 +
  229 + expects(:url_for).with(has_entries(:protocol => 'https://')).never
  230 + expects(:url_for).with(has_key(:controller)).returns("LALALA")
  231 + assert_equal "LALALA", login_url
  232 + end
  233 +
224 234 protected
225 235  
226 236 def content_tag(tag, content, options = {})
... ...