X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15689af6bfa6220b9c539eb0717a3d75cc3c4799..eb8d7be916f82ba43a9fb0fce661489bc04ff4ae:/test/controllers/user_controller_test.rb?ds=sidebyside diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb index 717089b64..87fb99a6f 100644 --- a/test/controllers/user_controller_test.rb +++ b/test/controllers/user_controller_test.rb @@ -3,6 +3,10 @@ require "test_helper" class UserControllerTest < ActionController::TestCase api_fixtures + def setup + stub_hostip_requests + end + ## # test all routes which lead to this controller def test_routes @@ -392,6 +396,7 @@ class UserControllerTest < ActionController::TestCase def test_confirm_success_no_token_no_referer user = users(:inactive_user) + stub_gravatar_request(user.email) confirm_string = user.tokens.create.token @request.cookies["_osm_session"] = user.display_name @@ -402,6 +407,7 @@ class UserControllerTest < ActionController::TestCase def test_confirm_success_good_token_no_referer user = users(:inactive_user) + stub_gravatar_request(user.email) confirm_string = user.tokens.create.token token = user.tokens.create.token @@ -412,6 +418,7 @@ class UserControllerTest < ActionController::TestCase def test_confirm_success_bad_token_no_referer user = users(:inactive_user) + stub_gravatar_request(user.email) confirm_string = user.tokens.create.token token = users(:normal_user).tokens.create.token @@ -423,6 +430,7 @@ class UserControllerTest < ActionController::TestCase def test_confirm_success_no_token_with_referer user = users(:inactive_user) + stub_gravatar_request(user.email) confirm_string = user.tokens.create(:referer => diary_new_path).token @request.cookies["_osm_session"] = user.display_name @@ -433,6 +441,7 @@ class UserControllerTest < ActionController::TestCase def test_confirm_success_good_token_with_referer user = users(:inactive_user) + stub_gravatar_request(user.email) confirm_string = user.tokens.create(:referer => diary_new_path).token token = user.tokens.create.token @@ -443,6 +452,7 @@ class UserControllerTest < ActionController::TestCase def test_confirm_success_bad_token_with_referer user = users(:inactive_user) + stub_gravatar_request(user.email) confirm_string = user.tokens.create(:referer => diary_new_path).token token = users(:normal_user).tokens.create.token @@ -521,6 +531,7 @@ class UserControllerTest < ActionController::TestCase def test_confirm_email_success user = users(:second_public_user) + stub_gravatar_request(user.new_email) confirm_string = user.tokens.create.token post :confirm_email, :confirm_string => confirm_string @@ -551,35 +562,33 @@ class UserControllerTest < ActionController::TestCase # this happens when the email is actually changed # which is triggered by the confirmation mail def test_gravatar_auto_enable - with_http_stubs "gravatar" do - # switch to email that has a gravatar - user = users(:first_gravatar_user) - confirm_string = user.tokens.create.token - # precondition gravatar should be turned off - assert !user.image_use_gravatar - post :confirm_email, :confirm_string => confirm_string - assert_response :redirect - assert_redirected_to :action => :account, :display_name => user.display_name - assert_match /Confirmed your change of email address/, flash[:notice] - # gravatar use should now be enabled - assert User.find(users(:first_gravatar_user).id).image_use_gravatar - end + # switch to email that has a gravatar + user = users(:first_gravatar_user) + stub_gravatar_request(user.new_email, 200) + confirm_string = user.tokens.create.token + # precondition gravatar should be turned off + assert !user.image_use_gravatar + post :confirm_email, :confirm_string => confirm_string + assert_response :redirect + assert_redirected_to :action => :account, :display_name => user.display_name + assert_match /Confirmed your change of email address/, flash[:notice] + # gravatar use should now be enabled + assert User.find(users(:first_gravatar_user).id).image_use_gravatar end def test_gravatar_auto_disable - with_http_stubs "gravatar" do - # switch to email without a gravatar - user = users(:second_gravatar_user) - confirm_string = user.tokens.create.token - # precondition gravatar should be turned on - assert user.image_use_gravatar - post :confirm_email, :confirm_string => confirm_string - assert_response :redirect - assert_redirected_to :action => :account, :display_name => user.display_name - assert_match /Confirmed your change of email address/, flash[:notice] - # gravatar use should now be disabled - assert !User.find(users(:second_gravatar_user).id).image_use_gravatar - end + # switch to email without a gravatar + user = users(:second_gravatar_user) + stub_gravatar_request(user.new_email, 404) + confirm_string = user.tokens.create.token + # precondition gravatar should be turned on + assert user.image_use_gravatar + post :confirm_email, :confirm_string => confirm_string + assert_response :redirect + assert_redirected_to :action => :account, :display_name => user.display_name + assert_match /Confirmed your change of email address/, flash[:notice] + # gravatar use should now be disabled + assert !User.find(users(:second_gravatar_user).id).image_use_gravatar end def test_terms_new_user @@ -759,7 +768,7 @@ class UserControllerTest < ActionController::TestCase assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account" # Make sure that you are blocked when not logged in as the right user - get :account, { :display_name => user.display_name }, { :user => users(:public_user).id } + get :account, { :display_name => user.display_name }, { :user => users(:public_user) } assert_response :forbidden # Make sure we get the page when we are logged in as the right user @@ -769,7 +778,7 @@ class UserControllerTest < ActionController::TestCase # Updating the description should work user.description = "new description" - post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -778,7 +787,7 @@ class UserControllerTest < ActionController::TestCase # Changing to a invalid editor should fail user.preferred_editor = "unknown" - post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user } assert_response :success assert_template :account assert_select ".notice", false @@ -787,7 +796,7 @@ class UserControllerTest < ActionController::TestCase # Changing to a valid editor should work user.preferred_editor = "potlatch2" - post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -796,7 +805,7 @@ class UserControllerTest < ActionController::TestCase # Changing to the default editor should work user.preferred_editor = "default" - post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -804,8 +813,8 @@ class UserControllerTest < ActionController::TestCase assert_select "form#accountForm > fieldset > div.form-row > select#user_preferred_editor > option[selected]", false # Changing to an uploaded image should work - image = Rack::Test::UploadedFile.new("test/traces/1.gif", "image/gif") - post :account, { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, { :user => user.id } + image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif") + post :account, { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -813,7 +822,7 @@ class UserControllerTest < ActionController::TestCase assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked][value=?]", "keep" # Changing to a gravatar image should work - post :account, { :display_name => user.display_name, :image_action => "gravatar", :user => user.attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :image_action => "gravatar", :user => user.attributes }, { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -821,7 +830,7 @@ class UserControllerTest < ActionController::TestCase assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked][value=?]", "gravatar" # Removing the image should work - post :account, { :display_name => user.display_name, :image_action => "delete", :user => user.attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :image_action => "delete", :user => user.attributes }, { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -829,13 +838,13 @@ class UserControllerTest < ActionController::TestCase assert_select "form#accountForm > fieldset > div.form-row.accountImage input[name=image_action][checked]", false # Adding external authentication should redirect to the auth provider - post :account, { :display_name => user.display_name, :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }, { :user => user } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "https://www.google.com/accounts/o8/id", :origin => "/user/#{user.display_name}/account") # Changing name to one that exists should fail new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name) - post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user } assert_response :success assert_template :account assert_select ".notice", false @@ -844,7 +853,7 @@ class UserControllerTest < ActionController::TestCase # Changing name to one that exists should fail, regardless of case new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name.upcase) - post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user } assert_response :success assert_template :account assert_select ".notice", false @@ -853,7 +862,7 @@ class UserControllerTest < ActionController::TestCase # Changing name to one that doesn't exist should work new_attributes = user.attributes.dup.merge(:display_name => "new tester") - post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -866,7 +875,7 @@ class UserControllerTest < ActionController::TestCase # Changing email to one that exists should fail user.new_email = users(:public_user).email assert_no_difference "ActionMailer::Base.deliveries.size" do - post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user } end assert_response :success assert_template :account @@ -877,7 +886,7 @@ class UserControllerTest < ActionController::TestCase # Changing email to one that exists should fail, regardless of case user.new_email = users(:public_user).email.upcase assert_no_difference "ActionMailer::Base.deliveries.size" do - post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user } end assert_response :success assert_template :account @@ -888,7 +897,7 @@ class UserControllerTest < ActionController::TestCase # Changing email to one that doesn't exist should work user.new_email = "new_tester@example.com" assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user.id } + post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user } end assert_response :success assert_template :account @@ -1036,6 +1045,7 @@ class UserControllerTest < ActionController::TestCase def test_api_details create(:message, :read, :recipient => users(:normal_user)) + create(:message, :sender => users(:normal_user)) # check that nothing is returned when not logged in get :api_details @@ -1128,7 +1138,7 @@ class UserControllerTest < ActionController::TestCase 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.id } + get :make_friend, { :display_name => friend.display_name }, { :user => user } assert_response :success assert_template :make_friend assert_select "form" do @@ -1139,7 +1149,7 @@ class UserControllerTest < ActionController::TestCase # When logged in a POST should add the friendship assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :make_friend, { :display_name => friend.display_name }, { :user => user.id } + post :make_friend, { :display_name => friend.display_name }, { :user => user } end assert_redirected_to user_path(:display_name => friend.display_name) assert_match /is now your friend/, flash[:notice] @@ -1151,7 +1161,7 @@ class UserControllerTest < ActionController::TestCase # A second POST should report that the friendship already exists assert_no_difference "ActionMailer::Base.deliveries.size" do - post :make_friend, { :display_name => friend.display_name }, { :user => user.id } + post :make_friend, { :display_name => friend.display_name }, { :user => user } end assert_redirected_to user_path(:display_name => friend.display_name) assert_match /You are already friends with/, flash[:warning] @@ -1167,7 +1177,7 @@ class UserControllerTest < ActionController::TestCase 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.id } + get :make_friend, { :display_name => friend.display_name, :referer => "/test" }, { :user => user } assert_response :success assert_template :make_friend assert_select "form" do @@ -1178,7 +1188,7 @@ class UserControllerTest < ActionController::TestCase # When logged in a POST should add the friendship and refer us assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :make_friend, { :display_name => friend.display_name, :referer => "/test" }, { :user => user.id } + post :make_friend, { :display_name => friend.display_name, :referer => "/test" }, { :user => user } end assert_redirected_to "/test" assert_match /is now your friend/, flash[:notice] @@ -1191,7 +1201,7 @@ class UserControllerTest < ActionController::TestCase def test_make_friend_unkown_user # Should error when a bogus user is specified - get :make_friend, { :display_name => "No Such User" }, { :user => users(:normal_user).id } + get :make_friend, { :display_name => "No Such User" }, { :user => users(:normal_user) } assert_response :not_found assert_template :no_such_user end @@ -1215,7 +1225,7 @@ class UserControllerTest < ActionController::TestCase 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.id } + get :remove_friend, { :display_name => friend.display_name }, { :user => user } assert_response :success assert_template :remove_friend assert_select "form" do @@ -1225,13 +1235,13 @@ class UserControllerTest < ActionController::TestCase 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.id } + 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.id } + 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 @@ -1247,7 +1257,7 @@ class UserControllerTest < ActionController::TestCase 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.id } + get :remove_friend, { :display_name => friend.display_name, :referer => "/test" }, { :user => user } assert_response :success assert_template :remove_friend assert_select "form" do @@ -1257,7 +1267,7 @@ class UserControllerTest < ActionController::TestCase assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first # When logged in a POST should remove the friendship and refer - post :remove_friend, { :display_name => friend.display_name, :referer => "/test" }, { :user => user.id } + post :remove_friend, { :display_name => friend.display_name, :referer => "/test" }, { :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 @@ -1265,7 +1275,7 @@ class UserControllerTest < ActionController::TestCase def test_remove_friend_unkown_user # Should error when a bogus user is specified - get :remove_friend, { :display_name => "No Such User" }, { :user => users(:normal_user).id } + get :remove_friend, { :display_name => "No Such User" }, { :user => users(:normal_user) } assert_response :not_found assert_template :no_such_user end @@ -1277,12 +1287,12 @@ class UserControllerTest < ActionController::TestCase assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended") # Now try as a normal user - get :set_status, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:normal_user).id } + get :set_status, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:normal_user) } assert_response :redirect assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name # Finally try as an administrator - get :set_status, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:administrator_user).id } + get :set_status, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:administrator_user) } assert_response :redirect assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name assert_equal "suspended", User.find(users(:normal_user).id).status @@ -1295,12 +1305,12 @@ class UserControllerTest < ActionController::TestCase assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended") # Now try as a normal user - get :delete, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:normal_user).id } + get :delete, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:normal_user) } assert_response :redirect assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name # Finally try as an administrator - get :delete, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:administrator_user).id } + get :delete, { :display_name => users(:normal_user).display_name, :status => "suspended" }, { :user => users(:administrator_user) } assert_response :redirect assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name @@ -1381,7 +1391,7 @@ class UserControllerTest < ActionController::TestCase get :list, :page => 3 assert_response :success assert_template :list - assert_select "table#user_list tr", :count => 25 + assert_select "table#user_list tr", :count => 26 end def test_list_post_confirm