X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b8a8a88004d25837a10436fdc13128146b32c32b..74d2c4336bab2efe44c6bdadf688d26b18e320b3:/test/controllers/users_controller_test.rb?ds=inline diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index ce64310cb..deb736a7b 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -237,7 +237,9 @@ class UsersControllerTest < ActionController::TestCase assert_difference "User.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :save, :session => { :new_user => user } + perform_enqueued_jobs do + post :save, :session => { :new_user => user } + end end end @@ -259,7 +261,9 @@ class UsersControllerTest < ActionController::TestCase assert_no_difference "User.count" do assert_no_difference "ActionMailer::Base.deliveries.size" do - post :save, :session => { :new_user => user } + perform_enqueued_jobs do + post :save, :session => { :new_user => user } + end end end @@ -274,7 +278,9 @@ class UsersControllerTest < ActionController::TestCase assert_no_difference "User.count" do assert_no_difference "ActionMailer::Base.deliveries.size" do - post :save, :session => { :new_user => user } + perform_enqueued_jobs do + post :save, :session => { :new_user => user } + end end end @@ -289,7 +295,9 @@ class UsersControllerTest < ActionController::TestCase assert_no_difference "User.count" do assert_no_difference "ActionMailer::Base.deliveries.size" do - post :save, :session => { :new_user => user } + perform_enqueued_jobs do + post :save, :session => { :new_user => user } + end end end @@ -304,7 +312,9 @@ class UsersControllerTest < ActionController::TestCase assert_no_difference "User.count" do assert_no_difference "ActionMailer::Base.deliveries.size" do - post :save, :session => { :new_user => user } + perform_enqueued_jobs do + post :save, :session => { :new_user => user } + end end end @@ -313,13 +323,31 @@ class UsersControllerTest < ActionController::TestCase assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" end + def test_new_blocked_domain + user = build(:user, :pending, :email => "user@example.net") + create(:acl, :domain => "example.net", :k => "no_account_creation") + + assert_no_difference "User.count" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs do + post :save, :session => { :new_user => user } + end + end + end + + assert_response :success + assert_template "blocked" + end + def test_save_referer_params user = build(:user, :pending) assert_difference "User.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :save, :session => { :new_user => user, - :referer => "/edit?editor=id#map=1/2/3" } + perform_enqueued_jobs do + post :save, :session => { :new_user => user, + :referer => "/edit?editor=id#map=1/2/3" } + end end end @@ -489,7 +517,9 @@ class UsersControllerTest < ActionController::TestCase session[:token] = user.tokens.create.token assert_difference "ActionMailer::Base.deliveries.size", 1 do - get :confirm_resend, :params => { :display_name => user.display_name } + perform_enqueued_jobs do + get :confirm_resend, :params => { :display_name => user.display_name } + end end assert_response :redirect @@ -506,7 +536,9 @@ class UsersControllerTest < ActionController::TestCase def test_confirm_resend_no_token user = create(:user, :pending) assert_no_difference "ActionMailer::Base.deliveries.size" do - get :confirm_resend, :params => { :display_name => user.display_name } + perform_enqueued_jobs do + get :confirm_resend, :params => { :display_name => user.display_name } + end end assert_response :redirect @@ -516,7 +548,9 @@ class UsersControllerTest < ActionController::TestCase def test_confirm_resend_unknown_user assert_no_difference "ActionMailer::Base.deliveries.size" do - get :confirm_resend, :params => { :display_name => "No Such User" } + perform_enqueued_jobs do + get :confirm_resend, :params => { :display_name => "No Such User" } + end end assert_response :redirect @@ -653,6 +687,17 @@ class UsersControllerTest < ActionController::TestCase assert_equal true, user.terms_seen end + # Check that if you haven't seen the terms, and make a request that requires authentication, + # that your request is redirected to view the terms + def test_terms_not_seen_redirection + user = create(:user, :terms_seen => false) + session[:user] = user.id + + get :account, :params => { :display_name => user.display_name } + assert_response :redirect + assert_redirected_to :action => :terms, :referer => "/user/#{ERB::Util.u(user.display_name)}/account" + end + def test_go_public user = create(:user, :data_public => false) post :go_public, :session => { :user => user } @@ -674,7 +719,9 @@ class UsersControllerTest < ActionController::TestCase uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) } assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :lost_password, :params => { :user => { :email => user.email } } + perform_enqueued_jobs do + post :lost_password, :params => { :user => { :email => user.email } } + end end assert_response :redirect assert_redirected_to :action => :login @@ -687,7 +734,9 @@ class UsersControllerTest < ActionController::TestCase # Test resetting using an address that matches a different user # that has the same address in a different case assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :lost_password, :params => { :user => { :email => user.email.upcase } } + perform_enqueued_jobs do + post :lost_password, :params => { :user => { :email => user.email.upcase } } + end end assert_response :redirect assert_redirected_to :action => :login @@ -700,7 +749,9 @@ class UsersControllerTest < ActionController::TestCase # Test resetting using an address that is a case insensitive match # for more than one user but not an exact match for either assert_no_difference "ActionMailer::Base.deliveries.size" do - post :lost_password, :params => { :user => { :email => user.email.titlecase } } + perform_enqueued_jobs do + post :lost_password, :params => { :user => { :email => user.email.titlecase } } + end end assert_response :success assert_template :lost_password @@ -710,7 +761,9 @@ class UsersControllerTest < ActionController::TestCase # address which is case insensitively unique third_user = create(:user) assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :lost_password, :params => { :user => { :email => third_user.email } } + perform_enqueued_jobs do + post :lost_password, :params => { :user => { :email => third_user.email } } + end end assert_response :redirect assert_redirected_to :action => :login @@ -723,7 +776,9 @@ class UsersControllerTest < ActionController::TestCase # Test resetting using an address that matches a user that has the # same (case insensitively unique) address in a different case assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :lost_password, :params => { :user => { :email => third_user.email.upcase } } + perform_enqueued_jobs do + post :lost_password, :params => { :user => { :email => third_user.email.upcase } } + end end assert_response :redirect assert_redirected_to :action => :login @@ -898,7 +953,9 @@ class UsersControllerTest < ActionController::TestCase # Changing email to one that exists should fail user.new_email = create(:user).email assert_no_difference "ActionMailer::Base.deliveries.size" do - post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } + perform_enqueued_jobs do + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } + end end assert_response :success assert_template :account @@ -909,7 +966,9 @@ class UsersControllerTest < ActionController::TestCase # Changing email to one that exists should fail, regardless of case user.new_email = create(:user).email.upcase assert_no_difference "ActionMailer::Base.deliveries.size" do - post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } + perform_enqueued_jobs do + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } + end end assert_response :success assert_template :account @@ -920,7 +979,9 @@ class UsersControllerTest < 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, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } + perform_enqueued_jobs do + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } + end end assert_response :success assert_template :account @@ -941,8 +1002,11 @@ class UsersControllerTest < ActionController::TestCase assert_response :not_found # Test a normal user - user = create(:user) - create(:friend, :befriender => 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(:changeset, :user => friend_user) + get :show, :params => { :display_name => user.display_name } assert_response :success assert_select "div#userinformation" do @@ -1257,7 +1321,9 @@ class UsersControllerTest < ActionController::TestCase # When logged in a POST should add the friendship assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } + perform_enqueued_jobs do + post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } + end end assert_redirected_to user_path(friend) assert_match(/is now your friend/, flash[:notice]) @@ -1269,7 +1335,9 @@ class UsersControllerTest < ActionController::TestCase # A second POST should report that the friendship already exists assert_no_difference "ActionMailer::Base.deliveries.size" do - post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } + perform_enqueued_jobs do + post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } + end end assert_redirected_to user_path(friend) assert_match(/You are already friends with/, flash[:warning]) @@ -1296,7 +1364,9 @@ class UsersControllerTest < 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, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user } + perform_enqueued_jobs do + post :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user } + end end assert_redirected_to "/test" assert_match(/is now your friend/, flash[:notice])