X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/58cd5bfb11bccb5e326847b218809be2c93a00d5..f892313c48d64a7b5453d2772d72648795cf363b:/test/functional/user_controller_test.rb diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index 6ae27c6eb..381ec333a 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -215,114 +215,133 @@ class UserControllerTest < ActionController::TestCase 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 - 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 + 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 - 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 + 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 "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 - 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 + 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 "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 - 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 + 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 "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 - 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 + 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 "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 @@ -340,6 +359,15 @@ class UserControllerTest < ActionController::TestCase assert_redirected_to :action => :account, :display_name => user.display_name end + def test_user_go_public + @request.cookies["_osm_username"] = users(:normal_user).display_name + + post :go_public, {}, { :user => users(:normal_user) } + assert_response :redirect + assert_redirected_to :action => :account, :display_name => users(:normal_user).display_name + assert_equal true, User.find(users(:normal_user).id).data_public + end + def test_user_lost_password # Test fetching the lost password page get :lost_password @@ -582,10 +610,33 @@ class UserControllerTest < ActionController::TestCase 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 @@ -601,12 +652,50 @@ class UserControllerTest < ActionController::TestCase 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