Download as
Browse Code »

Commit 316dd059568c3769ece5837015e35eb304486a4e

Authored by Antonio Terceiro
1 parent 404845b8
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

Fix AccountController tests

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
test/functional/account_controller_test.rb
  Diff comments   View file @316dd05
... ... @@ -148,7 +148,7 @@ class AccountControllerTest < ActionController::TestCase
148 148 def test_should_delete_token_on_logout
149 149 login_as :johndoe
150 150 get :logout
151   - assert_equal @response.cookies["auth_token"], []
  151 + assert_nil @response.cookies["auth_token"]
152 152 end
153 153  
154 154 # "remember_me" feature is disabled; uncommend this if it is enabled again.
... ... @@ -662,7 +662,7 @@ class AccountControllerTest < ActionController::TestCase
662 662 assert_response :success
663 663 post :login, :user => {:login => 'testuser', :password => 'test123'}
664 664 assert_not_nil session[:user]
665   - assert_redirected_to :controller => 'profile_editor', :profile => 'testuser'
  665 + assert_redirected_to :controller => 'profile_editor', :profile => 'testuser', :action => 'index'
666 666 end
667 667  
668 668 should 'not activate user when activation code is missing' do
... ...