X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/05515d644a3c85d8569f459ed2007d94aadbc817..9701c6210c32335ce3baf964b7e564a4da48d7b8:/test/functional/user_controller_test.rb?ds=sidebyside diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index f756b0514..6a64fd8d8 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -6,6 +6,10 @@ class UserControllerTest < ActionController::TestCase ## # 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" } @@ -51,11 +55,12 @@ class UserControllerTest < ActionController::TestCase ) assert_routing( - { :path => "/user/terms", :method => :get }, - { :controller => "user", :action => "terms" } + { :path => "/user/new", :method => :post }, + { :controller => "user", :action => "create" } ) + assert_routing( - { :path => "/user/terms", :method => :post }, + { :path => "/user/terms", :method => :get }, { :controller => "user", :action => "terms" } ) @@ -186,102 +191,172 @@ class UserControllerTest < ActionController::TestCase # 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 + assert_select "title", :text => /Sign Up/, :count => 1 end assert_select "body", :count => 1 do assert_select "div#content", :count => 1 do - assert_select "form[action='/user/terms'][method=post]", :count => 1 do + assert_select "form[action='/user/new'][method=post]", :count => 1 do assert_select "input[id=user_email]", :count => 1 assert_select "input[id=user_email_confirmation]", :count => 1 assert_select "input[id=user_display_name]", :count => 1 assert_select "input[id=user_pass_crypt][type=password]", :count => 1 assert_select "input[id=user_pass_crypt_confirmation][type=password]", :count => 1 - assert_select "input[type=submit][value=Continue]", :count => 1 + assert_select "input[type=submit][value=Sign Up]", :count => 1 end end end end end - + + def new_user + user = User.new + user.status = "pending" + user.display_name = "new_tester" + user.email = "newtester@osm.org" + user.email_confirmation = "newtester@osm.org" + user.pass_crypt = "testtest" + user.pass_crypt_confirmation = "testtest" + user + end + def test_user_create_success - new_email = "newtester@osm.org" - display_name = "new_tester" + user = new_user + 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"}} + post :save, {}, {:new_user => user} end end - + # Check the e-mail register_email = ActionMailer::Base.deliveries.first - - assert_equal register_email.to[0], new_email + + assert_equal register_email.to[0], user.email assert_match /#{@url}/, register_email.body.to_s # Check the page - assert_redirected_to :action => 'login', :referer => nil - + assert_redirected_to :action => 'confirm', :display_name => user.display_name + ActionMailer::Base.deliveries.clear end - + def test_user_create_submit_duplicate_email - email = users(:public_user).email - 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"} + user = new_user + user.email = users(:public_user).email + + assert_no_difference('User.count') do + assert_no_difference('ActionMailer::Base.deliveries.size') do + post :save, {}, {:new_user => user} end end - assert_response :success + + 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 "form > fieldset > div.form-row > div.field_with_errors > input#user_email" end - + def test_user_create_submit_duplicate_email_uppercase - email = users(:public_user).email.upcase - 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"} + user = new_user + user.email = users(:public_user).email.upcase + + assert_no_difference('User.count') do + assert_no_difference('ActionMailer::Base.deliveries.size') do + post :save, {}, {:new_user => user} end end - assert_response :success + + 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 "form > fieldset > div.form-row > div.field_with_errors > input#user_email" end def test_user_create_submit_duplicate_name - email = "new_tester@example.com" - 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"} + user = new_user + user.display_name = users(:public_user).display_name + + assert_no_difference('User.count') do + assert_no_difference('ActionMailer::Base.deliveries.size') do + post :save, {}, {:new_user => user} end end - assert_response :success + + 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 "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name" end def test_user_create_submit_duplicate_name_uppercase - email = "new_tester@example.com" - 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"} + user = new_user + user.display_name = users(:public_user).display_name.upcase + + assert_no_difference('User.count') do + assert_no_difference('ActionMailer::Base.deliveries.size') do + post :save, {}, {:new_user => user} end end - assert_response :success + + 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 "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name" + end + + def test_user_save_referer_params + user = new_user + + post :save, {}, {:new_user => user, + :referer => '/edit?editor=id#map=1/2/3'} + + assert_equal welcome_path(:editor => 'id', :zoom => 1, :lat => 2, :lon => 3), + user.tokens.order("id DESC").first.referer + end + + def test_user_confirm_expired_token + user = users(:inactive_user) + token = user.tokens.new + token.expiry = 1.day.ago + token.save! + + @request.cookies["_osm_session"] = user.display_name + post :confirm, :confirm_string => token.token + + assert_redirected_to :action => 'confirm' + assert_match /expired/, flash[:error] + end + + def test_user_already_confirmed + user = users(:normal_user) + token = user.tokens.create + + @request.cookies["_osm_session"] = user.display_name + post :confirm, :confirm_string => token.token + + assert_redirected_to :action => 'login' + assert_match /confirmed/, flash[:error] + end + + def test_user_terms_new_user + get :terms, {}, { "new_user" => User.new } + assert_response :success + assert_template :terms + end + + def test_user_terms_seen + user = users(:normal_user) + + # Set the username cookie + @request.cookies["_osm_username"] = user.display_name + + get :terms, {}, { "user" => user } + assert_response :redirect + assert_redirected_to :action => :account, :display_name => user.display_name end def test_user_lost_password @@ -375,7 +450,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 > div#user_description_container > div#user_description_content > textarea#user_description", user.description + assert_select "form#accountForm > fieldset > div.form-row > 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 @@ -384,7 +459,7 @@ class UserControllerTest < ActionController::TestCase assert_template :account assert_select "div#notice", false assert_select "div#errorExplanation" - assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_display_name" + assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name" # Changing name to one that exists should fail, regardless of case user.display_name = users(:public_user).display_name.upcase @@ -393,7 +468,7 @@ class UserControllerTest < ActionController::TestCase assert_template :account assert_select "div#notice", false assert_select "div#errorExplanation" - assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_display_name" + assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name" # Changing name to one that doesn't exist should work user.display_name = "new tester" @@ -402,7 +477,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 > input#user_display_name[value=?]", user.display_name + assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", user.display_name # Need to update cookies now to stay valid @request.cookies["_osm_username"] = user.display_name @@ -414,7 +489,7 @@ class UserControllerTest < ActionController::TestCase assert_template :account assert_select "div#notice", false assert_select "div#errorExplanation" - assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_new_email" + assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email" # Changing email to one that exists should fail, regardless of case user.new_email = users(:public_user).email.upcase @@ -423,7 +498,7 @@ class UserControllerTest < ActionController::TestCase assert_template :account assert_select "div#notice", false assert_select "div#errorExplanation" - assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_new_email" + assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email" # Changing email to one that doesn't exist should work user.new_email = "new_tester@example.com" @@ -432,7 +507,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 > input#user_new_email[value=?]", user.new_email + assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email end # Check that the user account page will display and contains some relevant @@ -520,14 +595,98 @@ class UserControllerTest < ActionController::TestCase 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 the data that is returned + assert_select "description", :count => 1, :text => "test" + assert_select "contributor-terms", :count => 1 do + assert_select "[agreed=true]" + end + assert_select "img", :count => 1 + assert_select "roles", :count => 1 do + assert_select "role", :count => 0 + end + assert_select "changesets", :count => 1 do + assert_select "[count=0]" + end + assert_select "traces", :count => 1 do + assert_select "[count=0]" + end + assert_select "blocks", :count => 1 do + assert_select "received", :count => 1 do + assert_select "[count=0][active=0]" + end + assert_select "issued", :count => 0 + end + + # check that we aren't revealing private information + assert_select "contributor-terms[pd]", false + assert_select "home", false + assert_select "languages", false + assert_select "messages", 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 + # check that nothing is returned when not logged in get :api_details assert_response :unauthorized + # check that we get a response when logged in basic_authorization(users(:normal_user).email, "test") get :api_details assert_response :success + + # check the data that is returned + assert_select "description", :count => 1, :text => "test" + assert_select "contributor-terms", :count => 1 do + assert_select "[agreed=true][pd=false]" + end + assert_select "img", :count => 1 + assert_select "roles", :count => 1 do + assert_select "role", :count => 0 + end + assert_select "changesets", :count => 1 do + assert_select "[count=0]", :count => 1 + end + assert_select "traces", :count => 1 do + assert_select "[count=0]", :count => 1 + end + assert_select "blocks", :count => 1 do + assert_select "received", :count => 1 do + assert_select "[count=0][active=0]" + end + assert_select "issued", :count => 0 + end + assert_select "home", :count => 1 do + assert_select "[lat=12.1][lon=12.1][zoom=3]" + end + assert_select "languages", :count => 1 do + assert_select "lang", :count => 1, :text => "en" + end + assert_select "messages", :count => 1 do + assert_select "received", :count => 1 do + assert_select "[count=1][unread=0]" + end + assert_select "sent", :count => 1 do + assert_select "[count=1]" + end + end end def test_user_make_friend