jro_apps/redmine Commit - r13420:3c7aa17b5c3a

Merged r13785 (#18665)....

Jean-Philippe Lang -

r13420:3c7aa17b5c3a

parent child

Context file:

r13420:3c7aa17b5c3a

Collapse all files

app/controllers/application_controller.rb +7 -5

             # Redmine - project management software
             # Copyright (C) 2006-2014  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 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_filter :session_expiration, :user_setup, :force_logout_if_password_changed, :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
               def session_expiration
                 if session[:user_id]
                   if session_expired? && !try_to_autologin
                     set_localization(User.active.find_by_id(session[:user_id]))
                     reset_session
                     flash[:error] = l(:error_session_expired)
                     redirect_to signin_url
                   else
                     session[:atime] = Time.now.utc.to_i
                   end
                 end
               end
               def session_expired?
                 if Setting.session_lifetime?
                   unless session[:ctime] && (Time.now.utc.to_i - session[:ctime].to_i <= Setting.session_lifetime.to_i * 60)
                     return true
                   end
                 end
                 if Setting.session_timeout?
                   unless session[:atime] && (Time.now.utc.to_i - session[:atime].to_i <= Setting.session_timeout.to_i * 60)
                     return true
                   end
                 end
                 false
               end
               def start_user_session(user)
                 session[:user_id] = user.id
                 session[:ctime] = Time.now.utc.to_i
                 session[:atime] = Time.now.utc.to_i
                 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
                 user
               end
               def force_logout_if_password_changed
                 passwd_changed_on = User.current.passwd_changed_on || Time.at(0)
                 # Make sure we force logout only for web browser sessions, not API calls
                 # if the password was changed after the session creation.
                 if session[:user_id] && passwd_changed_on.utc.to_i > session[:ctime].to_i
                   reset_session
                   set_localization
                   flash[:error] = l(:error_session_expired)
                   redirect_to signin_url
                 end
               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.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
                   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?
                     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 = url_for(params)
                   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 :controller => "account", :action => "login", :back_url => url
                       end
                     }
                     format.atom { redirect_to :controller => "account", :action => "login", :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"' }
                   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).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
               # make sure that the user is a member of the project (or admin) if project is private
               # used as a before_filter 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_back_url?(back_url)
                   redirect_to(back_url)
                   return
                 elsif options[:referer]
                   redirect_to_referer_or default
                   return
                 end
                 redirect_to default
                 false
               end
               # Returns true if back_url is a valid url for redirection, otherwise false
               def valid_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
                 if uri.host.present? && uri.host != request.host
                   return false
                 end
                 if uri.path.match(%r{/(login|account/register)})
                   return false
                 end
                 if relative_url_root.present? && !uri.path.starts_with?(relative_url_root)
                   return false
                 end
                 return true
               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 || []
                 @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)} ? 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
               end
               # Renders API response on validation failure
+              # for an object or an array of objects
               def render_validation_errors(objects)
-                if objects.is_a?(Array)
+                messages = Array.wrap(objects).map {|object| object.errors.full_messages}.flatten
-                  @error_messages = objects.map {|object| object.errors.full_messages}.flatten
+                render_api_errors(messages)
-                else
+              end
-                  @error_messages = objects.errors.full_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/groups_controller.rb +9 -3

             # Redmine - project management software
             # Copyright (C) 2006-2014  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 GroupsController < ApplicationController
               layout 'admin'
               before_filter :require_admin
               before_filter :find_group, :except => [:index, :new, :create]
               accept_api_auth :index, :show, :create, :update, :destroy, :add_users, :remove_user
               helper :custom_fields
               def index
                 respond_to do |format|
                   format.html {
                     @groups = Group.sorted.all
                     @user_count_by_group_id = user_count_by_group_id
                   }
                   format.api {
                     scope = Group.sorted
                     scope = scope.givable unless params[:builtin] == '1'
                     @groups = scope.all
                   }
                 end
               end
               def show
                 respond_to do |format|
                   format.html
                   format.api
                 end
               end
               def new
                 @group = Group.new
               end
               def create
                 @group = Group.new
                 @group.safe_attributes = params[:group]
                 respond_to do |format|
                   if @group.save
                     format.html {
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to(params[:continue] ? new_group_path : groups_path)
                     }
                     format.api  { render :action => 'show', :status => :created, :location => group_url(@group) }
                   else
                     format.html { render :action => "new" }
                     format.api  { render_validation_errors(@group) }
                   end
                 end
               end
               def edit
               end
               def update
                 @group.safe_attributes = params[:group]
                 respond_to do |format|
                   if @group.save
                     flash[:notice] = l(:notice_successful_update)
                     format.html { redirect_to(groups_path) }
                     format.api  { render_api_ok }
                   else
                     format.html { render :action => "edit" }
                     format.api  { render_validation_errors(@group) }
                   end
                 end
               end
               def destroy
                 @group.destroy
                 respond_to do |format|
                   format.html { redirect_to(groups_path) }
                   format.api  { render_api_ok }
                 end
               end
               def add_users
