jro_apps/redmine Commit - r14564:9b52ae5c5a64

Fixed that user with permission can't remove a locked watcher (#21382)....

Jean-Philippe Lang -

r14564:9b52ae5c5a64

parent child

Context file:

r14564:9b52ae5c5a64

app/controllers/watchers_controller.rb +3 -1

                end
                def destroy
-                 @watched.set_watcher(User.visible.find(params[:user_id]), false)
+                 @watched.set_watcher(User.find(params[:user_id]), false)
                  respond_to do |format|
                    format.html { redirect_to :back }
                    format.js
                    format.api { render_api_ok }
                  end
+               rescue ActiveRecord::RecordNotFound
+                 render_404
                end
                def autocomplete_for_user

test/functional/watchers_controller_test.rb +23 -1

                  assert response.body.blank?
                end
-               def test_remove_watcher
+               def test_destroy
                  @request.session[:user_id] = 2
                  assert_difference('Watcher.count', -1) do
                    xhr :delete, :destroy, :object_type => 'issue', :object_id => '2', :user_id => '3'
                  end
                  assert !Issue.find(2).watched_by?(User.find(3))
                end
+               def test_destroy_locked_user
+                 user = User.find(3)
+                 user.lock!
+                 assert user.reload.locked?
+                 @request.session[:user_id] = 2
+                 assert_difference('Watcher.count', -1) do
+                   xhr :delete, :destroy, :object_type => 'issue', :object_id => '2', :user_id => '3'
+                   assert_response :success
+                   assert_match /watchers/, response.body
+                 end
+                 assert !Issue.find(2).watched_by?(User.find(3))
+               end
+               def test_destroy_invalid_user_should_respond_with_404
+                 @request.session[:user_id] = 2
+                 assert_no_difference('Watcher.count') do
+                   delete :destroy, :object_type => 'issue', :object_id => '2', :user_id => '999'
+                   assert_response 404
+                 end
+               end
              end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages