jro_apps/redmine Commit - r4344:735a83c59615

Converts IssuesController to use the new API template system and makes xml/json responses consistent (#6136)....

Jean-Philippe Lang -

r4344:735a83c59615

parent child

Context file:

r4344:735a83c59615

Collapse all files

app/views/issues/index.apit created 644 +32 0

@@ -0,0 +1,32
	1	api.array :issues do
	2	@issues.each do \|issue\|
	3	api.issue do
	4	api.id issue.id
	5	api.project(:id => issue.project_id, :name => issue.project.name) unless issue.project.nil?
	6	api.tracker(:id => issue.tracker_id, :name => issue.tracker.name) unless issue.tracker.nil?
	7	api.status(:id => issue.status_id, :name => issue.status.name) unless issue.status.nil?
	8	api.priority(:id => issue.priority_id, :name => issue.priority.name) unless issue.priority.nil?
	9	api.author(:id => issue.author_id, :name => issue.author.name) unless issue.author.nil?
	10	api.assigned_to(:id => issue.assigned_to_id, :name => issue.assigned_to.name) unless issue.assigned_to.nil?
	11	api.category(:id => issue.category_id, :name => issue.category.name) unless issue.category.nil?
	12	api.fixed_version(:id => issue.fixed_version_id, :name => issue.fixed_version.name) unless issue.fixed_version.nil?
	13	api.parent(:id => issue.parent_id) unless issue.parent.nil?
	14
	15	api.subject issue.subject
	16	api.description issue.description
	17	api.start_date issue.start_date
	18	api.due_date issue.due_date
	19	api.done_ratio issue.done_ratio
	20	api.estimated_hours issue.estimated_hours
	21
	22	api.array :custom_fields do
	23	issue.custom_field_values.each do \|custom_value\|
	24	api.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
	25	end
	26	end
	27
	28	api.created_on issue.created_on
	29	api.updated_on issue.updated_on
	30	end
	31	end
	32	end

app/views/issues/show.apit created 644 +61 0

@@ -0,0 +1,61
	1	api.issue do
	2	api.id @issue.id
	3	api.project(:id => @issue.project_id, :name => @issue.project.name) unless @issue.project.nil?
	4	api.tracker(:id => @issue.tracker_id, :name => @issue.tracker.name) unless @issue.tracker.nil?
	5	api.status(:id => @issue.status_id, :name => @issue.status.name) unless @issue.status.nil?
	6	api.priority(:id => @issue.priority_id, :name => @issue.priority.name) unless @issue.priority.nil?
	7	api.author(:id => @issue.author_id, :name => @issue.author.name) unless @issue.author.nil?
	8	api.assigned_to(:id => @issue.assigned_to_id, :name => @issue.assigned_to.name) unless @issue.assigned_to.nil?
	9	api.category(:id => @issue.category_id, :name => @issue.category.name) unless @issue.category.nil?
	10	api.fixed_version(:id => @issue.fixed_version_id, :name => @issue.fixed_version.name) unless @issue.fixed_version.nil?
	11	api.parent(:id => @issue.parent_id) unless @issue.parent.nil?
	12
	13	api.subject @issue.subject
	14	api.description @issue.description
	15	api.start_date @issue.start_date
	16	api.due_date @issue.due_date
	17	api.done_ratio @issue.done_ratio
	18	api.estimated_hours @issue.estimated_hours
	19	if User.current.allowed_to?(:view_time_entries, @project)
	20	api.spent_hours @issue.spent_hours
	21	end
	22
	23	api.array :custom_fields do
	24	@issue.custom_field_values.each do \|custom_value\|
	25	api.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
	26	end
	27	end unless @issue.custom_field_values.empty?
	28
	29	api.created_on @issue.created_on
	30	api.updated_on @issue.updated_on
	31
	32	api.array :relations do
	33	@issue.relations.select {\|r\| r.other_issue(@issue).visible? }.each do \|relation\|
	34	api.relation(:id => relation.id, :issue_id => relation.other_issue(@issue).id, :relation_type => relation.relation_type_for(@issue), :delay => relation.delay)
	35	end
	36	end
	37
	38	api.array :changesets do
	39	@issue.changesets.each do \|changeset\|
	40	api.changeset :revision => changeset.revision do
	41	api.user(:id => changeset.user_id, :name => changeset.user.name) unless changeset.user.nil?
	42	api.comments changeset.comments
	43	api.committed_on changeset.committed_on
	44	end
	45	end
	46	end if User.current.allowed_to?(:view_changesets, @project) && @issue.changesets.any?
	47
	48	api.array :journals do
	49	@issue.journals.each do \|journal\|
	50	api.journal :id => journal.id do
	51	api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
	52	api.notes journal.notes
	53	api.array :details do
	54	journal.details.each do \|detail\|
	55	api.detail :property => detail.property, :name => detail.prop_key, :old => detail.old_value, :new => detail.value
	56	end
	57	end
	58	end
	59	end
	60	end unless @issue.journals.empty?
	61	end

app/controllers/issues_controller.rb +9 -18

             # Redmine - project management software
             # Copyright (C) 2006-2008  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 IssuesController < ApplicationController
               menu_item :new_issue, :only => [:new, :create]
               default_search_scope :issues
               before_filter :find_issue, :only => [:show, :edit, :update]
               before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :move, :perform_move, :destroy]
               before_filter :check_project_uniqueness, :only => [:move, :perform_move]
               before_filter :find_project, :only => [:new, :create]
               before_filter :authorize, :except => [:index]
               before_filter :find_optional_project, :only => [:index]
               before_filter :check_for_default_issue_status, :only => [:new, :create]
               before_filter :build_new_issue_from_params, :only => [:new, :create]
               accept_key_auth :index, :show, :create, :update, :destroy
               rescue_from Query::StatementInvalid, :with => :query_statement_invalid
               helper :journals
               helper :projects
               include ProjectsHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :issue_relations
               include IssueRelationsHelper
               helper :watchers
               include WatchersHelper
               helper :attachments
               include AttachmentsHelper
               helper :queries
               include QueriesHelper
               helper :sort
               include SortHelper
               include IssuesHelper
               helper :timelog
               helper :gantt
               include Redmine::Export::PDF
               verify :method => [:post, :delete],
                      :only => :destroy,
                      :render => { :nothing => true, :status => :method_not_allowed }
               verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
               verify :method => :post, :only => :bulk_update, :render => {:nothing => true, :status => :method_not_allowed }
               verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
               def index
                 retrieve_query
                 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
                 sort_update(@query.sortable_columns)
                 if @query.valid?
                   limit = case params[:format]
                   when 'csv', 'pdf'
                     Setting.issues_export_limit.to_i
                   when 'atom'
                     Setting.feeds_limit.to_i
                   else
                     per_page_option
                   end
                   @issue_count = @query.issue_count
                   @issue_pages = Paginator.new self, @issue_count, limit, params['page']
                   @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                                           :order => sort_clause,
                                           :offset => @issue_pages.current.offset,
                                           :limit => limit)
                   @issue_count_by_group = @query.issue_count_by_group
                   respond_to do |format|
                     format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