-                @users = User.where(:id => (params[:user_id] || params[:user_ids])).all
+                @users = User.not_in_group(@group).where(:id => (params[:user_id] || params[:user_ids])).to_a
-                @group.users << @users if request.post?
+                @group.users << @users
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'users') }
                   format.js
-                  format.api { render_api_ok }
+                  format.api {
+                    if @users.any?
+                      render_api_ok
+                    else
+                      render_api_errors "#{l(:label_user)} #{l('activerecord.errors.messages.invalid')}"
+                    end
+                  }
                 end
               end
               def remove_user
                 @group.users.delete(User.find(params[:user_id])) if request.delete?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'users') }
                   format.js
                   format.api { render_api_ok }
                 end
               end
               def autocomplete_for_user
                 respond_to do |format|
                   format.js
                 end
               end
               def edit_membership
                 @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
                 @membership.save if request.post?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'memberships') }
                   format.js
                 end
               end
               def destroy_membership
                 Member.find(params[:membership_id]).destroy if request.post?
                 respond_to do |format|
                   format.html { redirect_to edit_group_path(@group, :tab => 'memberships') }
                   format.js
                 end
               end
               private
               def find_group
                 @group = Group.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def user_count_by_group_id
                 h = User.joins(:groups).group('group_id').count
                 h.keys.each do |key|
                   h[key.to_i] = h.delete(key)
                 end
                 h
               end
             end

