Fixed that delete watcher link was broken by r11290 (#13231).
Deleting a watcher now use DELETE /watchers instead of POST /watchers/destroy. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11443 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -186,7 +186,7 @@ class WatchersControllerTest < ActionController::TestCase
|
||||
def test_remove_watcher
|
||||
@request.session[:user_id] = 2
|
||||
assert_difference('Watcher.count', -1) do
|
||||
xhr :post, :destroy, :object_type => 'issue', :object_id => '2', :user_id => '3'
|
||||
xhr :delete, :destroy, :object_type => 'issue', :object_id => '2', :user_id => '3'
|
||||
assert_response :success
|
||||
assert_match /watchers/, response.body
|
||||
end
|
||||
|
||||
@@ -32,7 +32,7 @@ class RoutingWatchersTest < ActionController::IntegrationTest
|
||||
{ :controller => 'watchers', :action => 'create' }
|
||||
)
|
||||
assert_routing(
|
||||
{ :method => 'post', :path => "/watchers/destroy" },
|
||||
{ :method => 'delete', :path => "/watchers" },
|
||||
{ :controller => 'watchers', :action => 'destroy' }
|
||||
)
|
||||
assert_routing(
|
||||
|
||||
@@ -172,6 +172,19 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
|
||||
assert_equal 'CF value', issue.custom_field_value(field)
|
||||
end
|
||||
|
||||
def test_remove_issue_watcher_from_sidebar
|
||||
user = User.find(3)
|
||||
Watcher.create!(:watchable => Issue.find(1), :user => user)
|
||||
|
||||
log_user('jsmith', 'jsmith')
|
||||
visit '/issues/1'
|
||||
assert page.first('#sidebar').has_content?(user.name)
|
||||
assert_difference 'Watcher.count', -1 do
|
||||
page.first('ul.watchers .user-3 a.delete').click
|
||||
end
|
||||
assert page.first('#sidebar').has_no_content?(user.name)
|
||||
end
|
||||
|
||||
def test_watch_issue_via_context_menu
|
||||
log_user('jsmith', 'jsmith')
|
||||
visit '/issues'
|
||||
|
||||
Reference in New Issue
Block a user