-                    format.xml  { render :layout => false }
+                    format.api  { render :template => 'issues/index.apit' }
-                    format.json { render :text => @issues.to_json, :layout => false }
                     format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
                     format.csv  { send_data(issues_to_csv(@issues, @project), :type => 'text/csv; header=present', :filename => 'export.csv') }
                     format.pdf  { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'export.pdf') }
                   end
                 else
                   # Send html if the query is not valid
                   render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def show
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                 @journals.each_with_index {|j,i| j.indice = i+1}
                 @journals.reverse! if User.current.wants_comments_in_reverse_order?
                 @changesets = @issue.changesets.visible.all
                 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @priorities = IssuePriority.all
                 @time_entry = TimeEntry.new
                 respond_to do |format|
                   format.html { render :template => 'issues/show.rhtml' }
-                  format.xml  { render :layout => false }
+                  format.api  { render :template => 'issues/show.apit' }
-                  format.json { render :text => @issue.to_json, :layout => false }
                   format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
                   format.pdf  { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
                 end
               end
               # Add a new issue
               # The new issue will be created from an existing one if copy_from parameter is given
               def new
                 respond_to do |format|
                   format.html { render :action => 'new', :layout => !request.xhr? }
                   format.js { render :partial => 'attributes' }
                 end
               end
               def create
                 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
                 if @issue.save
                   attachments = Attachment.attach_files(@issue, params[:attachments])
                   render_attachment_warning_if_needed(@issue)
                   flash[:notice] = l(:notice_successful_create)
                   call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
                   respond_to do |format|
                     format.html {
                       redirect_to(params[:continue] ?  { :action => 'new', :project_id => @project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
                                   { :action => 'show', :id => @issue })
                     }
-                    format.xml  { render :action => 'show', :status => :created, :location => url_for(:controller => 'issues', :action => 'show', :id => @issue) }
+                    format.api  { render :template => 'issues/show.apit', :status => :created, :location => issue_url(@issue) }
-                    format.json { render :text => @issue.to_json, :status => :created, :location => url_for(:controller => 'issues', :action => 'show'), :layout => false }
                   end
                   return
                 else
                   respond_to do |format|
                     format.html { render :action => 'new' }
-                    format.xml  { render(:xml => @issue.errors, :status => :unprocessable_entity); return }
+                    format.api  { render_validation_errors(@issue) }
-                    format.json { render :text => object_errors_to_json(@issue), :status => :unprocessable_entity, :layout => false }
                   end
                 end
               end
               def edit
                 update_issue_from_params
                 @journal = @issue.current_journal
                 respond_to do |format|
                   format.html { }
                   format.xml  { }
                 end
               end
               def update
                 update_issue_from_params
                 if @issue.save_issue_with_child_records(params, @time_entry)
                   render_attachment_warning_if_needed(@issue)
                   flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
                   respond_to do |format|
                     format.html { redirect_back_or_default({:action => 'show', :id => @issue}) }
-                    format.xml  { head :ok }
+                    format.api  { head :ok }
-                    format.json  { head :ok }
                   end
                 else
                   render_attachment_warning_if_needed(@issue)
                   flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
                   @journal = @issue.current_journal
                   respond_to do |format|
                     format.html { render :action => 'edit' }
-                    format.xml  { render :xml => @issue.errors, :status => :unprocessable_entity }
+                    format.api  { render_validation_errors(@issue) }
-                    format.json { render :text => object_errors_to_json(@issue), :status => :unprocessable_entity, :layout => false }
                   end
                 end
               end
               # Bulk edit a set of issues
               def bulk_edit
                 @issues.sort!
                 @available_statuses = @projects.map{|p|Workflow.available_statuses(p)}.inject{|memo,w|memo & w}
                 @custom_fields = @projects.map{|p|p.all_issue_custom_fields}.inject{|memo,c|memo & c}
                 @assignables = @projects.map(&:assignable_users).inject{|memo,a| memo & a}
                 @trackers = @projects.map(&:trackers).inject{|memo,t| memo & t}
               end
               def bulk_update
                 @issues.sort!
                 attributes = parse_params_for_bulk_issue_attributes(params)
                 unsaved_issue_ids = []
                 @issues.each do |issue|
                   issue.reload
                   journal = issue.init_journal(User.current, params[:notes])
                   issue.safe_attributes = attributes
                   call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
                   unless issue.save
                     # Keep unsaved issue ids to display them in flash error
                     unsaved_issue_ids << issue.id
                   end
                 end
                 set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
                 redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
               end
               def destroy
                 @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
                 if @hours > 0
                   case params[:todo]
                   when 'destroy'
                     # nothing to do
                   when 'nullify'
                     TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
                   when 'reassign'
                     reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                     if reassign_to.nil?
                       flash.now[:error] = l(:error_issue_not_found_in_project)
                       return
                     else
                       TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
                     end
                   else
-                    unless params[:format] == 'xml' || params[:format] == 'json'
+                    # display the destroy form if it's a user request
-                      # display the destroy form if it's a user request
+                    return unless api_request?
-                      return
-                    end
                   end
                 end
                 @issues.each(&:destroy)
                 respond_to do |format|
                   format.html { redirect_back_or_default(:action => 'index', :project_id => @project) }
-                  format.xml  { head :ok }
+                  format.api  { head :ok }
-                  format.json  { head :ok }
                 end
               end
             private
               def find_issue
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_project
                 project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
                 @project = Project.find(project_id)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Used by #edit and #update to set some common instance variables
               # from the params
               # TODO: Refactor, not everything in here is needed by #edit
               def update_issue_from_params
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @priorities = IssuePriority.all
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @time_entry = TimeEntry.new
                 @time_entry.attributes = params[:time_entry]
                 @notes = params[:notes] || (params[:issue].present? ? params[:issue][:notes] : nil)
                 @issue.init_journal(User.current, @notes)
                 @issue.safe_attributes = params[:issue]
               end
               # TODO: Refactor, lots of extra code in here
               # TODO: Changing tracker on an existing issue should not trigger this
               def build_new_issue_from_params
                 if params[:id].blank?
                   @issue = Issue.new
                   @issue.copy_from(params[:copy_from]) if params[:copy_from]
                   @issue.project = @project
                 else
                   @issue = @project.issues.visible.find(params[:id])
                 end
                 @issue.project = @project
                 # Tracker must be set before custom field values
                 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
                 if @issue.tracker.nil?
                   render_error l(:error_no_tracker_in_project)
                   return false
                 end
                 @issue.start_date ||= Date.today
                 if params[:issue].is_a?(Hash)
                   @issue.safe_attributes = params[:issue]
                   if User.current.allowed_to?(:add_issue_watchers, @project) && @issue.new_record?
                     @issue.watcher_user_ids = params[:issue]['watcher_user_ids']
                   end
                 end
                 @issue.author = User.current
                 @priorities = IssuePriority.all
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
               end
               def check_for_default_issue_status
                 if IssueStatus.default.nil?
                   render_error l(:error_no_default_issue_status)
                   return false
                 end
               end
               def parse_params_for_bulk_issue_attributes(params)
                 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
                 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
                 attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
                 attributes
               end
             end

lib/redmine/views/builders/structure.rb +2 0

             # Redmine - project management software
             # Copyright (C) 2006-2010  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 'blankslate'
             module Redmine
               module Views
                 module Builders
                   class Structure < BlankSlate
                     def initialize
                       @struct = [{}]
                     end
                     def array(tag, &block)
                       @struct << []
                       block.call(self)
                       ret = @struct.pop
                       @struct.last[tag] = ret
                     end
                     def method_missing(sym, *args, &block)
                       if args.any?
                         if args.first.is_a?(Hash)
                           if @struct.last.is_a?(Array)
                             @struct.last << args.first
+                          else
+                            @struct.last[sym] = args.first
                           end
                         else
                           if @struct.last.is_a?(Array)
                             @struct.last << (args.last || {}).merge(:value => args.first)
                           else
                             @struct.last[sym] = args.first
                           end
                         end
                       end
                       if block
                         @struct << {}
                         block.call(self)
                         ret = @struct.pop
                         if @struct.last.is_a?(Array)
                           @struct.last << ret
                         else
                           @struct.last[sym] = ret
                         end
                       end
                     end
                     def output
                       raise "Need to implement #{self.class.name}#output"
                     end
                   end
                 end
               end
             end

test/integration/api_test/issues_test.rb +3 -3

             # Redmine - project management software
             # Copyright (C) 2006-2010  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.dirname(__FILE__)}/../../test_helper"
             class ApiTest::IssuesTest < ActionController::IntegrationTest
               fixtures :projects,
                 :users,
                 :roles,
                 :members,
                 :member_roles,
                 :issues,
                 :issue_statuses,
                 :versions,
                 :trackers,
                 :projects_trackers,
                 :issue_categories,
                 :enabled_modules,
                 :enumerations,
                 :attachments,
                 :workflows,
                 :custom_fields,
                 :custom_values,
                 :custom_fields_projects,
                 :custom_fields_trackers,
                 :time_entries,
                 :journals,
                 :journal_details,
                 :queries
               def setup
                 Setting.rest_api_enabled = '1'
               end
               # Use a private project to make sure auth is really working and not just
               # only showing public issues.
               context "/index.xml" do
                 should_allow_api_authentication(:get, "/projects/private-child/issues.xml")
               end
               context "/index.json" do
                 should_allow_api_authentication(:get, "/projects/private-child/issues.json")
               end
               context "/index.xml with filter" do
                 should_allow_api_authentication(:get, "/projects/private-child/issues.xml?status_id=5")
                 should "show only issues with the status_id" do
                   get '/issues.xml?status_id=5'
                   assert_tag :tag => 'issues',
                              :children => { :count => Issue.visible.count(:conditions => {:status_id => 5}),
                                             :only => { :tag => 'issue' } }
                 end
               end
               context "/index.json with filter" do
                 should_allow_api_authentication(:get, "/projects/private-child/issues.json?status_id=5")
                 should "show only issues with the status_id" do
                   get '/issues.json?status_id=5'
                   json = ActiveSupport::JSON.decode(response.body)
-                  status_ids_used = json.collect {|j| j['status_id'] }
+                  status_ids_used = json['issues'].collect {|j| j['status']['id'] }
                   assert_equal 3, status_ids_used.length
                   assert status_ids_used.all? {|id| id == 5 }
                 end
               end
               # Issue 6 is on a private project
               context "/issues/6.xml" do
                 should_allow_api_authentication(:get, "/issues/6.xml")
               end
               context "/issues/6.json" do
                 should_allow_api_authentication(:get, "/issues/6.json")
               end
               context "POST /issues.xml" do
                 should_allow_api_authentication(:post,
                                                 '/issues.xml',
                                                 {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}},
                                                 {:success_code => :created})
                 should "create an issue with the attributes" do
                   assert_difference('Issue.count') do
                     post '/issues.xml', {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}}, :authorization => credentials('jsmith')
                   end
                   issue = Issue.first(:order => 'id DESC')
                   assert_equal 1, issue.project_id
                   assert_equal 2, issue.tracker_id
                   assert_equal 3, issue.status_id
                   assert_equal 'API test', issue.subject
                   assert_response :created
                   assert_equal 'application/xml', @response.content_type
                   assert_tag 'issue', :child => {:tag => 'id', :content => issue.id.to_s}
                 end
               end
               context "POST /issues.xml with failure" do
                 should_allow_api_authentication(:post,
                                                 '/issues.xml',
                                                 {:issue => {:project_id => 1}},
                                                 {:success_code => :unprocessable_entity})
                 should "have an errors tag" do
                   assert_no_difference('Issue.count') do
                     post '/issues.xml', {:issue => {:project_id => 1}}, :authorization => credentials('jsmith')
                   end
                   assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"}
                 end
               end
               context "POST /issues.json" do
                 should_allow_api_authentication(:post,
                                                 '/issues.json',
                                                 {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}},
                                                 {:success_code => :created})
                 should "create an issue with the attributes" do
                   assert_difference('Issue.count') do
                     post '/issues.json', {:issue => {:project_id => 1, :subject => 'API test', :tracker_id => 2, :status_id => 3}}, :authorization => credentials('jsmith')
                   end
                   issue = Issue.first(:order => 'id DESC')
                   assert_equal 1, issue.project_id
                   assert_equal 2, issue.tracker_id
                   assert_equal 3, issue.status_id
                   assert_equal 'API test', issue.subject
                 end
               end
               context "POST /issues.json with failure" do
                 should_allow_api_authentication(:post,
                                                 '/issues.json',
                                                 {:issue => {:project_id => 1}},
                                                 {:success_code => :unprocessable_entity})
                 should "have an errors element" do
                   assert_no_difference('Issue.count') do
                     post '/issues.json', {:issue => {:project_id => 1}}, :authorization => credentials('jsmith')
                   end
                   json = ActiveSupport::JSON.decode(response.body)
