X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..8313bf0612b03771e280c616099beba846008cb9:/test/functional/user_controller_test.rb?ds=inline diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index 309eb5e24..79666adfe 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -3,11 +3,199 @@ require File.dirname(__FILE__) + '/../test_helper' class UserControllerTest < ActionController::TestCase fixtures :users + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/user/1", :method => :get }, + { :controller => "user", :action => "api_read", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/user/details", :method => :get }, + { :controller => "user", :action => "api_details" } + ) + assert_routing( + { :path => "/api/0.6/user/gpx_files", :method => :get }, + { :controller => "user", :action => "api_gpx_files" } + ) + + assert_routing( + { :path => "/login", :method => :get }, + { :controller => "user", :action => "login" } + ) + assert_routing( + { :path => "/login", :method => :post }, + { :controller => "user", :action => "login" } + ) + assert_recognizes( + { :controller => "user", :action => "login", :format => "html" }, + { :path => "/login.html", :method => :get } + ) + + assert_routing( + { :path => "/logout", :method => :get }, + { :controller => "user", :action => "logout" } + ) + assert_routing( + { :path => "/logout", :method => :post }, + { :controller => "user", :action => "logout" } + ) + assert_recognizes( + { :controller => "user", :action => "logout", :format => "html" }, + { :path => "/logout.html", :method => :get } + ) + + assert_routing( + { :path => "/user/new", :method => :get }, + { :controller => "user", :action => "new" } + ) + assert_recognizes( + { :controller => "user", :action => "new" }, + { :path => "/create-account.html", :method => :get } + ) + + assert_routing( + { :path => "/user/terms", :method => :get }, + { :controller => "user", :action => "terms" } + ) + assert_routing( + { :path => "/user/terms", :method => :post }, + { :controller => "user", :action => "terms" } + ) + + assert_routing( + { :path => "/user/save", :method => :post }, + { :controller => "user", :action => "save" } + ) + + assert_routing( + { :path => "/user/username/confirm", :method => :get }, + { :controller => "user", :action => "confirm", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/confirm", :method => :post }, + { :controller => "user", :action => "confirm", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/confirm/resend", :method => :get }, + { :controller => "user", :action => "confirm_resend", :display_name => "username" } + ) + + assert_routing( + { :path => "/user/confirm", :method => :get }, + { :controller => "user", :action => "confirm" } + ) + assert_routing( + { :path => "/user/confirm", :method => :post }, + { :controller => "user", :action => "confirm" } + ) + assert_routing( + { :path => "/user/confirm-email", :method => :get }, + { :controller => "user", :action => "confirm_email" } + ) + assert_routing( + { :path => "/user/confirm-email", :method => :post }, + { :controller => "user", :action => "confirm_email" } + ) + + assert_routing( + { :path => "/user/go_public", :method => :post }, + { :controller => "user", :action => "go_public" } + ) + + assert_routing( + { :path => "/user/forgot-password", :method => :get }, + { :controller => "user", :action => "lost_password" } + ) + assert_routing( + { :path => "/user/forgot-password", :method => :post }, + { :controller => "user", :action => "lost_password" } + ) + assert_recognizes( + { :controller => "user", :action => "lost_password" }, + { :path => "/forgot-password.html", :method => :get } + ) + assert_routing( + { :path => "/user/reset-password", :method => :get }, + { :controller => "user", :action => "reset_password" } + ) + assert_routing( + { :path => "/user/reset-password", :method => :post }, + { :controller => "user", :action => "reset_password" } + ) + + assert_routing( + { :path => "/user/suspended", :method => :get }, + { :controller => "user", :action => "suspended" } + ) + + assert_routing( + { :path => "/user/username", :method => :get }, + { :controller => "user", :action => "view", :display_name => "username" } + ) + + assert_routing( + { :path => "/user/username/account", :method => :get }, + { :controller => "user", :action => "account", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/account", :method => :post }, + { :controller => "user", :action => "account", :display_name => "username" } + ) + + assert_routing( + { :path => "/user/username/make_friend", :method => :get }, + { :controller => "user", :action => "make_friend", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/make_friend", :method => :post }, + { :controller => "user", :action => "make_friend", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/remove_friend", :method => :get }, + { :controller => "user", :action => "remove_friend", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/remove_friend", :method => :post }, + { :controller => "user", :action => "remove_friend", :display_name => "username" } + ) + + assert_routing( + { :path => "/user/username/set_status", :method => :get }, + { :controller => "user", :action => "set_status", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/delete", :method => :get }, + { :controller => "user", :action => "delete", :display_name => "username" } + ) + + assert_routing( + { :path => "/users", :method => :get }, + { :controller => "user", :action => "list" } + ) + assert_routing( + { :path => "/users", :method => :post }, + { :controller => "user", :action => "list" } + ) + assert_routing( + { :path => "/users/status", :method => :get }, + { :controller => "user", :action => "list", :status => "status" } + ) + assert_routing( + { :path => "/users/status", :method => :post }, + { :controller => "user", :action => "list", :status => "status" } + ) + end + # The user creation page loads def test_user_create_view get :new + assert_response :redirect + assert_redirected_to user_new_path(:cookie_test => "true") + + get :new, { :cookie_test => "true" }, { :cookie_test => true } assert_response :success - + assert_select "html", :count => 1 do assert_select "head", :count => 1 do assert_select "title", :text => /Create account/, :count => 1 @@ -32,7 +220,13 @@ class UserControllerTest < ActionController::TestCase display_name = "new_tester" assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size') do - post :save, {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => new_email, :email_confirmation => new_email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end @@ -40,7 +234,7 @@ class UserControllerTest < ActionController::TestCase register_email = ActionMailer::Base.deliveries.first assert_equal register_email.to[0], new_email - assert_match /#{@url}/, register_email.body + assert_match /#{@url}/, register_email.body.to_s # Check the page assert_redirected_to :action => 'login', :referer => nil @@ -53,13 +247,19 @@ class UserControllerTest < ActionController::TestCase display_name = "new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => email, :email_confirmation => email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end assert_response :success assert_template 'new' assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email" end def test_user_create_submit_duplicate_email_uppercase @@ -67,13 +267,19 @@ class UserControllerTest < ActionController::TestCase display_name = "new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => email, :email_confirmation => email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end assert_response :success assert_template 'new' assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email" end def test_user_create_submit_duplicate_name @@ -81,13 +287,19 @@ class UserControllerTest < ActionController::TestCase display_name = users(:public_user).display_name assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => email, :email_confirmation => email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end assert_response :success assert_template 'new' assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name" end def test_user_create_submit_duplicate_name_uppercase @@ -95,13 +307,19 @@ class UserControllerTest < ActionController::TestCase display_name = users(:public_user).display_name.upcase assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} + session[:new_user] = User.new({ + :status => "pending", :display_name => display_name, + :email => email, :email_confirmation => email, + :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" + }, :without_protection => true) + + post :save end end assert_response :success assert_template 'new' assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name" + assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name" end def test_user_lost_password @@ -195,7 +413,7 @@ class UserControllerTest < ActionController::TestCase assert_template :account assert_select "div#errorExplanation", false assert_select "div#notice", /^User information updated successfully/ - assert_select "table#accountForm > tr > td > textarea#user_description", user.description + assert_select "table#accountForm > tr > td > div#user_description_container > div#user_description_content > textarea#user_description", user.description # Changing name to one that exists should fail user.display_name = users(:public_user).display_name @@ -257,14 +475,113 @@ class UserControllerTest < ActionController::TestCase # Check that the user account page will display and contains some relevant # information for the user - def test_view_user_account + def test_user_view_account + # Test a non-existent user get :view, {:display_name => "unknown"} assert_response :not_found + # Test a normal user + get :view, {:display_name => "test"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/test/edits]", 1 + assert_select "a[href=/user/test/traces]", 1 + assert_select "a[href=/user/test/diary]", 1 + assert_select "a[href=/user/test/diary/comments]", 1 + assert_select "a[href=/user/test/account]", 0 + assert_select "a[href=/user/test/blocks]", 0 + assert_select "a[href=/user/test/blocks_by]", 0 + assert_select "a[href=/blocks/new/test]", 0 + end + + # Test a user who has been blocked + get :view, {:display_name => "blocked"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/blocked/edits]", 1 + assert_select "a[href=/user/blocked/traces]", 1 + assert_select "a[href=/user/blocked/diary]", 1 + assert_select "a[href=/user/blocked/diary/comments]", 1 + assert_select "a[href=/user/blocked/account]", 0 + assert_select "a[href=/user/blocked/blocks]", 1 + assert_select "a[href=/user/blocked/blocks_by]", 0 + assert_select "a[href=/blocks/new/blocked]", 0 + end + + # Test a moderator who has applied blocks + get :view, {:display_name => "moderator"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/moderator/edits]", 1 + assert_select "a[href=/user/moderator/traces]", 1 + assert_select "a[href=/user/moderator/diary]", 1 + assert_select "a[href=/user/moderator/diary/comments]", 1 + assert_select "a[href=/user/moderator/account]", 0 + assert_select "a[href=/user/moderator/blocks]", 0 + assert_select "a[href=/user/moderator/blocks_by]", 1 + assert_select "a[href=/blocks/new/moderator]", 0 + end + + # Login as a normal user + session[:user] = users(:normal_user).id + cookies["_osm_username"] = users(:normal_user).display_name + + # Test the normal user get :view, {:display_name => "test"} assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/test/edits]", 1 + assert_select "a[href=/traces/mine]", 1 + assert_select "a[href=/user/test/diary]", 1 + assert_select "a[href=/user/test/diary/comments]", 1 + assert_select "a[href=/user/test/account]", 1 + assert_select "a[href=/user/test/blocks]", 0 + assert_select "a[href=/user/test/blocks_by]", 0 + assert_select "a[href=/blocks/new/test]", 0 + end + + # Login as a moderator + session[:user] = users(:moderator_user).id + cookies["_osm_username"] = users(:moderator_user).display_name + + # Test the normal user + get :view, {:display_name => "test"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href=/user/test/edits]", 1 + assert_select "a[href=/user/test/traces]", 1 + assert_select "a[href=/user/test/diary]", 1 + assert_select "a[href=/user/test/diary/comments]", 1 + assert_select "a[href=/user/test/account]", 0 + assert_select "a[href=/user/test/blocks]", 0 + assert_select "a[href=/user/test/blocks_by]", 0 + assert_select "a[href=/blocks/new/test]", 1 + end end - + + def test_user_api_read + # check that a visible user is returned properly + get :api_read, :id => users(:normal_user).id + assert_response :success + + # check that we aren't revealing private information + assert_select "contributor-terms[pd]", false + assert_select "home", false + assert_select "languages", false + + # check that a suspended user is not returned + get :api_read, :id => users(:suspended_user).id + assert_response :gone + + # check that a deleted user is not returned + get :api_read, :id => users(:deleted_user).id + assert_response :gone + + # check that a non-existent user is not returned + get :api_read, :id => 0 + assert_response :not_found + end + def test_user_api_details get :api_details assert_response :unauthorized @@ -273,4 +590,110 @@ class UserControllerTest < ActionController::TestCase get :api_details assert_response :success end + + def test_user_make_friend + # Get users to work with + user = users(:normal_user) + friend = users(:second_public_user) + + # Check that the users aren't already friends + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # Set the username cookie + @request.cookies["_osm_username"] = user.display_name + + # When not logged in a GET should ask us to login + get :make_friend, {:display_name => friend.display_name} + assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name) + + # When not logged in a POST should error + post :make_friend, {:display_name => friend.display_name} + assert_response :forbidden + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a GET should get a confirmation page + get :make_friend, {:display_name => friend.display_name}, {"user" => user} + assert_response :success + assert_template :make_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer]", 0 + assert_select "input[type=submit]", 1 + end + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # The GET should preserve any referer + get :make_friend, {:display_name => friend.display_name, :referer => "/test"}, {"user" => user} + assert_response :success + assert_template :make_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer][value=/test]", 1 + assert_select "input[type=submit]", 1 + end + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a POST should add the friendship + post :make_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /is now your friend/, flash[:notice] + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # A second POST should report that the friendship already exists + post :make_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /You are already friends with/, flash[:warning] + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + end + + def test_user_remove_friend + # Get users to work with + user = users(:normal_user) + friend = users(:public_user) + + # Check that the users are friends + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # Set the username cookie + @request.cookies["_osm_username"] = user.display_name + + # When not logged in a GET should ask us to login + get :remove_friend, {:display_name => friend.display_name} + assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name) + + # When not logged in a POST should error + post :remove_friend, {:display_name => friend.display_name} + assert_response :forbidden + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a GET should get a confirmation page + get :remove_friend, {:display_name => friend.display_name}, {"user" => user} + assert_response :success + assert_template :remove_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer]", 0 + assert_select "input[type=submit]", 1 + end + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # The GET should preserve any referer + get :remove_friend, {:display_name => friend.display_name, :referer => "/test"}, {"user" => user} + assert_response :success + assert_template :remove_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer][value=/test]", 1 + assert_select "input[type=submit]", 1 + end + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a POST should remove the friendship + post :remove_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /was removed from your friends/, flash[:notice] + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # A second POST should report that the friendship does not exist + post :remove_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /is not one of your friends/, flash[:error] + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + end end