jro_apps/redmine Commit - r11113:deffd81ada71

Use POST/DELETE to watch/unwatch an item....

Jean-Philippe Lang -

r11113:deffd81ada71

parent child

Context file:

r11113:deffd81ada71

Collapse all files

app/helpers/watchers_helper.rb +4 -5

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module WatchersHelper
               def watcher_tag(object, user, options={})
                 ActiveSupport::Deprecation.warn "#watcher_tag is deprecated and will be removed in Redmine 3.0. Use #watcher_link instead."
                 watcher_link(object, user)
               end
               def watcher_link(objects, user)
                 return '' unless user && user.logged?
                 objects = Array.wrap(objects)
                 watched = objects.any? {|object| object.watched_by?(user)}
                 css = [watcher_css(objects), watched ? 'icon icon-fav' : 'icon icon-fav-off'].join(' ')
                 text = watched ? l(:button_unwatch) : l(:button_watch)
-                url = {
+                url = watch_path(
-                  :controller => 'watchers',
-                  :action => (watched ? 'unwatch' : 'watch'),
                   :object_type => objects.first.class.to_s.underscore,
                   :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort)
+                )
+                method = watched ? 'delete' : 'post'
-                link_to text, url, :remote => true, :method => 'post', :class => css
+                link_to text, url, :remote => true, :method => method, :class => css
               end
               # Returns the css class used to identify watch links for a given +object+
               def watcher_css(objects)
                 objects = Array.wrap(objects)
                 id = (objects.size == 1 ? objects.first.id : 'bulk')
                 "#{objects.first.class.to_s.underscore}-#{id}-watcher"
               end
               # Returns a comma separated list of users watching the given object
               def watchers_list(object)
                 remove_allowed = User.current.allowed_to?("delete_#{object.class.name.underscore}_watchers".to_sym, object.project)
                 content = ''.html_safe
                 lis = object.watcher_users.collect do |user|
                   s = ''.html_safe
                   s << avatar(user, :size => "16").to_s
                   s << link_to_user(user, :class => 'user')
                   if remove_allowed
                     url = {:controller => 'watchers',
                            :action => 'destroy',
                            :object_type => object.class.to_s.underscore,
                            :object_id => object.id,
                            :user_id => user}
                     s << ' '
                     s << link_to(image_tag('delete.png'), url,
                                  :remote => true, :method => 'post', :style => "vertical-align: middle", :class => "delete")
                   end
                   content << content_tag('li', s)
                 end
                 content.present? ? content_tag('ul', content) : content
               end
               def watchers_checkboxes(object, users, checked=nil)
                 users.map do |user|
                   c = checked.nil? ? object.watched_by?(user) : checked
                   tag = check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil
                   content_tag 'label', "#{tag} #{h(user)}".html_safe,
                               :id => "issue_watcher_user_ids_#{user.id}",
                               :class => "floating"
                 end.join.html_safe
               end
             end

config/routes.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             RedmineApp::Application.routes.draw do
               root :to => 'welcome#index', :as => 'home'
               match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
               match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
               match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
               match 'account/activate', :to => 'account#activate', :via => :get
               match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put]
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put]
               match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put]
               match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put]
               match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
               match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
               match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
               get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
               match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
               get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/preview', :to => 'messages#preview', :as => 'preview_board_message'
               post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
               post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
               # Misc issue routes. TODO: move into resources
               match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
               match '/issues/context_menu', :to => 'context_menus#issues', :as => 'issues_context_menu', :via => [:get, :post]
               match '/issues/changes', :to => 'journals#index', :as => 'issue_changes', :via => :get
               match '/issues/:id/quoted', :to => 'journals#new', :id => /\d+/, :via => :post, :as => 'quoted_issue'
               match '/journals/diff/:id', :to => 'journals#diff', :id => /\d+/, :via => :get
               match '/journals/edit/:id', :to => 'journals#edit', :id => /\d+/, :via => [:get, :post]
               get '/projects/:project_id/issues/gantt', :to => 'gantts#show', :as => 'project_gantt'
               get '/issues/gantt', :to => 'gantts#show'
               get '/projects/:project_id/issues/calendar', :to => 'calendars#show', :as => 'project_calendar'
               get '/issues/calendar', :to => 'calendars#show'
               get 'projects/:id/issues/report', :to => 'reports#issue_report', :as => 'project_issues_report'
               get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details'
               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
               match 'my/page', :controller => 'my', :action => 'page', :via => :get
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
               match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
               match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
               match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
               match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post
               match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
               match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
               resources :users
               match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
               match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
               match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
