Download as
Browse Code »

Commit f2019b9b1eb0d3c67b6fc4b3ba871deffb8f9813

Authored by MoisesMachado
1 parent 41d5377e
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

ActionItem670: fixed 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/branches/0.11.x@2488 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @f2019b9
@@ -2,7 +2,7 @@ class AccountController < ApplicationController @@ -2,7 +2,7 @@ class AccountController < ApplicationController
2 2
3 inverse_captcha :field => 'e_mail' 3 inverse_captcha :field => 'e_mail'
4 4
5 - require_ssl :except => [ :login_popup ] 5 + require_ssl :except => [ :login_popup, :logout_popup ]
6 6
7 # say something nice, you goof! something sweet. 7 # say something nice, you goof! something sweet.
8 def index 8 def index
test/functional/account_controller_test.rb
  Diff comments   View file @f2019b9
@@ -529,6 +529,12 @@ class AccountControllerTest < Test::Unit::TestCase @@ -529,6 +529,12 @@ class AccountControllerTest < Test::Unit::TestCase
529 assert_response :success 529 assert_response :success
530 end 530 end
531 531
  532 + should 'allow logout_popup without SSL' do
  533 + @request.expects(:ssl?).returns(false).at_least_once
  534 + get :logout_popup
  535 + assert_response :success
  536 + end
  537 +
532 should 'point to SSL URL in login popup' do 538 should 'point to SSL URL in login popup' do
533 get :login_popup 539 get :login_popup
534 assert_tag :tag => 'form', :attributes => { :action => /^https:\/\// } 540 assert_tag :tag => 'form', :attributes => { :action => /^https:\/\// }