X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c20160d313286739fc14e89162a3afff6ccc906f..b77c9f863d94327fc3e579ab3a00ffcb81293cde:/test/controllers/users_controller_test.rb?ds=sidebyside diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index e021513da..8ad9c6fab 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -14,16 +14,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest { :controller => "users", :action => "create" } ) - assert_routing( - { :path => "/user/terms", :method => :get }, - { :controller => "users", :action => "terms" } - ) - - assert_routing( - { :path => "/user/save", :method => :post }, - { :controller => "users", :action => "save" } - ) - assert_routing( { :path => "/user/go_public", :method => :post }, { :controller => "users", :action => "go_public" } @@ -38,15 +28,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest { :path => "/user/username", :method => :get }, { :controller => "users", :action => "show", :display_name => "username" } ) - - assert_routing( - { :path => "/user/username/set_status", :method => :post }, - { :controller => "users", :action => "set_status", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username", :method => :delete }, - { :controller => "users", :action => "destroy", :display_name => "username" } - ) end # The user creation page loads @@ -212,71 +193,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear end - def test_terms_agreed - user = create(:user, :terms_seen => true, :terms_agreed => Date.yesterday) - - session_for(user) - - get user_terms_path - assert_redirected_to edit_account_path - end - - def test_terms_not_seen_without_referer - user = create(:user, :terms_seen => false, :terms_agreed => nil) - - session_for(user) - - get user_terms_path - assert_response :success - assert_template :terms - - post user_save_path, :params => { :user => { :consider_pd => true }, :read_ct => 1, :read_tou => 1 } - assert_redirected_to edit_account_path - assert_equal "Thanks for accepting the new contributor terms!", flash[:notice] - - user.reload - - assert user.consider_pd - assert_not_nil user.terms_agreed - assert user.terms_seen - end - - def test_terms_not_seen_with_referer - user = create(:user, :terms_seen => false, :terms_agreed => nil) - - session_for(user) - - get user_terms_path, :params => { :referer => "/test" } - assert_response :success - assert_template :terms - - post user_save_path, :params => { :user => { :consider_pd => true }, :referer => "/test", :read_ct => 1, :read_tou => 1 } - assert_redirected_to "/test" - assert_equal "Thanks for accepting the new contributor terms!", flash[:notice] - - user.reload - - assert user.consider_pd - assert_not_nil user.terms_agreed - assert user.terms_seen - end - - # Check that if you haven't seen the terms, and make a request that requires authentication, - # that your request is redirected to view the terms - def test_terms_not_seen_redirection - user = create(:user, :terms_seen => false, :terms_agreed => nil) - session_for(user) - - get edit_account_path - assert_redirected_to :controller => :users, :action => :terms, :referer => "/account/edit" - end - - def test_terms_not_logged_in - get user_terms_path - - assert_redirected_to login_path(:referer => "/user/terms") - end - def test_go_public user = create(:user, :data_public => false) session_for(user) @@ -304,7 +220,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary_comments']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/account']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0 @@ -320,7 +236,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(blocked_user.display_name)}/history']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/diary_comments']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/account']", 0 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/blocks']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/blocks_by']", 0 @@ -336,7 +252,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(moderator_user.display_name)}/history']", 1 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/diary_comments']", 1 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/account']", 0 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/blocks_by']", 1 @@ -353,7 +269,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1 assert_select "a[href='/traces/mine']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary_comments']", 1 assert_select "a[href='/account/edit']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0 @@ -371,7 +287,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/traces']", 1 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary']", 1 - assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary/comments']", 1 + assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/diary_comments']", 1 assert_select "a[href='/account/edit']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0 @@ -407,56 +323,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest end end - def test_set_status - user = create(:user) - - # Try without logging in - post set_status_user_path(user), :params => { :event => "confirm" } - assert_response :forbidden - - # Now try as a normal user - session_for(user) - post set_status_user_path(user), :params => { :event => "confirm" } - assert_redirected_to :controller => :errors, :action => :forbidden - - # Finally try as an administrator - session_for(create(:administrator_user)) - post set_status_user_path(user), :params => { :event => "confirm" } - assert_redirected_to :action => :show, :display_name => user.display_name - assert_equal "confirmed", User.find(user.id).status - end - - def test_destroy - user = create(:user, :home_lat => 12.1, :home_lon => 12.1, :description => "test") - - # Try without logging in - delete user_path(user) - assert_response :forbidden - - # Now try as a normal user - session_for(user) - delete user_path(user) - assert_redirected_to :controller => :errors, :action => :forbidden - - # Finally try as an administrator - session_for(create(:administrator_user)) - delete user_path(user) - assert_redirected_to :action => :show, :display_name => user.display_name - - # Check that the user was deleted properly - user.reload - assert_equal "user_#{user.id}", user.display_name - assert_equal "", user.description - assert_nil user.home_lat - assert_nil user.home_lon - assert_not user.avatar.attached? - assert_not user.email_valid - assert_nil user.new_email - assert_nil user.auth_provider - assert_nil user.auth_uid - assert_equal "deleted", user.status - end - def test_auth_failure_callback get auth_failure_path assert_redirected_to login_path