test/integration/api_test/groups_test.rb +13 0

             # Redmine - project management software
             # Copyright (C) 2006-2014  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::GroupsTest < Redmine::ApiTest::Base
               fixtures :users, :groups_users
               def setup
                 Setting.rest_api_enabled = '1'
               end
               test "GET /groups.xml should require authentication" do
                 get '/groups.xml'
                 assert_response 401
               end
               test "GET /groups.xml should return givable groups" do
                 get '/groups.xml', {}, credentials('admin')
                 assert_response :success
                 assert_equal 'application/xml', response.content_type
                 assert_select 'groups' do
                   assert_select 'group', Group.givable.count
                   assert_select 'group' do
                     assert_select 'name', :text => 'A Team'
                     assert_select 'id', :text => '10'
                   end
                 end
               end
               test "GET /groups.xml?builtin=1 should return all groups" do
                 get '/groups.xml?builtin=1', {}, credentials('admin')
                 assert_response :success
                 assert_equal 'application/xml', response.content_type
                 assert_select 'groups' do
                   assert_select 'group', Group.givable.count + 2
                   assert_select 'group' do
                     assert_select 'builtin', :text => 'non_member'
                     assert_select 'id', :text => '12'
                   end
                   assert_select 'group' do
                     assert_select 'builtin', :text => 'anonymous'
                     assert_select 'id', :text => '13'
                   end
                 end
               end
               test "GET /groups.json should require authentication" do
                 get '/groups.json'
                 assert_response 401
               end
               test "GET /groups.json should return groups" do
                 get '/groups.json', {}, credentials('admin')
                 assert_response :success
                 assert_equal 'application/json', response.content_type
                 json = MultiJson.load(response.body)
                 groups = json['groups']
                 assert_kind_of Array, groups
                 group = groups.detect {|g| g['name'] == 'A Team'}
                 assert_not_nil group
                 assert_equal({'id' => 10, 'name' => 'A Team'}, group)
               end
               test "GET /groups/:id.xml should return the group" do
                 get '/groups/10.xml', {}, credentials('admin')
                 assert_response :success
                 assert_equal 'application/xml', response.content_type
                 assert_select 'group' do
                   assert_select 'name', :text => 'A Team'
                   assert_select 'id', :text => '10'
                 end
               end
               test "GET /groups/:id.xml should return the builtin group" do
                 get '/groups/12.xml', {}, credentials('admin')
                 assert_response :success
                 assert_equal 'application/xml', response.content_type
                 assert_select 'group' do
                   assert_select 'builtin', :text => 'non_member'
                   assert_select 'id', :text => '12'
                 end
               end
               test "GET /groups/:id.xml should include users if requested" do
                 get '/groups/10.xml?include=users', {}, credentials('admin')
                 assert_response :success
                 assert_equal 'application/xml', response.content_type
                 assert_select 'group' do
                   assert_select 'users' do
                     assert_select 'user', Group.find(10).users.count
                     assert_select 'user[id=8]'
                   end
                 end
               end
               test "GET /groups/:id.xml include memberships if requested" do
                 get '/groups/10.xml?include=memberships', {}, credentials('admin')
                 assert_response :success
                 assert_equal 'application/xml', response.content_type
                 assert_select 'group' do
                   assert_select 'memberships'
                 end
               end
               test "POST /groups.xml with valid parameters should create the group" do
                 assert_difference('Group.count') do
                   post '/groups.xml', {:group => {:name => 'Test', :user_ids => [2, 3]}}, credentials('admin')
                   assert_response :created
                   assert_equal 'application/xml', response.content_type
                 end
                 group = Group.order('id DESC').first
                 assert_equal 'Test', group.name
                 assert_equal [2, 3], group.users.map(&:id).sort
                 assert_select 'group' do
                   assert_select 'name', :text => 'Test'
                 end
               end
               test "POST /groups.xml with invalid parameters should return errors" do
                 assert_no_difference('Group.count') do
                   post '/groups.xml', {:group => {:name => ''}}, credentials('admin')
                 end
                 assert_response :unprocessable_entity
                 assert_equal 'application/xml', response.content_type
                 assert_select 'errors' do
                   assert_select 'error', :text => /Name can't be blank/
                 end
               end
               test "PUT /groups/:id.xml with valid parameters should update the group" do
                 put '/groups/10.xml', {:group => {:name => 'New name', :user_ids => [2, 3]}}, credentials('admin')
                 assert_response :ok
                 assert_equal '', @response.body
                 group = Group.find(10)
                 assert_equal 'New name', group.name
                 assert_equal [2, 3], group.users.map(&:id).sort
               end
               test "PUT /groups/:id.xml with invalid parameters should return errors" do
                 put '/groups/10.xml', {:group => {:name => ''}}, credentials('admin')
                 assert_response :unprocessable_entity
                 assert_equal 'application/xml', response.content_type
                 assert_select 'errors' do
                   assert_select 'error', :text => /Name can't be blank/
                 end
               end
               test "DELETE /groups/:id.xml should delete the group" do
                 assert_difference 'Group.count', -1 do
                   delete '/groups/10.xml', {}, credentials('admin')
                   assert_response :ok
                   assert_equal '', @response.body
                 end
               end
               test "POST /groups/:id/users.xml should add user to the group" do
                 assert_difference 'Group.find(10).users.count' do
                   post '/groups/10/users.xml', {:user_id => 5}, credentials('admin')
                   assert_response :ok
                   assert_equal '', @response.body
                 end
                 assert_include User.find(5), Group.find(10).users
               end
+              test "POST /groups/:id/users.xml should not add the user if already added" do
+                Group.find(10).users << User.find(5)
+                assert_no_difference 'Group.find(10).users.count' do
+                  post '/groups/10/users.xml', {:user_id => 5}, credentials('admin')
+                  assert_response :unprocessable_entity
+                end
+                assert_select 'errors' do
+                  assert_select 'error', :text => /User is invalid/
+                end
+              end
               test "DELETE /groups/:id/users/:user_id.xml should remove user from the group" do
                 assert_difference 'Group.find(10).users.count', -1 do
                   delete '/groups/10/users/8.xml', {}, credentials('admin')
                   assert_response :ok
                   assert_equal '', @response.body
                 end
                 assert_not_include User.find(8), Group.find(10).users
               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