X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/36b0a3d1355fcbac0ab4a121e09a899a7d21a748..20e03c73bb7755dec0c63a6beb40e747496d6e7b:/test/controllers/confirmations_controller_test.rb diff --git a/test/controllers/confirmations_controller_test.rb b/test/controllers/confirmations_controller_test.rb index f583e5e39..083619962 100644 --- a/test/controllers/confirmations_controller_test.rb +++ b/test/controllers/confirmations_controller_test.rb @@ -185,7 +185,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest post user_save_path, :params => { :read_ct => 1, :read_tou => 1 } confirm_string = User.find_by(:email => user.email).tokens.create.token - User.find_by(:display_name => user.display_name).update(:status => "deleted") + User.find_by(:display_name => user.display_name).hide! # Get the confirmation page get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string } @@ -242,7 +242,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest post user_new_path, :params => { :user => user.attributes } post user_save_path, :params => { :read_ct => 1, :read_tou => 1 } - User.find_by(:display_name => user.display_name).update(:status => "deleted") + User.find_by(:display_name => user.display_name).hide! assert_no_difference "ActionMailer::Base.deliveries.size" do perform_enqueued_jobs do @@ -283,7 +283,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest post user_confirm_email_path, :params => { :confirm_string => confirm_string } assert_response :redirect - assert_redirected_to :controller => :users, :action => :account, :display_name => user.display_name + assert_redirected_to edit_account_path assert_match(/Confirmed your change of email address/, flash[:notice]) end @@ -293,14 +293,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest post user_confirm_email_path, :params => { :confirm_string => confirm_string } assert_response :redirect - assert_redirected_to :controller => :users, :action => :account, :display_name => user.display_name + assert_redirected_to edit_account_path assert_match(/already been confirmed/, flash[:error]) end def test_confirm_email_bad_token post user_confirm_email_path, :params => { :confirm_string => "XXXXX" } - assert_response :success - assert_template :confirm_email + assert_response :redirect + assert_redirected_to edit_account_path assert_match(/confirmation code has expired or does not exist/, flash[:error]) end @@ -317,7 +317,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_not user.image_use_gravatar post user_confirm_email_path, :params => { :confirm_string => confirm_string } assert_response :redirect - assert_redirected_to :controller => :users, :action => :account, :display_name => user.display_name + assert_redirected_to edit_account_path assert_match(/Confirmed your change of email address/, flash[:notice]) # gravatar use should now be enabled assert User.find(user.id).image_use_gravatar @@ -332,7 +332,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert user.image_use_gravatar post user_confirm_email_path, :params => { :confirm_string => confirm_string } assert_response :redirect - assert_redirected_to :controller => :users, :action => :account, :display_name => user.display_name + assert_redirected_to edit_account_path assert_match(/Confirmed your change of email address/, flash[:notice]) # gravatar use should now be disabled assert_not User.find(user.id).image_use_gravatar