From 31b8e50459f93ed3fc28dc927dde86da76903a13 Mon Sep 17 00:00:00 2001 From: Jens Kraemer Date: Fri, 14 Jun 2019 07:41:26 +0000 Subject: [PATCH 3/3] lets sudo mode handle PUT on my/account, makes tests use put as well #31399 --- app/controllers/my_controller.rb | 2 +- test/integration/routing/my_test.rb | 2 +- test/integration/sudo_mode_test.rb | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 61fb32d07..c5a8bfd08 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -25,7 +25,7 @@ class MyController < ApplicationController accept_api_auth :account - require_sudo_mode :account, only: :post + require_sudo_mode :account, only: :put require_sudo_mode :reset_rss_key, :reset_api_key, :show_api_key, :destroy helper :issues diff --git a/test/integration/routing/my_test.rb b/test/integration/routing/my_test.rb index 95af52edc..bbab2c164 100644 --- a/test/integration/routing/my_test.rb +++ b/test/integration/routing/my_test.rb @@ -22,7 +22,7 @@ require File.expand_path('../../../test_helper', __FILE__) class RoutingMyTest < Redmine::RoutingTest def test_my should_route 'GET /my/account' => 'my#account' - should_route 'POST /my/account' => 'my#account' + should_route 'PUT /my/account' => 'my#account' should_route 'GET /my/account/destroy' => 'my#destroy' should_route 'POST /my/account/destroy' => 'my#destroy' diff --git a/test/integration/sudo_mode_test.rb b/test/integration/sudo_mode_test.rb index b461c2f18..c73b8cec6 100644 --- a/test/integration/sudo_mode_test.rb +++ b/test/integration/sudo_mode_test.rb @@ -149,7 +149,7 @@ class SudoModeTest < Redmine::IntegrationTest expire_sudo_mode! get '/my/account' assert_response :success - post '/my/account', :params => {user: { mail: 'newmail@test.com' }} + put '/my/account', :params => {user: { mail: 'newmail@test.com' }} assert_response :success assert_select 'h2', 'Confirm your password to continue' assert_select 'form[action="/my/account"]' @@ -157,7 +157,7 @@ class SudoModeTest < Redmine::IntegrationTest assert_select '#flash_error', 0 # wrong password - post '/my/account', :params => {user: { mail: 'newmail@test.com' }, sudo_password: 'wrong'} + put '/my/account', :params => {user: { mail: 'newmail@test.com' }, sudo_password: 'wrong'} assert_response :success assert_select 'h2', 'Confirm your password to continue' assert_select 'form[action="/my/account"]' @@ -165,12 +165,12 @@ class SudoModeTest < Redmine::IntegrationTest assert_select '#flash_error' # correct password - post '/my/account', :params => {user: { mail: 'newmail@test.com' }, sudo_password: 'jsmith'} + put '/my/account', :params => {user: { mail: 'newmail@test.com' }, sudo_password: 'jsmith'} assert_redirected_to '/my/account' assert_equal 'newmail@test.com', User.find_by_login('jsmith').mail # sudo mode should now be active and not require password again - post '/my/account', :params => {user: { mail: 'even.newer.mail@test.com' }} + put '/my/account', :params => {user: { mail: 'even.newer.mail@test.com' }} assert_redirected_to '/my/account' assert_equal 'even.newer.mail@test.com', User.find_by_login('jsmith').mail end -- 2.11.0