-                  assert_equal "can't be blank", json.first['subject']
+                  assert json['errors'].include?(['subject', "can't be blank"])
                 end
               end
               # Issue 6 is on a private project
               context "PUT /issues/6.xml" do
                 setup do
                   @parameters = {:issue => {:subject => 'API update', :notes => 'A new note'}}
                   @headers = { :authorization => credentials('jsmith') }
                 end
                 should_allow_api_authentication(:put,
                                                 '/issues/6.xml',
                                                 {:issue => {:subject => 'API update', :notes => 'A new note'}},
                                                 {:success_code => :ok})
                 should "not create a new issue" do
                   assert_no_difference('Issue.count') do
                     put '/issues/6.xml', @parameters, @headers
                   end
                 end
                 should "create a new journal" do
                   assert_difference('Journal.count') do
                     put '/issues/6.xml', @parameters, @headers
                   end
                 end
                 should "add the note to the journal" do
                   put '/issues/6.xml', @parameters, @headers
                   journal = Journal.last
                   assert_equal "A new note", journal.notes
                 end
                 should "update the issue" do
                   put '/issues/6.xml', @parameters, @headers
                   issue = Issue.find(6)
                   assert_equal "API update", issue.subject
                 end
               end
               context "PUT /issues/6.xml with failed update" do
                 setup do
                   @parameters = {:issue => {:subject => ''}}
                   @headers = { :authorization => credentials('jsmith') }
                 end
                 should_allow_api_authentication(:put,
                                                 '/issues/6.xml',
                                                 {:issue => {:subject => ''}}, # Missing subject should fail
                                                 {:success_code => :unprocessable_entity})
                 should "not create a new issue" do
                   assert_no_difference('Issue.count') do
                     put '/issues/6.xml', @parameters, @headers
                   end
                 end
                 should "not create a new journal" do
                   assert_no_difference('Journal.count') do
                     put '/issues/6.xml', @parameters, @headers
                   end
                 end
                 should "have an errors tag" do
                   put '/issues/6.xml', @parameters, @headers
                   assert_tag :errors, :child => {:tag => 'error', :content => "Subject can't be blank"}
                 end
               end
               context "PUT /issues/6.json" do
                 setup do
                   @parameters = {:issue => {:subject => 'API update', :notes => 'A new note'}}
                   @headers = { :authorization => credentials('jsmith') }
                 end
                 should_allow_api_authentication(:put,
                                                 '/issues/6.json',
                                                 {:issue => {:subject => 'API update', :notes => 'A new note'}},
                                                 {:success_code => :ok})
                 should "not create a new issue" do
                   assert_no_difference('Issue.count') do
                     put '/issues/6.json', @parameters, @headers
                   end
                 end
                 should "create a new journal" do
                   assert_difference('Journal.count') do
                     put '/issues/6.json', @parameters, @headers
                   end
                 end
                 should "add the note to the journal" do
                   put '/issues/6.json', @parameters, @headers
                   journal = Journal.last
                   assert_equal "A new note", journal.notes
                 end
                 should "update the issue" do
                   put '/issues/6.json', @parameters, @headers
                   issue = Issue.find(6)
                   assert_equal "API update", issue.subject
                 end
               end
               context "PUT /issues/6.json with failed update" do
                 setup do
                   @parameters = {:issue => {:subject => ''}}
                   @headers = { :authorization => credentials('jsmith') }
                 end
                 should_allow_api_authentication(:put,
                                                 '/issues/6.json',
                                                 {:issue => {:subject => ''}}, # Missing subject should fail
                                                 {:success_code => :unprocessable_entity})
                 should "not create a new issue" do
                   assert_no_difference('Issue.count') do
                     put '/issues/6.json', @parameters, @headers
                   end
                 end
                 should "not create a new journal" do
                   assert_no_difference('Journal.count') do
                     put '/issues/6.json', @parameters, @headers
                   end
                 end
                 should "have an errors attribute" do
                   put '/issues/6.json', @parameters, @headers
                   json = ActiveSupport::JSON.decode(response.body)
