X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f99c383318c4f9ea15639f0566f3e42db4e2c8b1..3666b674330ec8d14a224932a191d6121c5974e2:/test/controllers/users_controller_test.rb diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 5dbd866a9..a0d85ada3 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,10 +1,6 @@ require "test_helper" class UsersControllerTest < ActionController::TestCase - def setup - stub_hostip_requests - end - ## # test all routes which lead to this controller def test_routes @@ -252,7 +248,7 @@ class UsersControllerTest < ActionController::TestCase assert_response :success assert_template "new" - assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email" + assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email" end def test_new_duplicate_email_uppercase @@ -269,7 +265,7 @@ class UsersControllerTest < ActionController::TestCase assert_response :success assert_template "new" - assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email" + assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email" end def test_new_duplicate_name @@ -286,7 +282,7 @@ class UsersControllerTest < ActionController::TestCase assert_response :success assert_template "new" - assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" + assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_display_name" end def test_new_duplicate_name_uppercase @@ -303,7 +299,7 @@ class UsersControllerTest < ActionController::TestCase assert_response :success assert_template "new" - assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" + assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_display_name" end def test_new_blocked_domain @@ -342,29 +338,29 @@ class UsersControllerTest < ActionController::TestCase end def test_logout_without_referer + post :logout + assert_response :redirect + assert_redirected_to root_path + end + + def test_logout_with_referer + post :logout, :params => { :referer => "/test" } + assert_response :redirect + assert_redirected_to "/test" + end + + def test_logout_fallback_without_referer get :logout assert_response :success assert_template :logout assert_select "input[name=referer][value=?]", "" - - session_id = assert_select("input[name=session]").first["value"] - - get :logout, :params => { :session => session_id } - assert_response :redirect - assert_redirected_to root_path end - def test_logout_with_referer + def test_logout_fallback_with_referer get :logout, :params => { :referer => "/test" } assert_response :success assert_template :logout assert_select "input[name=referer][value=?]", "/test" - - session_id = assert_select("input[name=session]").first["value"] - - get :logout, :params => { :session => session_id, :referer => "/test" } - assert_response :redirect - assert_redirected_to "/test" end def test_logout_with_token @@ -372,16 +368,7 @@ class UsersControllerTest < ActionController::TestCase session[:token] = token.token - get :logout - assert_response :success - assert_template :logout - assert_select "input[name=referer][value=?]", "" - assert_equal token.token, session[:token] - assert_not_nil UserToken.where(:id => token.id).first - - session_id = assert_select("input[name=session]").first["value"] - - get :logout, :params => { :session => session_id } + post :logout assert_response :redirect assert_redirected_to root_path assert_nil session[:token] @@ -645,9 +632,9 @@ class UsersControllerTest < ActionController::TestCase user.reload - assert_equal true, user.consider_pd + assert user.consider_pd assert_not_nil user.terms_agreed - assert_equal true, user.terms_seen + assert user.terms_seen end def test_terms_not_seen_with_referer @@ -666,9 +653,9 @@ class UsersControllerTest < ActionController::TestCase user.reload - assert_equal true, user.consider_pd + assert user.consider_pd assert_not_nil user.terms_agreed - assert_equal true, user.terms_seen + assert user.terms_seen end # Check that if you haven't seen the terms, and make a request that requires authentication, @@ -687,7 +674,7 @@ class UsersControllerTest < ActionController::TestCase post :go_public, :session => { :user => user } assert_response :redirect assert_redirected_to :action => :account, :display_name => user.display_name - assert_equal true, User.find(user.id).data_public + assert User.find(user.id).data_public end def test_lost_password @@ -805,7 +792,7 @@ class UsersControllerTest < ActionController::TestCase assert_equal user.id, session[:user] user.reload assert_equal "active", user.status - assert_equal true, user.email_valid + assert user.email_valid assert_equal user, User.authenticate(:username => user.email, :password => "new_password") end @@ -845,7 +832,7 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select "div#errorExplanation", false assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > fieldset > div.form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description + assert_select "form#accountForm > fieldset > div.standard-form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description # Changing to a invalid editor should fail user.preferred_editor = "unknown" @@ -854,7 +841,7 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select ".notice", false assert_select "div#errorExplanation" - assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected]", false + assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false # Changing to a valid editor should work user.preferred_editor = "potlatch2" @@ -863,7 +850,7 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select "div#errorExplanation", false assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected][value=?]", "potlatch2" + assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected][value=?]", "potlatch2" # Changing to the default editor should work user.preferred_editor = "default" @@ -872,32 +859,32 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select "div#errorExplanation", false assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected]", false + assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false # Changing to an uploaded image should work image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif") - post :account, :params => { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, :session => { :user => user } + post :account, :params => { :display_name => user.display_name, :avatar_action => "new", :user => user.attributes.merge(:avatar => image) }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked][value=?]", "keep" + assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "keep" # Changing to a gravatar image should work - post :account, :params => { :display_name => user.display_name, :image_action => "gravatar", :user => user.attributes }, :session => { :user => user } + post :account, :params => { :display_name => user.display_name, :avatar_action => "gravatar", :user => user.attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked][value=?]", "gravatar" + assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "gravatar" # Removing the image should work - post :account, :params => { :display_name => user.display_name, :image_action => "delete", :user => user.attributes }, :session => { :user => user } + post :account, :params => { :display_name => user.display_name, :avatar_action => "delete", :user => user.attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked]", false + assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked]", false # Adding external authentication should redirect to the auth provider post :account, :params => { :display_name => user.display_name, :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }, :session => { :user => user } @@ -911,7 +898,7 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select ".notice", false assert_select "div#errorExplanation" - assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name" + assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name" # Changing name to one that exists should fail, regardless of case new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase) @@ -920,7 +907,7 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select ".notice", false assert_select "div#errorExplanation" - assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name" + assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name" # Changing name to one that doesn't exist should work new_attributes = user.attributes.dup.merge(:display_name => "new tester") @@ -929,7 +916,7 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select "div#errorExplanation", false assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", "new tester" + assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_display_name[value=?]", "new tester" # Record the change of name user.display_name = "new tester" @@ -945,7 +932,7 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select ".notice", false assert_select "div#errorExplanation" - assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email" + assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email" # Changing email to one that exists should fail, regardless of case user.new_email = create(:user).email.upcase @@ -958,7 +945,7 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select ".notice", false assert_select "div#errorExplanation" - assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email" + assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email" # Changing email to one that doesn't exist should work user.new_email = "new_tester@example.com" @@ -971,7 +958,7 @@ class UsersControllerTest < ActionController::TestCase assert_template :account assert_select "div#errorExplanation", false assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email + assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_new_email[value=?]", user.new_email email = ActionMailer::Base.deliveries.first assert_equal 1, email.to.count assert_equal user.new_email, email.to.first @@ -988,7 +975,7 @@ class UsersControllerTest < ActionController::TestCase # Test a normal user user = create(:user, :home_lon => 1.1, :home_lat => 1.1) friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2) - create(:friend, :befriender => user, :befriendee => friend_user) + create(:friendship, :befriender => user, :befriendee => friend_user) create(:changeset, :user => friend_user) get :show, :params => { :display_name => user.display_name } @@ -1113,7 +1100,7 @@ class UsersControllerTest < ActionController::TestCase friend = create(:user) # Check that the users aren't already friends - assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert_nil Friendship.where(:befriender => user, :befriendee => friend).first # When not logged in a GET should ask us to login get :make_friend, :params => { :display_name => friend.display_name } @@ -1122,7 +1109,7 @@ class UsersControllerTest < ActionController::TestCase # When not logged in a POST should error post :make_friend, :params => { :display_name => friend.display_name } assert_response :forbidden - assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert_nil Friendship.where(:befriender => user, :befriendee => friend).first # When logged in a GET should get a confirmation page get :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } @@ -1132,7 +1119,7 @@ class UsersControllerTest < ActionController::TestCase 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 + assert_nil Friendship.where(:befriender => user, :befriendee => friend).first # When logged in a POST should add the friendship assert_difference "ActionMailer::Base.deliveries.size", 1 do @@ -1142,7 +1129,7 @@ class UsersControllerTest < ActionController::TestCase end assert_redirected_to user_path(friend) assert_match(/is now your friend/, flash[:notice]) - assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert Friendship.where(:befriender => user, :befriendee => friend).first email = ActionMailer::Base.deliveries.first assert_equal 1, email.to.count assert_equal friend.email, email.to.first @@ -1156,7 +1143,7 @@ class UsersControllerTest < ActionController::TestCase end assert_redirected_to user_path(friend) assert_match(/You are already friends with/, flash[:warning]) - assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert Friendship.where(:befriender => user, :befriendee => friend).first end def test_make_friend_with_referer @@ -1165,7 +1152,7 @@ class UsersControllerTest < ActionController::TestCase friend = create(:user) # Check that the users aren't already friends - assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert_nil Friendship.where(:befriender => user, :befriendee => friend).first # The GET should preserve any referer get :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user } @@ -1175,7 +1162,7 @@ class UsersControllerTest < ActionController::TestCase 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 + assert_nil Friendship.where(:befriender => user, :befriendee => friend).first # When logged in a POST should add the friendship and refer us assert_difference "ActionMailer::Base.deliveries.size", 1 do @@ -1185,7 +1172,7 @@ class UsersControllerTest < ActionController::TestCase end assert_redirected_to "/test" assert_match(/is now your friend/, flash[:notice]) - assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert Friendship.where(:befriender => user, :befriendee => friend).first email = ActionMailer::Base.deliveries.first assert_equal 1, email.to.count assert_equal friend.email, email.to.first @@ -1203,10 +1190,10 @@ class UsersControllerTest < ActionController::TestCase # Get users to work with user = create(:user) friend = create(:user) - create(:friend, :befriender => user, :befriendee => friend) + create(:friendship, :befriender => user, :befriendee => friend) # Check that the users are friends - assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert Friendship.where(:befriender => user, :befriendee => friend).first # When not logged in a GET should ask us to login get :remove_friend, :params => { :display_name => friend.display_name } @@ -1215,7 +1202,7 @@ class UsersControllerTest < ActionController::TestCase # When not logged in a POST should error post :remove_friend, :params => { :display_name => friend.display_name } assert_response :forbidden - assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert Friendship.where(:befriender => user, :befriendee => friend).first # When logged in a GET should get a confirmation page get :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } @@ -1225,29 +1212,29 @@ class UsersControllerTest < ActionController::TestCase 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 + assert Friendship.where(:befriender => user, :befriendee => friend).first # When logged in a POST should remove the friendship post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } assert_redirected_to user_path(friend) assert_match(/was removed from your friends/, flash[:notice]) - assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert_nil Friendship.where(:befriender => user, :befriendee => friend).first # A second POST should report that the friendship does not exist post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } assert_redirected_to user_path(friend) assert_match(/is not one of your friends/, flash[:error]) - assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert_nil Friendship.where(:befriender => user, :befriendee => friend).first end def test_remove_friend_with_referer # Get users to work with user = create(:user) friend = create(:user) - create(:friend, :user_id => user.id, :friend_user_id => friend.id) + create(:friendship, :befriender => user, :befriendee => friend) # Check that the users are friends - assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert Friendship.where(:befriender => user, :befriendee => friend).first # The GET should preserve any referer get :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user } @@ -1257,13 +1244,13 @@ class UsersControllerTest < ActionController::TestCase 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 + assert Friendship.where(:befriender => user, :befriendee => friend).first # When logged in a POST should remove the friendship and refer post :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user } assert_redirected_to "/test" assert_match(/was removed from your friends/, flash[:notice]) - assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + assert_nil Friendship.where(:befriender => user, :befriendee => friend).first end def test_remove_friend_unkown_user @@ -1317,8 +1304,8 @@ class UsersControllerTest < ActionController::TestCase assert_equal "", user.description assert_nil user.home_lat assert_nil user.home_lon - assert_equal false, user.image.file? - assert_equal false, user.email_valid + 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