X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cea6f9c4cfc7dc1bd0dc9aa71f3a39feecb98113..3893fd72a953beba360fd205ca9fcc2abf623024:/test/controllers/user_controller_test.rb diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb index d3a654437..7c79717f3 100644 --- a/test/controllers/user_controller_test.rb +++ b/test/controllers/user_controller_test.rb @@ -1,8 +1,6 @@ require "test_helper" class UserControllerTest < ActionController::TestCase - api_fixtures - def setup stub_hostip_requests end @@ -190,7 +188,7 @@ class UserControllerTest < ActionController::TestCase assert_response :redirect assert_redirected_to user_new_path(:cookie_test => "true") - get :new, { :cookie_test => "true" }, { :cookie_test => true } + get :new, :params => { :cookie_test => "true" }, :session => { :cookie_test => true } assert_response :success assert_select "html", :count => 1 do @@ -218,14 +216,14 @@ class UserControllerTest < ActionController::TestCase get :new assert_response :redirect assert_redirected_to user_new_path(:cookie_test => "true") - get :new, :cookie_test => "true" + get :new, :params => { :cookie_test => "true" } assert_response :redirect assert_redirected_to root_path - get :new, :referer => "/test" + get :new, :params => { :referer => "/test" } assert_response :redirect assert_redirected_to user_new_path(:referer => "/test", :cookie_test => "true") - get :new, :referer => "/test", :cookie_test => "true" + get :new, :params => { :referer => "/test", :cookie_test => "true" } assert_response :redirect assert_redirected_to "/test" end @@ -235,7 +233,7 @@ class UserControllerTest < ActionController::TestCase assert_difference "User.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :save, {}, { :new_user => user } + post :save, :session => { :new_user => user } end end @@ -257,7 +255,7 @@ class UserControllerTest < ActionController::TestCase assert_no_difference "User.count" do assert_no_difference "ActionMailer::Base.deliveries.size" do - post :save, {}, { :new_user => user } + post :save, :session => { :new_user => user } end end @@ -272,7 +270,7 @@ class UserControllerTest < ActionController::TestCase assert_no_difference "User.count" do assert_no_difference "ActionMailer::Base.deliveries.size" do - post :save, {}, { :new_user => user } + post :save, :session => { :new_user => user } end end @@ -287,7 +285,7 @@ class UserControllerTest < ActionController::TestCase assert_no_difference "User.count" do assert_no_difference "ActionMailer::Base.deliveries.size" do - post :save, {}, { :new_user => user } + post :save, :session => { :new_user => user } end end @@ -302,7 +300,7 @@ class UserControllerTest < ActionController::TestCase assert_no_difference "User.count" do assert_no_difference "ActionMailer::Base.deliveries.size" do - post :save, {}, { :new_user => user } + post :save, :session => { :new_user => user } end end @@ -316,8 +314,8 @@ class UserControllerTest < ActionController::TestCase assert_difference "User.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :save, {}, { :new_user => user, - :referer => "/edit?editor=id#map=1/2/3" } + post :save, :session => { :new_user => user, + :referer => "/edit?editor=id#map=1/2/3" } end end @@ -335,20 +333,20 @@ class UserControllerTest < ActionController::TestCase session_id = assert_select("input[name=session]").first["value"] - get :logout, :session => session_id + get :logout, :params => { :session => session_id } assert_response :redirect assert_redirected_to root_path end def test_logout_with_referer - get :logout, :referer => "/test" + 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, :session => session_id, :referer => "/test" + get :logout, :params => { :session => session_id, :referer => "/test" } assert_response :redirect assert_redirected_to "/test" end @@ -367,7 +365,7 @@ class UserControllerTest < ActionController::TestCase session_id = assert_select("input[name=session]").first["value"] - get :logout, :session => session_id + get :logout, :params => { :session => session_id } assert_response :redirect assert_redirected_to root_path assert_nil session[:token] @@ -379,7 +377,7 @@ class UserControllerTest < ActionController::TestCase confirm_string = user.tokens.create.token @request.cookies["_osm_session"] = user.display_name - get :confirm, :display_name => user.display_name, :confirm_string => confirm_string + get :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string } assert_response :success assert_template :confirm end @@ -389,7 +387,7 @@ class UserControllerTest < ActionController::TestCase confirm_string = user.tokens.create.token @request.cookies["_osm_session"] = user.display_name - get :confirm, :display_name => user.display_name, :confirm_string => confirm_string + get :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string } assert_response :redirect assert_redirected_to root_path end @@ -400,7 +398,7 @@ class UserControllerTest < ActionController::TestCase confirm_string = user.tokens.create.token @request.cookies["_osm_session"] = user.display_name - post :confirm, :display_name => user.display_name, :confirm_string => confirm_string + post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string } assert_redirected_to login_path assert_match /Confirmed your account/, flash[:notice] end @@ -412,7 +410,7 @@ class UserControllerTest < ActionController::TestCase token = user.tokens.create.token @request.cookies["_osm_session"] = user.display_name - post :confirm, { :display_name => user.display_name, :confirm_string => confirm_string }, { :token => token } + post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token } assert_redirected_to welcome_path end @@ -423,7 +421,7 @@ class UserControllerTest < ActionController::TestCase token = create(:user).tokens.create.token @request.cookies["_osm_session"] = user.display_name - post :confirm, { :display_name => user.display_name, :confirm_string => confirm_string }, { :token => token } + post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token } assert_redirected_to login_path assert_match /Confirmed your account/, flash[:notice] end @@ -434,7 +432,7 @@ class UserControllerTest < ActionController::TestCase confirm_string = user.tokens.create(:referer => diary_new_path).token @request.cookies["_osm_session"] = user.display_name - post :confirm, :display_name => user.display_name, :confirm_string => confirm_string + post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string } assert_redirected_to login_path(:referer => diary_new_path) assert_match /Confirmed your account/, flash[:notice] end @@ -446,7 +444,7 @@ class UserControllerTest < ActionController::TestCase token = user.tokens.create.token @request.cookies["_osm_session"] = user.display_name - post :confirm, { :display_name => user.display_name, :confirm_string => confirm_string }, { :token => token } + post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token } assert_redirected_to diary_new_path end @@ -457,7 +455,7 @@ class UserControllerTest < ActionController::TestCase token = create(:user).tokens.create.token @request.cookies["_osm_session"] = user.display_name - post :confirm, { :display_name => user.display_name, :confirm_string => confirm_string }, { :token => token } + post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token } assert_redirected_to login_path(:referer => diary_new_path) assert_match /Confirmed your account/, flash[:notice] end @@ -467,7 +465,7 @@ class UserControllerTest < ActionController::TestCase confirm_string = user.tokens.create(:expiry => 1.day.ago).token @request.cookies["_osm_session"] = user.display_name - post :confirm, :display_name => user.display_name, :confirm_string => confirm_string + post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string } assert_redirected_to :action => "confirm" assert_match /confirmation code has expired/, flash[:error] end @@ -477,7 +475,7 @@ class UserControllerTest < ActionController::TestCase confirm_string = user.tokens.create(:referer => diary_new_path).token @request.cookies["_osm_session"] = user.display_name - post :confirm, :display_name => user.display_name, :confirm_string => confirm_string + post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string } assert_redirected_to :action => "login" assert_match /already been confirmed/, flash[:error] end @@ -487,7 +485,7 @@ class UserControllerTest < ActionController::TestCase session[:token] = user.tokens.create.token assert_difference "ActionMailer::Base.deliveries.size", 1 do - get :confirm_resend, :display_name => user.display_name + get :confirm_resend, :params => { :display_name => user.display_name } end assert_response :redirect @@ -504,7 +502,7 @@ class UserControllerTest < ActionController::TestCase def test_confirm_resend_no_token user = create(:user, :pending) assert_no_difference "ActionMailer::Base.deliveries.size" do - get :confirm_resend, :display_name => user.display_name + get :confirm_resend, :params => { :display_name => user.display_name } end assert_response :redirect @@ -514,7 +512,7 @@ class UserControllerTest < ActionController::TestCase def test_confirm_resend_unknown_user assert_no_difference "ActionMailer::Base.deliveries.size" do - get :confirm_resend, :display_name => "No Such User" + get :confirm_resend, :params => { :display_name => "No Such User" } end assert_response :redirect @@ -526,7 +524,7 @@ class UserControllerTest < ActionController::TestCase user = create(:user) confirm_string = user.tokens.create.token - get :confirm_email, :confirm_string => confirm_string + get :confirm_email, :params => { :confirm_string => confirm_string } assert_response :success assert_template :confirm_email end @@ -536,7 +534,7 @@ class UserControllerTest < ActionController::TestCase stub_gravatar_request(user.new_email) confirm_string = user.tokens.create.token - post :confirm_email, :confirm_string => confirm_string + post :confirm_email, :params => { :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] @@ -546,14 +544,14 @@ class UserControllerTest < ActionController::TestCase user = create(:user) confirm_string = user.tokens.create.token - post :confirm_email, :confirm_string => confirm_string + post :confirm_email, :params => { :confirm_string => confirm_string } assert_response :redirect assert_redirected_to :action => :account, :display_name => user.display_name assert_match /already been confirmed/, flash[:error] end def test_confirm_email_bad_token - post :confirm_email, :confirm_string => "XXXXX" + post :confirm_email, :params => { :confirm_string => "XXXXX" } assert_response :success assert_template :confirm_email assert_match /confirmation code has expired or does not exist/, flash[:error] @@ -570,7 +568,7 @@ class UserControllerTest < ActionController::TestCase confirm_string = user.tokens.create.token # precondition gravatar should be turned off assert !user.image_use_gravatar - post :confirm_email, :confirm_string => confirm_string + post :confirm_email, :params => { :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] @@ -585,7 +583,7 @@ class UserControllerTest < ActionController::TestCase confirm_string = user.tokens.create.token # precondition gravatar should be turned on assert user.image_use_gravatar - post :confirm_email, :confirm_string => confirm_string + post :confirm_email, :params => { :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] @@ -594,7 +592,7 @@ class UserControllerTest < ActionController::TestCase end def test_terms_new_user - get :terms, {}, { :new_user => User.new } + get :terms, :session => { :new_user => User.new } assert_response :success assert_template :terms end @@ -618,7 +616,7 @@ class UserControllerTest < ActionController::TestCase assert_response :success assert_template :terms - post :save, :user => { :consider_pd => true } + post :save, :params => { :user => { :consider_pd => true } } assert_response :redirect assert_redirected_to :action => :account, :display_name => user.display_name assert_equal "Thanks for accepting the new contributor terms!", flash[:notice] @@ -635,11 +633,11 @@ class UserControllerTest < ActionController::TestCase session[:user] = user.id - get :terms, :referer => "/test" + get :terms, :params => { :referer => "/test" } assert_response :success assert_template :terms - post :save, :user => { :consider_pd => true }, :referer => "/test" + post :save, :params => { :user => { :consider_pd => true }, :referer => "/test" } assert_response :redirect assert_redirected_to "/test" assert_equal "Thanks for accepting the new contributor terms!", flash[:notice] @@ -653,7 +651,7 @@ class UserControllerTest < ActionController::TestCase def test_go_public user = create(:user, :data_public => false) - post :go_public, {}, { :user => user } + 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 @@ -672,7 +670,7 @@ class UserControllerTest < 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, :user => { :email => user.email } + post :lost_password, :params => { :user => { :email => user.email } } end assert_response :redirect assert_redirected_to :action => :login @@ -685,7 +683,7 @@ class UserControllerTest < 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, :user => { :email => user.email.upcase } + post :lost_password, :params => { :user => { :email => user.email.upcase } } end assert_response :redirect assert_redirected_to :action => :login @@ -698,7 +696,7 @@ class UserControllerTest < 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, :user => { :email => user.email.titlecase } + post :lost_password, :params => { :user => { :email => user.email.titlecase } } end assert_response :success assert_template :lost_password @@ -708,7 +706,7 @@ class UserControllerTest < ActionController::TestCase # address which is case insensitively unique third_user = create(:user) assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :lost_password, :user => { :email => third_user.email } + post :lost_password, :params => { :user => { :email => third_user.email } } end assert_response :redirect assert_redirected_to :action => :login @@ -721,7 +719,7 @@ class UserControllerTest < 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, :user => { :email => third_user.email.upcase } + post :lost_password, :params => { :user => { :email => third_user.email.upcase } } end assert_response :redirect assert_redirected_to :action => :login @@ -739,7 +737,7 @@ class UserControllerTest < ActionController::TestCase assert_response :bad_request # Test a request with a bogus token - get :reset_password, :token => "made_up_token" + get :reset_password, :params => { :token => "made_up_token" } assert_response :redirect assert_redirected_to :action => :lost_password @@ -747,12 +745,12 @@ class UserControllerTest < ActionController::TestCase token = user.tokens.create # Test a request with a valid token - get :reset_password, :token => token.token + get :reset_password, :params => { :token => token.token } assert_response :success assert_template :reset_password # Test setting a new password - post :reset_password, :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" } + post :reset_password, :params => { :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" } } assert_response :redirect assert_redirected_to root_path assert_equal user.id, session[:user] @@ -772,22 +770,23 @@ class UserControllerTest < ActionController::TestCase # Make sure that you are redirected to the login page when # you are not logged in - get :account, :display_name => user.display_name + get :account, :params => { :display_name => user.display_name } assert_response :redirect assert_redirected_to :controller => :user, :action => "login", :referer => "/user/#{URI.encode(user.display_name)}/account" # Make sure that you are blocked when not logged in as the right user - get :account, { :display_name => user.display_name }, { :user => create(:user) } + get :account, :params => { :display_name => user.display_name }, :session => { :user => create(:user) } assert_response :forbidden # Make sure we get the page when we are logged in as the right user - get :account, { :display_name => user.display_name }, { :user => user } + get :account, :params => { :display_name => user.display_name }, :session => { :user => user } assert_response :success assert_template :account # Updating the description should work user.description = "new description" - post :account, { :display_name => user.display_name, :user => user.attributes }, { :user => user } + user.preferred_editor = "default" + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -796,7 +795,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 } + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select ".notice", false @@ -805,7 +804,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 } + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -814,7 +813,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 } + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -823,7 +822,7 @@ class UserControllerTest < ActionController::TestCase # Changing to an uploaded image should work 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 } + post :account, :params => { :display_name => user.display_name, :image_action => "new", :user => user.attributes.merge(:image => image) }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -831,7 +830,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 } + post :account, :params => { :display_name => user.display_name, :image_action => "gravatar", :user => user.attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -839,7 +838,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 } + post :account, :params => { :display_name => user.display_name, :image_action => "delete", :user => user.attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -847,13 +846,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 } + post :account, :params => { :display_name => user.display_name, :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }, :session => { :user => user } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "https://www.google.com/accounts/o8/id", :origin => "/user/#{URI.encode(user.display_name)}/account") # Changing name to one that exists should fail new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name) - post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user } + post :account, :params => { :display_name => user.display_name, :user => new_attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select ".notice", false @@ -862,7 +861,7 @@ class UserControllerTest < ActionController::TestCase # Changing name to one that exists should fail, regardless of case new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase) - post :account, { :display_name => user.display_name, :user => new_attributes }, { :user => user } + post :account, :params => { :display_name => user.display_name, :user => new_attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select ".notice", false @@ -871,7 +870,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 } + post :account, :params => { :display_name => user.display_name, :user => new_attributes }, :session => { :user => user } assert_response :success assert_template :account assert_select "div#errorExplanation", false @@ -884,7 +883,7 @@ class UserControllerTest < 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, { :display_name => user.display_name, :user => user.attributes }, { :user => user } + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } end assert_response :success assert_template :account @@ -895,7 +894,7 @@ class UserControllerTest < 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, { :display_name => user.display_name, :user => user.attributes }, { :user => user } + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } end assert_response :success assert_template :account @@ -906,7 +905,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 } + post :account, :params => { :display_name => user.display_name, :user => user.attributes }, :session => { :user => user } end assert_response :success assert_template :account @@ -923,12 +922,12 @@ class UserControllerTest < ActionController::TestCase # information for the user def test_view # Test a non-existent user - get :view, :display_name => "unknown" + get :view, :params => { :display_name => "unknown" } assert_response :not_found # Test a normal user user = create(:user) - get :view, :display_name => user.display_name + get :view, :params => { :display_name => user.display_name } assert_response :success assert_select "div#userinformation" do assert_select "a[href^='/user/#{URI.encode(user.display_name)}/history']", 1 @@ -944,7 +943,7 @@ class UserControllerTest < ActionController::TestCase # Test a user who has been blocked blocked_user = create(:user) create(:user_block, :user => blocked_user) - get :view, :display_name => blocked_user.display_name + get :view, :params => { :display_name => blocked_user.display_name } assert_response :success assert_select "div#userinformation" do assert_select "a[href^='/user/#{URI.encode(blocked_user.display_name)}/history']", 1 @@ -960,7 +959,7 @@ class UserControllerTest < ActionController::TestCase # Test a moderator who has applied blocks moderator_user = create(:moderator_user) create(:user_block, :creator => moderator_user) - get :view, :display_name => moderator_user.display_name + get :view, :params => { :display_name => moderator_user.display_name } assert_response :success assert_select "div#userinformation" do assert_select "a[href^='/user/#{URI.encode(moderator_user.display_name)}/history']", 1 @@ -977,7 +976,7 @@ class UserControllerTest < ActionController::TestCase session[:user] = user.id # Test the normal user - get :view, :display_name => user.display_name + get :view, :params => { :display_name => user.display_name } assert_response :success assert_select "div#userinformation" do assert_select "a[href^='/user/#{URI.encode(user.display_name)}/history']", 1 @@ -994,7 +993,7 @@ class UserControllerTest < ActionController::TestCase session[:user] = create(:moderator_user).id # Test the normal user - get :view, :display_name => user.display_name + get :view, :params => { :display_name => user.display_name } assert_response :success assert_select "div#userinformation" do assert_select "a[href^='/user/#{URI.encode(user.display_name)}/history']", 1 @@ -1011,7 +1010,7 @@ class UserControllerTest < ActionController::TestCase def test_api_read user = create(:user, :description => "test", :terms_agreed => Date.yesterday) # check that a visible user is returned properly - get :api_read, :id => user.id + get :api_read, :params => { :id => user.id } assert_response :success assert_equal "text/xml", response.content_type @@ -1044,15 +1043,15 @@ class UserControllerTest < ActionController::TestCase assert_select "messages", false # check that a suspended user is not returned - get :api_read, :id => create(:user, :suspended).id + get :api_read, :params => { :id => create(:user, :suspended).id } assert_response :gone # check that a deleted user is not returned - get :api_read, :id => create(:user, :deleted).id + get :api_read, :params => { :id => create(:user, :deleted).id } assert_response :gone # check that a non-existent user is not returned - get :api_read, :id => 0 + get :api_read, :params => { :id => 0 } assert_response :not_found end @@ -1124,7 +1123,7 @@ class UserControllerTest < ActionController::TestCase basic_authorization(user.email, "test") get :api_gpx_files assert_response :success - assert_equal "text/xml", response.content_type + assert_equal "application/xml", response.content_type # check the data that is returned assert_select "gpx_file[id='#{trace1.id}']", 1 do @@ -1144,16 +1143,16 @@ class UserControllerTest < ActionController::TestCase assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first # When not logged in a GET should ask us to login - get :make_friend, :display_name => friend.display_name + get :make_friend, :params => { :display_name => friend.display_name } assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name) # When not logged in a POST should error - post :make_friend, :display_name => friend.display_name + 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 # When logged in a GET should get a confirmation page - get :make_friend, { :display_name => friend.display_name }, { :user => user } + get :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } assert_response :success assert_template :make_friend assert_select "form" do @@ -1164,7 +1163,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 } + post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } end assert_redirected_to user_path(:display_name => friend.display_name) assert_match /is now your friend/, flash[:notice] @@ -1176,7 +1175,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 } + post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } end assert_redirected_to user_path(:display_name => friend.display_name) assert_match /You are already friends with/, flash[:warning] @@ -1192,7 +1191,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 } + get :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user } assert_response :success assert_template :make_friend assert_select "form" do @@ -1203,7 +1202,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 } + post :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user } end assert_redirected_to "/test" assert_match /is now your friend/, flash[:notice] @@ -1216,7 +1215,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 => create(:user) } + get :make_friend, :params => { :display_name => "No Such User" }, :session => { :user => create(:user) } assert_response :not_found assert_template :no_such_user end @@ -1231,16 +1230,16 @@ class UserControllerTest < ActionController::TestCase assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first # When not logged in a GET should ask us to login - get :remove_friend, :display_name => friend.display_name + get :remove_friend, :params => { :display_name => friend.display_name } assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name) # When not logged in a POST should error - post :remove_friend, :display_name => friend.display_name + 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 # When logged in a GET should get a confirmation page - get :remove_friend, { :display_name => friend.display_name }, { :user => user } + get :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user } assert_response :success assert_template :remove_friend assert_select "form" do @@ -1250,13 +1249,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 } + post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :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 } + post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :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 @@ -1272,7 +1271,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 } + get :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user } assert_response :success assert_template :remove_friend assert_select "form" do @@ -1282,7 +1281,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 } + 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 @@ -1290,7 +1289,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 => create(:user) } + get :remove_friend, :params => { :display_name => "No Such User" }, :session => { :user => create(:user) } assert_response :not_found assert_template :no_such_user end @@ -1299,17 +1298,17 @@ class UserControllerTest < ActionController::TestCase user = create(:user) # Try without logging in - get :set_status, :display_name => user.display_name, :status => "suspended" + get :set_status, :params => { :display_name => user.display_name, :status => "suspended" } assert_response :redirect assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended") # Now try as a normal user - get :set_status, { :display_name => user.display_name, :status => "suspended" }, { :user => user } + get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user } assert_response :redirect assert_redirected_to :action => :view, :display_name => user.display_name # Finally try as an administrator - get :set_status, { :display_name => user.display_name, :status => "suspended" }, { :user => create(:administrator_user) } + get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) } assert_response :redirect assert_redirected_to :action => :view, :display_name => user.display_name assert_equal "suspended", User.find(user.id).status @@ -1319,17 +1318,17 @@ class UserControllerTest < ActionController::TestCase user = create(:user, :home_lat => 12.1, :home_lon => 12.1, :description => "test") # Try without logging in - get :delete, :display_name => user.display_name, :status => "suspended" + get :delete, :params => { :display_name => user.display_name, :status => "suspended" } assert_response :redirect assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended") # Now try as a normal user - get :delete, { :display_name => user.display_name, :status => "suspended" }, { :user => user } + get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user } assert_response :redirect assert_redirected_to :action => :view, :display_name => user.display_name # Finally try as an administrator - get :delete, { :display_name => user.display_name, :status => "suspended" }, { :user => create(:administrator_user) } + get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) } assert_response :redirect assert_redirected_to :action => :view, :display_name => user.display_name @@ -1351,8 +1350,8 @@ class UserControllerTest < ActionController::TestCase user = create(:user) moderator_user = create(:moderator_user) administrator_user = create(:administrator_user) - suspended_user = create(:user, :suspended) - ip_user = create(:user, :creation_ip => "1.2.3.4") + _suspended_user = create(:user, :suspended) + _ip_user = create(:user, :creation_ip => "1.2.3.4") # There are now 7 users - the five above, plus two extra "granters" for the # moderator_user and administrator_user @@ -1387,13 +1386,13 @@ class UserControllerTest < ActionController::TestCase assert_select "table#user_list tr", :count => 7 + 1 # Should be able to limit by status - get :list, :status => "suspended" + get :list, :params => { :status => "suspended" } assert_response :success assert_template :list assert_select "table#user_list tr", :count => 1 + 1 # Should be able to limit by IP address - get :list, :ip => "1.2.3.4" + get :list, :params => { :ip => "1.2.3.4" } assert_response :success assert_template :list assert_select "table#user_list tr", :count => 1 + 1 @@ -1408,20 +1407,23 @@ class UserControllerTest < ActionController::TestCase session[:user] = create(:administrator_user).id + # 100 examples, an administrator, and a granter for the admin. + assert_equal 102, User.count + get :list assert_response :success assert_template :list assert_select "table#user_list tr", :count => 51 - get :list, :page => 2 + get :list, :params => { :page => 2 } assert_response :success assert_template :list assert_select "table#user_list tr", :count => 51 - get :list, :page => 3 + get :list, :params => { :page => 3 } assert_response :success assert_template :list - assert_select "table#user_list tr", :count => 28 + assert_select "table#user_list tr", :count => 3 end def test_list_post_confirm @@ -1430,10 +1432,10 @@ class UserControllerTest < ActionController::TestCase # Shouldn't work when not logged in assert_no_difference "User.active.count" do - post :list, :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } + post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } } end assert_response :redirect - assert_redirected_to :action => :login, :referer => users_path(:confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 }) + assert_redirected_to :action => :login, :referer => users_path assert_equal "pending", inactive_user.reload.status assert_equal "suspended", suspended_user.reload.status @@ -1441,10 +1443,10 @@ class UserControllerTest < ActionController::TestCase # Shouldn't work when logged in as a normal user assert_no_difference "User.active.count" do - post :list, :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } + post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } } end assert_response :redirect - assert_redirected_to :action => :login, :referer => users_path(:confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 }) + assert_redirected_to :action => :login, :referer => users_path assert_equal "pending", inactive_user.reload.status assert_equal "suspended", suspended_user.reload.status @@ -1452,10 +1454,10 @@ class UserControllerTest < ActionController::TestCase # Shouldn't work when logged in as a moderator assert_no_difference "User.active.count" do - post :list, :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } + post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } } end assert_response :redirect - assert_redirected_to :action => :login, :referer => users_path(:confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 }) + assert_redirected_to :action => :login, :referer => users_path assert_equal "pending", inactive_user.reload.status assert_equal "suspended", suspended_user.reload.status @@ -1463,7 +1465,7 @@ class UserControllerTest < ActionController::TestCase # Should work when logged in as an administrator assert_difference "User.active.count", 2 do - post :list, :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } + post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } } end assert_response :redirect assert_redirected_to :action => :list @@ -1477,10 +1479,10 @@ class UserControllerTest < ActionController::TestCase # Shouldn't work when not logged in assert_no_difference "User.active.count" do - post :list, :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } + post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } } end assert_response :redirect - assert_redirected_to :action => :login, :referer => users_path(:hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 }) + assert_redirected_to :action => :login, :referer => users_path assert_equal "active", normal_user.reload.status assert_equal "confirmed", confirmed_user.reload.status @@ -1488,10 +1490,10 @@ class UserControllerTest < ActionController::TestCase # Shouldn't work when logged in as a normal user assert_no_difference "User.active.count" do - post :list, :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } + post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } } end assert_response :redirect - assert_redirected_to :action => :login, :referer => users_path(:hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 }) + assert_redirected_to :action => :login, :referer => users_path assert_equal "active", normal_user.reload.status assert_equal "confirmed", confirmed_user.reload.status @@ -1499,10 +1501,10 @@ class UserControllerTest < ActionController::TestCase # Shouldn't work when logged in as a moderator assert_no_difference "User.active.count" do - post :list, :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } + post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } } end assert_response :redirect - assert_redirected_to :action => :login, :referer => users_path(:hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 }) + assert_redirected_to :action => :login, :referer => users_path assert_equal "active", normal_user.reload.status assert_equal "confirmed", confirmed_user.reload.status @@ -1510,7 +1512,7 @@ class UserControllerTest < ActionController::TestCase # Should work when logged in as an administrator assert_difference "User.active.count", -2 do - post :list, :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } + post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } } end assert_response :redirect assert_redirected_to :action => :list