-                  assert_equal "can't be blank", json.first['subject']
+                  assert json['errors'].include?(['subject', "can't be blank"])
                 end
               end
               context "DELETE /issues/1.xml" do
                 should_allow_api_authentication(:delete,
                                                 '/issues/6.xml',
                                                 {},
                                                 {:success_code => :ok})
                 should "delete the issue" do
                   assert_difference('Issue.count',-1) do
                     delete '/issues/6.xml', {}, :authorization => credentials('jsmith')
                   end
                   assert_nil Issue.find_by_id(6)
                 end
               end
               context "DELETE /issues/1.json" do
                 should_allow_api_authentication(:delete,
                                                 '/issues/6.json',
                                                 {},
                                                 {:success_code => :ok})
                 should "delete the issue" do
                   assert_difference('Issue.count',-1) do
                     delete '/issues/6.json', {}, :authorization => credentials('jsmith')
                   end
                   assert_nil Issue.find_by_id(6)
                 end
               end
               def credentials(user, password=nil)
                 ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user)
               end
             end

test/unit/lib/redmine/views/builders/json_test.rb +9 0

             # Redmine - project management software
             # Copyright (C) 2006-2010  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.dirname(__FILE__) + '/../../../../../test_helper'
             class Redmine::Views::Builders::JsonTest < HelperTestCase
               def test_hash
                 assert_json_output({'person' => {'name' => 'Ryan', 'age' => 32}}) do |b|
                   b.person do
                     b.name 'Ryan'
                     b.age  32
                   end
                 end
               end
+              def test_hash_hash
+                assert_json_output({'person' => {'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b|
+                  b.person do
+                    b.name 'Ryan'
+                    b.birth :city => 'London', :country => 'UK'
+                  end
+                end
+              end
               def test_array
                 assert_json_output({'books' => [{'title' => 'Book 1', 'author' => 'B. Smith'}, {'title' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
                   b.array :books do |b|
                     b.book :title => 'Book 1', :author => 'B. Smith'
                     b.book :title => 'Book 2', :author => 'G. Cooper'
                   end
                 end
               end
               def test_array_with_content_tags
                 assert_json_output({'books' => [{'value' => 'Book 1', 'author' => 'B. Smith'}, {'value' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
                   b.array :books do |b|
                     b.book 'Book 1', :author => 'B. Smith'
                     b.book 'Book 2', :author => 'G. Cooper'
                   end
                 end
               end
               def assert_json_output(expected, &block)
                 builder = Redmine::Views::Builders::Json.new
                 block.call(builder)
                 assert_equal(expected, ActiveSupport::JSON.decode(builder.output))
               end
             end

app/views/issues/index.xml.builder removed 0 -33

NO CONTENT: file was removed

app/views/issues/show.xml.builder removed 0 -62

NO CONTENT: file was removed

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