Download as
Browse Code »

Commit 7708caad9f62f260b567912dc0666e42dbe335cf

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent e1db8da3
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1121: don't crash when logged out user tries to log out

Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @7708caa
@@ -94,8 +94,10 @@ class AccountController < ApplicationController @@ -94,8 +94,10 @@ class AccountController < ApplicationController
94 94
95 # action to perform logout from the application 95 # action to perform logout from the application
96 def logout 96 def logout
97 - self.current_user.person.update_attribute(:last_lang, cookies[:lang])  
98 - self.current_user.forget_me if logged_in? 97 + if logged_in?
  98 + self.current_user.person.update_attribute(:last_lang, cookies[:lang])
  99 + self.current_user.forget_me
  100 + end
99 cookies.delete :auth_token 101 cookies.delete :auth_token
100 reset_session 102 reset_session
101 flash[:notice] = _("You have been logged out.") 103 flash[:notice] = _("You have been logged out.")
test/functional/account_controller_test.rb
  Diff comments   View file @7708caa
@@ -627,6 +627,14 @@ class AccountControllerTest < Test::Unit::TestCase @@ -627,6 +627,14 @@ class AccountControllerTest < Test::Unit::TestCase
627 assert_tag :tag => 'input', :attributes => { :name => "profile_data[contact_phone]" } 627 assert_tag :tag => 'input', :attributes => { :name => "profile_data[contact_phone]" }
628 end 628 end
629 629
  630 + should 'redirect to login when unlogged user try logout' do
  631 + logout
  632 + assert_nothing_raised NoMethodError do
  633 + get :logout
  634 + assert_redirected_to :action => 'index'
  635 + end
  636 + end
  637 +
630 protected 638 protected
631 def new_user(options = {}, extra_options ={}) 639 def new_user(options = {}, extra_options ={})
632 data = {:profile_data => person_data} 640 data = {:profile_data => person_data}