jro_apps/redmine Commit - r15349:8b107b605825

Don't use render :text => ""....

Jean-Philippe Lang -

r15349:8b107b605825

parent child

Context file:

r15349:8b107b605825

Collapse all files

app/controllers/application_controller.rb +1 -2

              # Redmine - project management software
              # Copyright (C) 2006-2016  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 'uri'
              require 'cgi'
              class Unauthorized < Exception; end
              class ApplicationController < ActionController::Base
                include Redmine::I18n
                include Redmine::Pagination
                include Redmine::Hook::Helper
                include RoutesHelper
                helper :routes
                class_attribute :accept_api_auth_actions
                class_attribute :accept_rss_auth_actions
                class_attribute :model_object
                layout 'base'
                protect_from_forgery
                def verify_authenticity_token
                  unless api_request?
                    super
                  end
                end
                def handle_unverified_request
                  unless api_request?
                    super
                    cookies.delete(autologin_cookie_name)
                    self.logged_user = nil
                    set_localization
                    render_error :status => 422, :message => "Invalid form authenticity token."
                  end
                end
                before_action :session_expiration, :user_setup, :check_if_login_required, :check_password_change, :set_localization
                rescue_from ::Unauthorized, :with => :deny_access
                rescue_from ::ActionView::MissingTemplate, :with => :missing_template
                include Redmine::Search::Controller
                include Redmine::MenuManager::MenuController
                helper Redmine::MenuManager::MenuHelper
                include Redmine::SudoMode::Controller
                def session_expiration
                  if session[:user_id] && Rails.application.config.redmine_verify_sessions != false
                    if session_expired? && !try_to_autologin
                      set_localization(User.active.find_by_id(session[:user_id]))
                      self.logged_user = nil
                      flash[:error] = l(:error_session_expired)
                      require_login
                    end
                  end
                end
                def session_expired?
                  ! User.verify_session_token(session[:user_id], session[:tk])
                end
                def start_user_session(user)
                  session[:user_id] = user.id
                  session[:tk] = user.generate_session_token
                  if user.must_change_password?
                    session[:pwd] = '1'
                  end
                end
                def user_setup
                  # Check the settings cache for each request
                  Setting.check_cache
                  # Find the current user
                  User.current = find_current_user
                  logger.info("  Current user: " + (User.current.logged? ? "#{User.current.login} (id=#{User.current.id})" : "anonymous")) if logger
                end
                # Returns the current user or nil if no user is logged in
                # and starts a session if needed
                def find_current_user
                  user = nil
                  unless api_request?
                    if session[:user_id]
                      # existing session
                      user = (User.active.find(session[:user_id]) rescue nil)
                    elsif autologin_user = try_to_autologin
                      user = autologin_user
                    elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
                      # RSS key authentication does not start a session
                      user = User.find_by_rss_key(params[:key])
                    end
                  end
                  if user.nil? && Setting.rest_api_enabled? && accept_api_auth?
                    if (key = api_key_from_request)
                      # Use API key
                      user = User.find_by_api_key(key)
                    elsif request.authorization.to_s =~ /\ABasic /i
                      # HTTP Basic, either username/password or API key/random
                      authenticate_with_http_basic do |username, password|
                        user = User.try_to_login(username, password) || User.find_by_api_key(username)
                      end
                      if user && user.must_change_password?
                        render_error :message => 'You must change your password', :status => 403
                        return
                      end
                    end
                    # Switch user if requested by an admin user
                    if user && user.admin? && (username = api_switch_user_from_request)
                      su = User.find_by_login(username)
                      if su && su.active?
                        logger.info("  User switched by: #{user.login} (id=#{user.id})") if logger
                        user = su
                      else
                        render_error :message => 'Invalid X-Redmine-Switch-User header', :status => 412
                      end
                    end
                  end
                  # store current ip address in user object ephemerally
                  user.remote_ip = request.remote_ip if user
                  user
                end
                def autologin_cookie_name
                  Redmine::Configuration['autologin_cookie_name'].presence || 'autologin'
                end
                def try_to_autologin
                  if cookies[autologin_cookie_name] && Setting.autologin?
                    # auto-login feature starts a new session
                    user = User.try_to_autologin(cookies[autologin_cookie_name])
                    if user
                      reset_session
                      start_user_session(user)
                    end
                    user
                  end
                end
                # Sets the logged in user
                def logged_user=(user)
                  reset_session
                  if user && user.is_a?(User)
                    User.current = user
                    start_user_session(user)
                  else
                    User.current = User.anonymous
                  end
                end
                # Logs out current user
                def logout_user
                  if User.current.logged?
                    cookies.delete(autologin_cookie_name)
                    Token.where(["user_id = ? AND action = ?", User.current.id, 'autologin']).delete_all
                    Token.where(["user_id = ? AND action = ? AND value = ?", User.current.id, 'session', session[:tk]]).delete_all
                    self.logged_user = nil
                  end
                end
                # check if login is globally required to access the application
                def check_if_login_required
                  # no check needed if user is already logged in
                  return true if User.current.logged?
                  require_login if Setting.login_required?
                end
                def check_password_change
                  if session[:pwd]
                    if User.current.must_change_password?
                      flash[:error] = l(:error_password_expired)
                      redirect_to my_password_path
                    else
                      session.delete(:pwd)
                    end
                  end
                end
                def set_localization(user=User.current)
                  lang = nil
                  if user && user.logged?
                    lang = find_language(user.language)
                  end
                  if lang.nil? && !Setting.force_default_language_for_anonymous? && request.env['HTTP_ACCEPT_LANGUAGE']
                    accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first
                    if !accept_lang.blank?
                      accept_lang = accept_lang.downcase
                      lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
                    end
                  end
                  lang ||= Setting.default_language
                  set_language_if_valid(lang)
                end
                def require_login
                  if !User.current.logged?
                    # Extract only the basic url parameters on non-GET requests
                    if request.get?
                      url = request.original_url
                    else
                      url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
                    end
                    respond_to do |format|
                      format.html {
                        if request.xhr?
                          head :unauthorized
                        else
                          redirect_to signin_path(:back_url => url)
                        end
                      }
                      format.any(:atom, :pdf, :csv) {
                        redirect_to signin_path(:back_url => url)
                      }
                      format.xml  { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                      format.js   { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                      format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                      format.any  { head :unauthorized }
                    end
                    return false
                  end
                  true
                end
                def require_admin
                  return unless require_login
                  if !User.current.admin?
                    render_403
                    return false
                  end
                  true
                end
                def deny_access
                  User.current.logged? ? render_403 : require_login
                end
                # Authorize the user for the requested action
                def authorize(ctrl = params[:controller], action = params[:action], global = false)
                  allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
                  if allowed
                    true
                  else
                    if @project && @project.archived?
                      render_403 :message => :notice_not_authorized_archived_project
                    else
                      deny_access
                    end
                  end
                end
                # Authorize the user for the requested action outside a project
                def authorize_global(ctrl = params[:controller], action = params[:action], global = true)
                  authorize(ctrl, action, global)
                end
                # Find project of id params[:id]
                def find_project
                  @project = Project.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Find project of id params[:project_id]
                def find_project_by_project_id
                  @project = Project.find(params[:project_id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Find a project based on params[:project_id]
                # TODO: some subclasses override this, see about merging their logic
                def find_optional_project
                  @project = Project.find(params[:project_id]) unless params[:project_id].blank?
                  allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
                  allowed ? true : deny_access
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Finds and sets @project based on @object.project
                def find_project_from_association
                  render_404 unless @object.present?
                  @project = @object.project
                end
                def find_model_object
                  model = self.class.model_object
                  if model
                    @object = model.find(params[:id])
                    self.instance_variable_set('@' + controller_name.singularize, @object) if @object
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def self.model_object(model)
                  self.model_object = model
                end
                # Find the issue whose id is the :id parameter
                # Raises a Unauthorized exception if the issue is not visible
                def find_issue
                  # Issue.visible.find(...) can not be used to redirect user to the login form
                  # if the issue actually exists but requires authentication
                  @issue = Issue.find(params[:id])
                  raise Unauthorized unless @issue.visible?
                  @project = @issue.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Find issues with a single :id param or :ids array param
                # Raises a Unauthorized exception if one of the issues is not visible
                def find_issues
                  @issues = Issue.
                    where(:id => (params[:id] || params[:ids])).
                    preload(:project, :status, :tracker, :priority, :author, :assigned_to, :relations_to, {:custom_values => :custom_field}).
                    to_a
                  raise ActiveRecord::RecordNotFound if @issues.empty?
                  raise Unauthorized unless @issues.all?(&:visible?)
                  @projects = @issues.collect(&:project).compact.uniq
                  @project = @projects.first if @projects.size == 1
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_attachments
                  if (attachments = params[:attachments]).present?
                    att = attachments.values.collect do |attachment|
                      Attachment.find_by_token( attachment[:token] ) if attachment[:token].present?
                    end
                    att.compact!
                  end
                  @attachments = att || []
                end
                def parse_params_for_bulk_update(params)
                  attributes = (params || {}).reject {|k,v| v.blank?}
                  attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
                  if custom = attributes[:custom_field_values]
                    custom.reject! {|k,v| v.blank?}
                    custom.keys.each do |k|
                      if custom[k].is_a?(Array)
                        custom[k] << '' if custom[k].delete('__none__')
                      else
                        custom[k] = '' if custom[k] == '__none__'
                      end
                    end
                  end
                  attributes
                end
                # make sure that the user is a member of the project (or admin) if project is private
                # used as a before_action for actions that do not require any particular permission on the project
                def check_project_privacy
                  if @project && !@project.archived?
                    if @project.visible?
                      true
                    else
                      deny_access
                    end
                  else
                    @project = nil
                    render_404
                    false
                  end
                end
                def back_url
                  url = params[:back_url]
                  if url.nil? && referer = request.env['HTTP_REFERER']
                    url = CGI.unescape(referer.to_s)
                  end
                  url
                end
                def redirect_back_or_default(default, options={})
                  back_url = params[:back_url].to_s
                  if back_url.present? && valid_url = validate_back_url(back_url)
                    redirect_to(valid_url)
                    return
                  elsif options[:referer]
                    redirect_to_referer_or default
                    return
                  end
                  redirect_to default
                  false
                end
                # Returns a validated URL string if back_url is a valid url for redirection,
                # otherwise false
                def validate_back_url(back_url)
                  if CGI.unescape(back_url).include?('..')
                    return false
                  end
                  begin
                    uri = URI.parse(back_url)
                  rescue URI::InvalidURIError
                    return false
                  end
                  [:scheme, :host, :port].each do |component|
                    if uri.send(component).present? && uri.send(component) != request.send(component)
                      return false
                    end
                    uri.send(:"#{component}=", nil)
                  end
                  # Always ignore basic user:password in the URL
                  uri.userinfo = nil
                  path = uri.to_s
                  # Ensure that the remaining URL starts with a slash, followed by a
                  # non-slash character or the end
                  if path !~ %r{\A/([^/]|\z)}
                    return false
                  end
                  if path.match(%r{/(login|account/register)})
                    return false
                  end
                  if relative_url_root.present? && !path.starts_with?(relative_url_root)
                    return false
                  end
                  return path
                end
                private :validate_back_url
                def valid_back_url?(back_url)
                  !!validate_back_url(back_url)
                end
                private :valid_back_url?
                # Redirects to the request referer if present, redirects to args or call block otherwise.
                def redirect_to_referer_or(*args, &block)
                  redirect_to :back
                rescue ::ActionController::RedirectBackError
                  if args.any?
                    redirect_to *args
                  elsif block_given?
                    block.call
                  else
                    raise "#redirect_to_referer_or takes arguments or a block"
                  end
                end
                def render_403(options={})
                  @project = nil
                  render_error({:message => :notice_not_authorized, :status => 403}.merge(options))
                  return false
                end
                def render_404(options={})
                  render_error({:message => :notice_file_not_found, :status => 404}.merge(options))
                  return false
                end
                # Renders an error response
                def render_error(arg)
                  arg = {:message => arg} unless arg.is_a?(Hash)
                  @message = arg[:message]
                  @message = l(@message) if @message.is_a?(Symbol)
                  @status = arg[:status] || 500
                  respond_to do |format|
                    format.html {
                      render :template => 'common/error', :layout => use_layout, :status => @status
                    }
                    format.any { head @status }
                  end
                end
                # Handler for ActionView::MissingTemplate exception
                def missing_template
                  logger.warn "Missing template, responding with 404"
                  @project = nil
                  render_404
                end
                # Filter for actions that provide an API response
                # but have no HTML representation for non admin users
                def require_admin_or_api_request
                  return true if api_request?
                  if User.current.admin?
                    true
                  elsif User.current.logged?
                    render_error(:status => 406)
                  else
                    deny_access
                  end
                end
                # Picks which layout to use based on the request
                #
                # @return [boolean, string] name of the layout to use or false for no layout
                def use_layout
                  request.xhr? ? false : 'base'
                end
                def render_feed(items, options={})
                  @items = (items || []).to_a
                  @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
                  @items = @items.slice(0, Setting.feeds_limit.to_i)
                  @title = options[:title] || Setting.app_title
                  render :template => "common/feed", :formats => [:atom], :layout => false,
                         :content_type => 'application/atom+xml'
                end
                def self.accept_rss_auth(*actions)
                  if actions.any?
                    self.accept_rss_auth_actions = actions
                  else
                    self.accept_rss_auth_actions || []
                  end
                end
                def accept_rss_auth?(action=action_name)
                  self.class.accept_rss_auth.include?(action.to_sym)
                end
                def self.accept_api_auth(*actions)
                  if actions.any?
                    self.accept_api_auth_actions = actions
                  else
                    self.accept_api_auth_actions || []
                  end
                end
                def accept_api_auth?(action=action_name)
                  self.class.accept_api_auth.include?(action.to_sym)
                end
                # Returns the number of objects that should be displayed
                # on the paginated list
                def per_page_option
                  per_page = nil
                  if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
                    per_page = params[:per_page].to_s.to_i
                    session[:per_page] = per_page
                  elsif session[:per_page]
                    per_page = session[:per_page]
                  else
                    per_page = Setting.per_page_options_array.first || 25
                  end
                  per_page
                end
                # Returns offset and limit used to retrieve objects
                # for an API response based on offset, limit and page parameters
                def api_offset_and_limit(options=params)
                  if options[:offset].present?
                    offset = options[:offset].to_i
                    if offset < 0
                      offset = 0
                    end
                  end
                  limit = options[:limit].to_i
                  if limit < 1
                    limit = 25
                  elsif limit > 100
                    limit = 100
                  end
                  if offset.nil? && options[:page].present?
                    offset = (options[:page].to_i - 1) * limit
                    offset = 0 if offset < 0
                  end
                  offset ||= 0
                  [offset, limit]
                end
                # qvalues http header parser
                # code taken from webrick
                def parse_qvalues(value)
                  tmp = []
                  if value
                    parts = value.split(/,\s*/)
                    parts.each {|part|
                      if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
                        val = m[1]
                        q = (m[2] or 1).to_f
                        tmp.push([val, q])
                      end
                    }
                    tmp = tmp.sort_by{|val, q| -q}
                    tmp.collect!{|val, q| val}
                  end
                  return tmp
                rescue
                  nil
                end
                # Returns a string that can be used as filename value in Content-Disposition header
                def filename_for_content_disposition(name)
                  request.env['HTTP_USER_AGENT'] =~ %r{(MSIE|Trident|Edge)} ? ERB::Util.url_encode(name) : name
                end
                def api_request?
                  %w(xml json).include? params[:format]
                end
                # Returns the API key present in the request
                def api_key_from_request
                  if params[:key].present?
                    params[:key].to_s
                  elsif request.headers["X-Redmine-API-Key"].present?
                    request.headers["X-Redmine-API-Key"].to_s
                  end
                end
                # Returns the API 'switch user' value if present
                def api_switch_user_from_request
                  request.headers["X-Redmine-Switch-User"].to_s.presence
                end
                # Renders a warning flash if obj has unsaved attachments
                def render_attachment_warning_if_needed(obj)
                  flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present?
                end
                # Rescues an invalid query statement. Just in case...
                def query_statement_invalid(exception)
                  logger.error "Query::StatementInvalid: #{exception.message}" if logger
                  session.delete(:query)
                  sort_clear if respond_to?(:sort_clear)
                  render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
                end
                # Renders a 200 response for successfull updates or deletions via the API
                def render_api_ok
                  render_api_head :ok
                end
                # Renders a head API response
                def render_api_head(status)
-                 # #head would return a response body with one space
-                 render :text => '', :status => status, :layout => nil
+                 head :status => status
                end
                # Renders API response on validation failure
                # for an object or an array of objects
                def render_validation_errors(objects)
                  messages = Array.wrap(objects).map {|object| object.errors.full_messages}.flatten
                  render_api_errors(messages)
                end
                def render_api_errors(*messages)
                  @error_messages = messages.flatten
                  render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => nil
                end
                # Overrides #_include_layout? so that #render with no arguments
                # doesn't use the layout for api requests
                def _include_layout?(*args)
                  api_request? ? false : super
                end
              end

app/controllers/mail_handler_controller.rb +1 -1

              # Redmine - project management software
              # Copyright (C) 2006-2016  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.
              class MailHandlerController < ActionController::Base
                before_action :check_credential
                # Displays the email submission form
                def new
                end
                # Submits an incoming email to MailHandler
                def index
                  options = params.dup
                  email = options.delete(:email)
                  if MailHandler.receive(email, options)
                    head :created
                  else
                    head :unprocessable_entity
                  end
                end
                private
                def check_credential
                  User.current = nil
                  unless Setting.mail_handler_api_enabled? && params[:key].to_s == Setting.mail_handler_api_key
-                   render :text => 'Access denied. Incoming emails WS is disabled or key is invalid.', :status => 403
+                   render :plain => 'Access denied. Incoming emails WS is disabled or key is invalid.', :status => 403
                  end
                end
              end

app/controllers/sys_controller.rb +1 -1

              # Redmine - project management software
              # Copyright (C) 2006-2016  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.
              class SysController < ActionController::Base
                before_action :check_enabled
                def projects
                  p = Project.active.has_module(:repository).
                        order("#{Project.table_name}.identifier").preload(:repository).to_a
                  # extra_info attribute from repository breaks activeresource client
                  render :xml => p.to_xml(
                                     :only => [:id, :identifier, :name, :is_public, :status],
                                     :include => {:repository => {:only => [:id, :url]}}
                                   )
                end
                def create_project_repository
                  project = Project.find(params[:id])
                  if project.repository
                    head 409
                  else
                    logger.info "Repository for #{project.name} was reported to be created by #{request.remote_ip}."
                    repository = Repository.factory(params[:vendor], params[:repository])
                    repository.project = project
                    if repository.save
                      render :xml => {repository.class.name.underscore.gsub('/', '-') => {:id => repository.id, :url => repository.url}}, :status => 201
                    else
                      head 422
                    end
                  end
                end
                def fetch_changesets
                  projects = []
                  scope = Project.active.has_module(:repository)
                  if params[:id]
                    project = nil
                    if params[:id].to_s =~ /^\d*$/
                      project = scope.find(params[:id])
                    else
                      project = scope.find_by_identifier(params[:id])
                    end
                    raise ActiveRecord::RecordNotFound unless project
                    projects << project
                  else
                    projects = scope.to_a
                  end
                  projects.each do |project|
                    project.repositories.each do |repository|
                      repository.fetch_changesets
                    end
                  end
                  head 200
                rescue ActiveRecord::RecordNotFound
                  head 404
                end
                protected
                def check_enabled
                  User.current = nil
                  unless Setting.sys_api_enabled? && params[:key].to_s == Setting.sys_api_key
-                   render :text => 'Access denied. Repository management WS is disabled or key is invalid.', :status => 403
+                   render :plain => 'Access denied. Repository management WS is disabled or key is invalid.', :status => 403
                    return false
                  end
                end
              end

app/controllers/watchers_controller.rb +6 -3

              # Redmine - project management software
              # Copyright (C) 2006-2016  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.
              class WatchersController < ApplicationController
                before_action :require_login, :find_watchables, :only => [:watch, :unwatch]
                def watch
                  set_watcher(@watchables, User.current, true)
                end
                def unwatch
                  set_watcher(@watchables, User.current, false)
                end
                before_action :find_project, :authorize, :only => [:new, :create, :append, :destroy, :autocomplete_for_user]
                accept_api_auth :create, :destroy
                def new
                  @users = users_for_new_watcher
                end
                def create
                  user_ids = []
                  if params[:watcher]
                    user_ids << (params[:watcher][:user_ids] || params[:watcher][:user_id])
                  else
                    user_ids << params[:user_id]
                  end
                  users = User.active.visible.where(:id => user_ids.flatten.compact.uniq)
                  users.each do |user|
                    @watchables.each do |watchable|
                      Watcher.create(:watchable => watchable, :user => user)
                    end
                  end
                  respond_to do |format|
-                   format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}
+                   format.html { redirect_to_referer_or {render :html => 'Watcher added.', :status => 200, :layout => true}}
                    format.js { @users = users_for_new_watcher }
                    format.api { render_api_ok }
                  end
                end
                def append
                  if params[:watcher]
                    user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
                    @users = User.active.visible.where(:id => user_ids).to_a
                  end
                  if @users.blank?
                    head 200
                  end
                end
                def destroy
                  user = User.find(params[:user_id])
                  @watchables.each do |watchable|
                    watchable.set_watcher(user, false)
                  end
                  respond_to do |format|
-                   format.html { redirect_to :back }
+                   format.html { redirect_to_referer_or {render :html => 'Watcher removed.', :status => 200, :layout => true} }
                    format.js
                    format.api { render_api_ok }
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def autocomplete_for_user
                  @users = users_for_new_watcher
                  render :layout => false
                end
                private
                def find_project
                  if params[:object_type] && params[:object_id]
                    @watchables = find_objets_from_params
                    @projects = @watchables.map(&:project).uniq
                    if @projects.size == 1
                      @project = @projects.first
                    end
                  elsif params[:project_id]
                    @project = Project.visible.find_by_param(params[:project_id])
                  end
                end
                def find_watchables
                  @watchables = find_objets_from_params
                  unless @watchables.present?
                    render_404
                  end
                end
                def set_watcher(watchables, user, watching)
                  watchables.each do |watchable|
                    watchable.set_watcher(user, watching)
                  end
                  respond_to do |format|
-                   format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
+                   format.html {
+                     text = watching ? 'Watcher added.' : 'Watcher removed.'
+                     redirect_to_referer_or {render :html => text, :status => 200, :layout => true}
+                   }
                    format.js { render :partial => 'set_watcher', :locals => {:user => user, :watched => watchables} }
                  end
                end
                def users_for_new_watcher
                  scope = nil
                  if params[:q].blank? && @project.present?
                    scope = @project.users
                  else
                    scope = User.all.limit(100)
                  end
                  users = scope.active.visible.sorted.like(params[:q]).to_a
                  if @watchables && @watchables.size == 1
                    users -= @watchables.first.watcher_users
                  end
                  users
                end
                def find_objets_from_params
                  klass = Object.const_get(params[:object_type].camelcase) rescue nil
                  return unless klass && klass.respond_to?('watched_by')
                  scope = klass.where(:id => Array.wrap(params[:object_id]))
                  if klass.reflect_on_association(:project)
                    scope = scope.preload(:project => :enabled_modules)
                  end
                  objects = scope.to_a
                  raise Unauthorized if objects.any? do |w|
                    if w.respond_to?(:visible?)
                      !w.visible?
                    elsif w.respond_to?(:project) && w.project
                      !w.project.visible?
                    end
                  end
                  objects
                end
              end

test/functional/mail_handler_controller_test.rb +2 0

              # Redmine - project management software
              # Copyright (C) 2006-2016  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 MailHandlerControllerTest < Redmine::ControllerTest
                fixtures :users, :email_addresses, :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :issue_statuses,
                         :trackers, :projects_trackers, :enumerations
                FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/mail_handler'
                def setup
                  User.current = nil
                end
                def test_should_create_issue
                  # Enable API and set a key
                  Setting.mail_handler_api_enabled = 1
                  Setting.mail_handler_api_key = 'secret'
                  assert_difference 'Issue.count' do
                    post :index, :key => 'secret', :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
                  end
                  assert_response 201
                end
                def test_should_create_issue_with_options
                  # Enable API and set a key
                  Setting.mail_handler_api_enabled = 1
                  Setting.mail_handler_api_key = 'secret'
                  assert_difference 'Issue.count' do
                    post :index, :key => 'secret',
                      :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml')),
                      :issue => {:is_private => '1'}
                  end
                  assert_response 201
                  issue = Issue.order(:id => :desc).first
                  assert_equal true, issue.is_private
                end
                def test_should_respond_with_422_if_not_created
                  Project.find('onlinestore').destroy
                  Setting.mail_handler_api_enabled = 1
                  Setting.mail_handler_api_key = 'secret'
                  assert_no_difference 'Issue.count' do
                    post :index, :key => 'secret', :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
                  end
                  assert_response 422
                end
                def test_should_not_allow_with_api_disabled
                  # Disable API
                  Setting.mail_handler_api_enabled = 0
                  Setting.mail_handler_api_key = 'secret'
                  assert_no_difference 'Issue.count' do
                    post :index, :key => 'secret', :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
                  end
                  assert_response 403
+                 assert_include 'Access denied', response.body
                end
                def test_should_not_allow_with_wrong_key
                  Setting.mail_handler_api_enabled = 1
                  Setting.mail_handler_api_key = 'secret'
                  assert_no_difference 'Issue.count' do
                    post :index, :key => 'wrong', :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
                  end
                  assert_response 403
+                 assert_include 'Access denied', response.body
                end
                def test_new
                  Setting.mail_handler_api_enabled = 1
                  Setting.mail_handler_api_key = 'secret'
                  get :new, :key => 'secret'
                  assert_response :success
                end
              end

test/functional/sys_controller_test.rb +2 0

              # Redmine - project management software
              # Copyright (C) 2006-2016  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 SysControllerTest < Redmine::ControllerTest
                fixtures :projects, :repositories, :enabled_modules
                def setup
                  Setting.sys_api_enabled = '1'
                  Setting.enabled_scm = %w(Subversion Git)
                end
                def teardown
                  Setting.clear_cache
                end
                def test_projects_with_repository_enabled
                  get :projects
                  assert_response :success
                  assert_equal 'application/xml', @response.content_type
                  assert_select 'projects' do
                    assert_select 'project', Project.active.has_module(:repository).count
                    assert_select 'project' do
                      assert_select 'identifier'
                      assert_select 'is-public'
                    end
                  end
                  assert_select 'extra-info', 0
                  assert_select 'extra_info', 0
                end
                def test_create_project_repository
                  assert_nil Project.find(4).repository
                  post :create_project_repository, :params => {
                    :id => 4,
                    :vendor => 'Subversion',
                    :repository => { :url => 'file:///create/project/repository/subproject2'}
                  }
                  assert_response :created
                  assert_equal 'application/xml', @response.content_type
                  r = Project.find(4).repository
                  assert r.is_a?(Repository::Subversion)
                  assert_equal 'file:///create/project/repository/subproject2', r.url
                  assert_select 'repository-subversion' do
                    assert_select 'id', :text => r.id.to_s
                    assert_select 'url', :text => r.url
                  end
                  assert_select 'extra-info', 0
                  assert_select 'extra_info', 0
                end
                def test_create_already_existing
                  post :create_project_repository, :params => {
                    :id => 1,
                    :vendor => 'Subversion',
                    :repository => { :url => 'file:///create/project/repository/subproject2'}
                  }
                  assert_response :conflict
                end
                def test_create_with_failure
                  post :create_project_repository, :params => {
                    :id => 4,
                    :vendor => 'Subversion',
                    :repository => { :url => 'invalid url'}
                  }
                  assert_response :unprocessable_entity
                end
                def test_fetch_changesets
                  Repository::Subversion.any_instance.expects(:fetch_changesets).twice.returns(true)
                  get :fetch_changesets
                  assert_response :success
                end
                def test_fetch_changesets_one_project_by_identifier
                  Repository::Subversion.any_instance.expects(:fetch_changesets).once.returns(true)
                  get :fetch_changesets, :params => {:id => 'ecookbook'}
                  assert_response :success
                end
                def test_fetch_changesets_one_project_by_id
                  Repository::Subversion.any_instance.expects(:fetch_changesets).once.returns(true)
                  get :fetch_changesets, :params => {:id => '1'}
                  assert_response :success
                end
                def test_fetch_changesets_unknown_project
                  get :fetch_changesets, :params => {:id => 'unknown'}
                  assert_response 404
                end
                def test_disabled_ws_should_respond_with_403_error
                  with_settings :sys_api_enabled => '0' do
                    get :projects
                    assert_response 403
+                   assert_include 'Access denied', response.body
                  end
                end
                def test_api_key
                  with_settings :sys_api_key => 'my_secret_key' do
                    get :projects, :params => {:key => 'my_secret_key'}
                    assert_response :success
                  end
                end
                def test_wrong_key_should_respond_with_403_error
                  with_settings :sys_api_enabled => 'my_secret_key' do
                    get :projects, :params => {:key => 'wrong_key'}
                    assert_response 403
+                   assert_include 'Access denied', response.body
                  end
                end
              end

test/functional/watchers_controller_test.rb +45 0

              # Redmine - project management software
              # Copyright (C) 2006-2016  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 < Redmine::ControllerTest
                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_as_html
+                 @request.session[:user_id] = 3
+                 assert_difference('Watcher.count') do
+                   post :watch, :params => {:object_type => 'issue', :object_id => '1'}
+                   assert_response :success
+                   assert_include 'Watcher added', response.body
+                 end
+                 assert Issue.find(1).watched_by?(User.find(3))
+               end
                def test_watch_a_single_object
                  @request.session[:user_id] = 3
                  assert_difference('Watcher.count') do
                    xhr :post, :watch, :params => {: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, :params => {: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, :params => {: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_a_news_module_should_add_watcher
                  @request.session[:user_id] = 7
                  assert_not_nil m = Project.find(1).enabled_module('news')
                  assert_difference 'Watcher.count' do
                    xhr :post, :watch, :params => {:object_type => 'enabled_module', :object_id => m.id.to_s}
                    assert_response :success
                  end
                  assert m.reload.watched_by?(User.find(7))
                end
                def test_watch_a_private_news_module_without_permission_should_fail
                  @request.session[:user_id] = 7
                  assert_not_nil m = Project.find(2).enabled_module('news')
                  assert_no_difference 'Watcher.count' do
                    xhr :post, :watch, :params => {:object_type => 'enabled_module', :object_id => m.id.to_s}
                    assert_response 403
                  end
                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, :params => {: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, :params => {: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, :params => {:object_type => 'issue', :object_id => '999'}
                    assert_response 404
                  end
                end
+               def test_unwatch_as_html
+                 @request.session[:user_id] = 3
+                 assert_difference('Watcher.count', -1) do
+                   delete :unwatch, :params => {:object_type => 'issue', :object_id => '2'}
+                   assert_response :success
+                   assert_include 'Watcher removed', response.body
+                 end
+                 assert !Issue.find(1).watched_by?(User.find(3))
+               end
                def test_unwatch
                  @request.session[:user_id] = 3
                  assert_difference('Watcher.count', -1) do
                    xhr :delete, :unwatch, :params => {: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 :delete, :unwatch, :params => {: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, :params => {:object_type => 'issue', :object_id => '2'}
                  assert_response :success
                  assert_match /ajax-modal/, response.body
                end
                def test_new_with_multiple_objects
                  @request.session[:user_id] = 2
                  xhr :get, :new, :params => {:object_type => 'issue', :object_id => ['1', '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, :params => {:project_id => 1}
                  assert_response :success
                  assert_match /ajax-modal/, response.body
                end
                def test_new_for_new_record_with_project_identifier
                  @request.session[:user_id] = 2
                  xhr :get, :new, :params => {:project_id => 'ecookbook'}
                  assert_response :success
                  assert_match /ajax-modal/, response.body
                end
+               def test_create_as_html
+                 @request.session[:user_id] = 2
+                 assert_difference('Watcher.count') do
+                   post :create, :params => {
+                     :object_type => 'issue', :object_id => '2',
+                     :watcher => {:user_id => '4'}
+                   }
+                   assert_response :success
+                   assert_include 'Watcher added', response.body
+                 end
+                 assert Issue.find(2).watched_by?(User.find(4))
+               end
                def test_create
                  @request.session[:user_id] = 2
                  assert_difference('Watcher.count') do
                    xhr :post, :create, :params => {
                      :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_with_mutiple_users
                  @request.session[:user_id] = 2
                  assert_difference('Watcher.count', 2) do
                    xhr :post, :create, :params => {
                      :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_create_with_mutiple_objects
                  @request.session[:user_id] = 2
                  assert_difference('Watcher.count', 4) do
                    xhr :post, :create, :params => {
                      :object_type => 'issue', :object_id => ['1', '2'],
                      :watcher => {:user_ids => ['4', '7']}
                    }
                    assert_response :success
                    assert_match /watchers/, response.body
                    assert_match /ajax-modal/, response.body
                  end
                  assert Issue.find(1).watched_by?(User.find(4))
                  assert Issue.find(2).watched_by?(User.find(4))
                  assert Issue.find(1).watched_by?(User.find(7))
                  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, :params => {: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_search_non_member_on_create
                  @request.session[:user_id] = 2
                  project = Project.find_by_name("ecookbook")
                  user = User.generate!(:firstname => 'issue15622')
                  membership = user.membership(project)
                  assert_nil membership
                  xhr :get, :autocomplete_for_user, :params => {:q => 'issue15622', :project_id => 'ecookbook'}
                  assert_response :success
                  assert_select 'input', :count => 1
                end
                def test_autocomplete_on_watchable_update
                  @request.session[:user_id] = 2
                  xhr :get, :autocomplete_for_user, :params => {
                    :object_type => 'issue', :object_id => '2',
                    :project_id => 'ecookbook', :q => 'mi'
                  }
                  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_search_and_add_non_member_on_update
                  @request.session[:user_id] = 2
                  project = Project.find_by_name("ecookbook")
                  user = User.generate!(:firstname => 'issue15622')
                  membership = user.membership(project)
                  assert_nil membership
                  xhr :get, :autocomplete_for_user, :params => {
                    :object_type => 'issue', :object_id => '2',
                    :project_id => 'ecookbook', :q => 'issue15622'
                  }
                  assert_response :success
                  assert_select 'input', :count => 1
                  assert_difference('Watcher.count', 1) do
                    xhr :post, :create, :params => {
                      :object_type => 'issue', :object_id => '2',
                      :watcher => {:user_ids => ["#{user.id}"]}
                    }
                    assert_response :success
                    assert_match /watchers/, response.body
                    assert_match /ajax-modal/, response.body
                  end
                  assert Issue.find(2).watched_by?(user)
                end
                def test_autocomplete_for_user_should_return_visible_users
                  Role.update_all :users_visibility => 'members_of_visible_projects'
                  hidden = User.generate!(:lastname => 'autocomplete_hidden')
                  visible = User.generate!(:lastname => 'autocomplete_visible')
                  User.add_to_project(visible, Project.find(1))
                  @request.session[:user_id] = 2
                  xhr :get, :autocomplete_for_user, :params => {:q => 'autocomp', :project_id => 'ecookbook'}
                  assert_response :success
                  assert_include visible.name, response.body
                  assert_not_include hidden.name, response.body
                end
                def test_append
                  @request.session[:user_id] = 2
                  assert_no_difference 'Watcher.count' do
                    xhr :post, :append, :params => {
                      :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_append_without_user_should_render_nothing
                  @request.session[:user_id] = 2
                  xhr :post, :append, :params => {:project_id => 'ecookbook'}
                  assert_response :success
                  assert response.body.blank?
                end
+               def test_destroy_as_html
+                 @request.session[:user_id] = 2
+                 assert_difference('Watcher.count', -1) do
+                   delete :destroy, :params => {
+                     :object_type => 'issue', :object_id => '2', :user_id => '3'
+                   }
+                   assert_response :success
+                   assert_include 'Watcher removed', response.body
+                 end
+                 assert !Issue.find(2).watched_by?(User.find(3))
+               end
                def test_destroy
                  @request.session[:user_id] = 2
                  assert_difference('Watcher.count', -1) do
                    xhr :delete, :destroy, :params => {
                      :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_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, :params => {
                      :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, :params => {
                      :object_type => 'issue', :object_id => '2', :user_id => '999'
                    }
                    assert_response 404
                  end
                end
              end

test/integration/api_test/api_test.rb +9 0

              # Redmine - project management software
              # Copyright (C) 2006-2016  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 Redmine::ApiTest::ApiTest < Redmine::ApiTest::Base
                fixtures :users
                def test_api_should_work_with_protect_from_forgery
                  ActionController::Base.allow_forgery_protection = true
                  assert_difference('User.count') do
                    post '/users.xml', {
                      :user => {
                        :login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname',
                        :mail => 'foo@example.net', :password => 'secret123'}
                      },
                      credentials('admin')
                    assert_response 201
                  end
                ensure
                  ActionController::Base.allow_forgery_protection = false
                end
                def test_json_datetime_format
                  get '/users/1.json', {}, credentials('admin')
                  assert_include '"created_on":"2006-07-19T17:12:21Z"', response.body
                end
                def test_xml_datetime_format
                  get '/users/1.xml', {}, credentials('admin')
                  assert_include '<created_on>2006-07-19T17:12:21Z</created_on>', response.body
                end
+               def test_head_response_should_have_empty_body
+                 assert_difference('Issue.count', -1) do
+                   delete '/issues/6.xml', {}, credentials('jsmith')
+                   assert_response :ok
+                   assert_equal '', response.body
+                 end
+               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