+              post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
+              delete 'watchers/watch', :to => 'watchers#unwatch'
               get 'watchers/new', :to => 'watchers#new'
               post 'watchers', :to => 'watchers#create'
               post 'watchers/append', :to => 'watchers#append'
               post 'watchers/destroy', :to => 'watchers#destroy'
-              post 'watchers/watch', :to => 'watchers#watch'
-              post 'watchers/unwatch', :to => 'watchers#unwatch'
               get 'watchers/autocomplete_for_user', :to => 'watchers#autocomplete_for_user'
               # Specific routes for issue watchers API
               post 'issues/:object_id/watchers', :to => 'watchers#create', :object_type => 'issue'
               delete 'issues/:object_id/watchers/:user_id' => 'watchers#destroy', :object_type => 'issue'
               resources :projects do
                 member do
                   get 'settings(/:tab)', :action => 'settings', :as => 'settings'
                   post 'modules'
                   post 'archive'
                   post 'unarchive'
                   post 'close'
                   post 'reopen'
                   match 'copy', :via => [:get, :post]
                 end
                 resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
                   collection do
                     get 'autocomplete'
                   end
                 end
                 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
                 get 'issues/:copy_from/copy', :to => 'issues#new', :as => 'copy_issue'
                 resources :issues, :only => [:index, :new, :create] do
                   resources :time_entries, :controller => 'timelog' do
                     collection do
                       get 'report'
                     end
                   end
                 end
                 # issue form update
                 match 'issues/new', :controller => 'issues', :action => 'new', :via => [:put, :post], :as => 'issue_form'
                 resources :files, :only => [:index, :new, :create]
                 resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
                   collection do
                     put 'close_completed'
                   end
                 end
                 get 'versions.:format', :to => 'versions#index'
                 get 'roadmap', :to => 'versions#index', :format => false
                 get 'versions', :to => 'versions#index'
                 resources :news, :except => [:show, :edit, :update, :destroy]
                 resources :time_entries, :controller => 'timelog' do
                   get 'report', :on => :collection
                 end
                 resources :queries, :only => [:new, :create]
                 resources :issue_categories, :shallow => true
                 resources :documents, :except => [:show, :edit, :update, :destroy]
                 resources :boards
                 resources :repositories, :shallow => true, :except => [:index, :show] do
                   member do
                     match 'committers', :via => [:get, :post]
                   end
                 end
                 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
                 resources :wiki, :except => [:index, :new, :create], :as => 'wiki_page' do
                   member do
                     get 'rename'
                     post 'rename'
                     get 'history'
                     get 'diff'
                     match 'preview', :via => [:post, :put]
                     post 'protect'
                     post 'add_attachment'
                   end
                   collection do
                     get 'export'
                     get 'date_index'
                   end
                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
                 get 'wiki/:id/:version', :to => 'wiki#show', :constraints => {:version => /\d+/}
                 delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
                 get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
                 get 'wiki/:id/:version/diff', :to => 'wiki#diff'
               end
               resources :issues do
                 collection do
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
                 resources :time_entries, :controller => 'timelog' do
                   collection do
                     get 'report'
                   end
                 end
                 resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
               end
               match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
               resources :queries, :except => [:show]
               resources :news, :only => [:index, :show, :edit, :update, :destroy]
               match '/news/:id/comments', :to => 'comments#create', :via => :post
               match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
               resources :versions, :only => [:show, :edit, :update, :destroy] do
                 post 'status_by', :on => :member
               end
               resources :documents, :only => [:show, :edit, :update, :destroy] do
                 post 'add_attachment', :on => :member
               end
               match '/time_entries/context_menu', :to => 'context_menus#time_entries', :as => :time_entries_context_menu, :via => [:get, :post]
               resources :time_entries, :controller => 'timelog', :except => :destroy do
                 collection do
                   get 'report'
                   get 'bulk_edit'
                   post 'bulk_update'
                 end
               end
               match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
               # TODO: delete /time_entries for bulk deletion
               match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
               get 'projects/:id/activity', :to => 'activities#index'
               get 'projects/:id/activity.:format', :to => 'activities#index'
               get 'activity', :to => 'activities#index'
               # repositories routes
               get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/:repository_id/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/:repository_id/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/changes(/*path(.:ext))',
                   :to => 'repositories#changes'
               get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :format => false,
                   :constraints => {
                         :action => /(browse|show|entry|raw|annotate|diff)/,
                         :rev    => /[a-z0-9\.\-_]+/
                       }
               get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:action(/*path(.:ext))',
                   :controller => 'repositories',
                   :action => /(browse|show|entry|raw|changes|annotate|diff)/
               get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
               get 'projects/:id/repository', :to => 'repositories#show', :path => nil
               # additional routes for having the file name at the end of url
               get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment'
               get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
               get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/
               get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/, :as => 'thumbnail'
               resources :attachments, :only => [:show, :destroy]
               resources :groups do
                 member do
                   get 'autocomplete_for_user'
                 end
               end
               match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
               match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
               match 'groups/destroy_membership/:id', :controller => 'groups', :action => 'destroy_membership', :id => /\d+/, :via => :post
               match 'groups/edit_membership/:id', :controller => 'groups', :action => 'edit_membership', :id => /\d+/, :via => :post
               resources :trackers, :except => :show do
                 collection do
                   match 'fields', :via => [:get, :post]
                 end
               end
               resources :issue_statuses, :except => :show do
                 collection do
                   post 'update_issue_done_ratio'
                 end
               end
               resources :custom_fields, :except => :show
               resources :roles do
                 collection do
                   match 'permissions', :via => [:get, :post]
                 end
               end
               resources :enumerations, :except => :show
               match 'enumerations/:type', :to => 'enumerations#index', :via => :get
               get 'projects/:id/search', :controller => 'search', :action => 'index'
               get 'search', :controller => 'search', :action => 'index'
               match 'mail_handler', :controller => 'mail_handler', :action => 'index', :via => :post
               match 'admin', :controller => 'admin', :action => 'index', :via => :get
               match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
               match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
               match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
               match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :get
               match 'admin/default_configuration', :controller => 'admin', :action => 'default_configuration', :via => :post
               resources :auth_sources do
                 member do
                   get 'test_connection', :as => 'try_connection'
                 end
                 collection do
                   get 'autocomplete_for_new_user'
                 end
               end
               match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
               match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
               match 'workflows/permissions', :controller => 'workflows', :action => 'permissions', :via => [:get, :post]
               match 'workflows/copy', :controller => 'workflows', :action => 'copy', :via => [:get, :post]
               match 'settings', :controller => 'settings', :action => 'index', :via => :get
               match 'settings/edit', :controller => 'settings', :action => 'edit', :via => [:get, :post]
               match 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :via => [:get, :post], :as => 'plugin_settings'
               match 'sys/projects', :to => 'sys#projects', :via => :get
               match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
               match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => :get
               match 'uploads', :to => 'attachments#upload', :via => :post
               get 'robots.txt', :to => 'welcome#robots'
               Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
                 file = File.join(plugin_dir, "config/routes.rb")
                 if File.exists?(file)
                   begin
                     instance_eval File.read(file)
                   rescue Exception => e
                     puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
                     exit 1
                   end
                 end
               end
             end

test/functional/watchers_controller_test.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class WatchersControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                        :issues, :trackers, :projects_trackers, :issue_statuses, :enumerations, :watchers
               def setup
                 User.current = nil
               end
               def test_watch_a_single_object
                 @request.session[:user_id] = 3
                 assert_difference('Watcher.count') do
                   xhr :post, :watch, :object_type => 'issue', :object_id => '1'
                   assert_response :success
                   assert_include '$(".issue-1-watcher")', response.body
                 end
                 assert Issue.find(1).watched_by?(User.find(3))
               end
               def test_watch_a_collection_with_a_single_object
                 @request.session[:user_id] = 3
                 assert_difference('Watcher.count') do
                   xhr :post, :watch, :object_type => 'issue', :object_id => ['1']
                   assert_response :success
                   assert_include '$(".issue-1-watcher")', response.body
                 end
                 assert Issue.find(1).watched_by?(User.find(3))
               end
               def test_watch_a_collection_with_multiple_objects
                 @request.session[:user_id] = 3
                 assert_difference('Watcher.count', 2) do
                   xhr :post, :watch, :object_type => 'issue', :object_id => ['1', '3']
                   assert_response :success
                   assert_include '$(".issue-bulk-watcher")', response.body
                 end
                 assert Issue.find(1).watched_by?(User.find(3))
                 assert Issue.find(3).watched_by?(User.find(3))
               end
               def test_watch_should_be_denied_without_permission
                 Role.find(2).remove_permission! :view_issues
                 @request.session[:user_id] = 3
                 assert_no_difference('Watcher.count') do
                   xhr :post, :watch, :object_type => 'issue', :object_id => '1'
                   assert_response 403
                 end
               end
               def test_watch_invalid_class_should_respond_with_404
                 @request.session[:user_id] = 3
                 assert_no_difference('Watcher.count') do
                   xhr :post, :watch, :object_type => 'foo', :object_id => '1'
                   assert_response 404
                 end
               end
               def test_watch_invalid_object_should_respond_with_404
                 @request.session[:user_id] = 3
                 assert_no_difference('Watcher.count') do
                   xhr :post, :watch, :object_type => 'issue', :object_id => '999'
                   assert_response 404
                 end
               end
               def test_unwatch
                 @request.session[:user_id] = 3
                 assert_difference('Watcher.count', -1) do
-                  xhr :post, :unwatch, :object_type => 'issue', :object_id => '2'
+                  xhr :delete, :unwatch, :object_type => 'issue', :object_id => '2'
                   assert_response :success
                   assert_include '$(".issue-2-watcher")', response.body
                 end
                 assert !Issue.find(1).watched_by?(User.find(3))
               end
               def test_unwatch_a_collection_with_multiple_objects
                 @request.session[:user_id] = 3
                 Watcher.create!(:user_id => 3, :watchable => Issue.find(1))
                 Watcher.create!(:user_id => 3, :watchable => Issue.find(3))
                 assert_difference('Watcher.count', -2) do
-                  xhr :post, :unwatch, :object_type => 'issue', :object_id => ['1', '3']
+                  xhr :delete, :unwatch, :object_type => 'issue', :object_id => ['1', '3']
                   assert_response :success
                   assert_include '$(".issue-bulk-watcher")', response.body
                 end
                 assert !Issue.find(1).watched_by?(User.find(3))
                 assert !Issue.find(3).watched_by?(User.find(3))
               end
               def test_new
                 @request.session[:user_id] = 2
                 xhr :get, :new, :object_type => 'issue', :object_id => '2'
                 assert_response :success
                 assert_match /ajax-modal/, response.body
               end
               def test_new_for_new_record_with_project_id
                 @request.session[:user_id] = 2
                 xhr :get, :new, :project_id => 1
                 assert_response :success
                 assert_equal Project.find(1), assigns(:project)
                 assert_match /ajax-modal/, response.body
               end
               def test_new_for_new_record_with_project_identifier
                 @request.session[:user_id] = 2
                 xhr :get, :new, :project_id => 'ecookbook'
                 assert_response :success
                 assert_equal Project.find(1), assigns(:project)
                 assert_match /ajax-modal/, response.body
               end
               def test_create
                 @request.session[:user_id] = 2
                 assert_difference('Watcher.count') do
                   xhr :post, :create, :object_type => 'issue', :object_id => '2', :watcher => {:user_id => '4'}
                   assert_response :success
                   assert_match /watchers/, response.body
                   assert_match /ajax-modal/, response.body
                 end
                 assert Issue.find(2).watched_by?(User.find(4))
               end
               def test_create_multiple
                 @request.session[:user_id] = 2
                 assert_difference('Watcher.count', 2) do
                   xhr :post, :create, :object_type => 'issue', :object_id => '2', :watcher => {:user_ids => ['4', '7']}
                   assert_response :success
                   assert_match /watchers/, response.body
                   assert_match /ajax-modal/, response.body
                 end
                 assert Issue.find(2).watched_by?(User.find(4))
                 assert Issue.find(2).watched_by?(User.find(7))
               end
               def test_autocomplete_on_watchable_creation
                 @request.session[:user_id] = 2
                 xhr :get, :autocomplete_for_user, :q => 'mi', :project_id => 'ecookbook'
                 assert_response :success
                 assert_select 'input', :count => 4
                 assert_select 'input[name=?][value=1]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=2]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=8]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=9]', 'watcher[user_ids][]'
               end
               def test_autocomplete_on_watchable_update
                 @request.session[:user_id] = 2
                 xhr :get, :autocomplete_for_user, :q => 'mi', :object_id => '2' , :object_type => 'issue', :project_id => 'ecookbook'
                 assert_response :success
                 assert_select 'input', :count => 3
                 assert_select 'input[name=?][value=2]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=8]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=9]', 'watcher[user_ids][]'
               end
               def test_append
                 @request.session[:user_id] = 2
                 assert_no_difference 'Watcher.count' do
                   xhr :post, :append, :watcher => {:user_ids => ['4', '7']}, :project_id => 'ecookbook'
                   assert_response :success
                   assert_include 'watchers_inputs', response.body
                   assert_include 'issue[watcher_user_ids][]', response.body
                 end
               end
               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'
                   assert_response :success
                   assert_match /watchers/, response.body
                 end
                 assert !Issue.find(2).watched_by?(User.find(3))
               end
             end

test/integration/routing/watchers_test.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../test_helper', __FILE__)
             class RoutingWatchersTest < ActionController::IntegrationTest
               def test_watchers
                 assert_routing(
                     { :method => 'get', :path => "/watchers/new" },
                     { :controller => 'watchers', :action => 'new' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/watchers/append" },
                     { :controller => 'watchers', :action => 'append' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/watchers" },
                     { :controller => 'watchers', :action => 'create' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/watchers/destroy" },
                     { :controller => 'watchers', :action => 'destroy' }
                   )
                 assert_routing(
                     { :method => 'get', :path => "/watchers/autocomplete_for_user" },
                     { :controller => 'watchers', :action => 'autocomplete_for_user' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/watchers/watch" },
                     { :controller => 'watchers', :action => 'watch' }
                   )
                 assert_routing(
-                    { :method => 'post', :path => "/watchers/unwatch" },
+                    { :method => 'delete', :path => "/watchers/watch" },
                     { :controller => 'watchers', :action => 'unwatch' }
                   )
                 assert_routing(
                     { :method => 'post', :path => "/issues/12/watchers.xml" },
                     { :controller => 'watchers', :action => 'create',
                       :object_type => 'issue', :object_id => '12', :format => 'xml' }
                   )
                 assert_routing(
                     { :method => 'delete', :path => "/issues/12/watchers/3.xml" },
                     { :controller => 'watchers', :action => 'destroy',
                       :object_type => 'issue', :object_id => '12', :user_id => '3', :format => 'xml'}
                   )
               end
             end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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