jro_apps/redmine Commit - r13153:dfc594c33702

Default status per tracker (#5991)....

Jean-Philippe Lang -

r13153:dfc594c33702

parent child

Context file:

r13153:dfc594c33702

Expand all files

db/migrate/20141029181752_add_trackers_default_status_id.rb created 644 +15 0

@@ -0,0 +1,15
	1	class AddTrackersDefaultStatusId < ActiveRecord::Migration
	2	def up
	3	add_column :trackers, :default_status_id, :integer
	4
	5	status_id = IssueStatus.where(:is_default => true).pluck(:id).first
	6	status_id \|\|= IssueStatus.order(:position).pluck(:id).first
	7	if status_id
	8	Tracker.update_all :default_status_id => status_id
	9	end
	10	end
	11
	12	def down
	13	remove_column :trackers, :default_status_id
	14	end
	15	end

db/migrate/20141029181824_remove_issue_statuses_is_default.rb created 644 +12 0

@@ -0,0 +1,12
	1	class RemoveIssueStatusesIsDefault < ActiveRecord::Migration
	2	def up
	3	remove_column :issue_statuses, :is_default
	4	end
	5
	6	def down
	7	add_column :issue_statuses, :is_default, :boolean, :null => false, :default => false
	8	# Restores the first status as default
	9	default_status_id = IssueStatus.order("position").first.pluck(:id)
	10	IssueStatus.where(:id => default_status_id).update_all(:is_default => true)
	11	end
	12	end

app/controllers/issues_controller.rb +12 -10

               before_filter :find_project, :only => [:new, :create, :update_form]
               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, :update_form]
               accept_rss_auth :index, :show
               accept_api_auth :index, :show, :create, :update, :destroy
                 target_projects ||= @projects
                 if @copy
-                  @available_statuses = [IssueStatus.default]
+                  # Copied issues will get their default statuses
+                  @available_statuses = []
                 else
                   @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
                 end
                   @issue = @project.issues.visible.find(params[:id])
                 end
-                @issue.safe_attributes = params[:issue]
+                if attrs = params[:issue].deep_dup
+                  if params[:was_default_status] == attrs[:status_id]
+                    attrs.delete(:status_id)
+                  end
+                  @issue.safe_attributes = attrs
+                end
                 @issue.tracker ||= @project.trackers.first
                 if @issue.tracker.nil?
                   render_error l(:error_no_tracker_in_project)
                   return false
                 end
+                if @issue.status.nil?
+                  render_error l(:error_no_default_issue_status)
+                  return false
+                end
                 @priorities = IssuePriority.active
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?)
                 end
               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'}

app/models/issue.rb +52 -9

                 super
                 if new_record?
                   # set default values for new records only
-                  self.status ||= IssueStatus.default
                   self.priority ||= IssuePriority.default
                   self.watcher_user_ids = []
                 end
                 issue.save ? issue : false
               end
-              def status_id=(sid)
+              def status_id=(status_id)
-                self.status = nil
+                if status_id.to_s != self.status_id.to_s
-                result = write_attribute(:status_id, sid)
+                  self.status = (status_id.present? ? IssueStatus.find_by_id(status_id) : nil)
-                @workflow_rule_by_attribute = nil
+                end
-                result
+                self.status_id
+              end
+              # Sets the status.
+              def self.status=(status)
+                if status != self.status
+                  @workflow_rule_by_attribute = nil
+                end
+                association(:status).writer(status)
               end
               def priority_id=(pid)
                 self.tracker_id
               end
+              # Sets the tracker.
+              # This will set the status to the default status of the new tracker if:
+              # * the status was the default for the previous tracker
+              # * or if the status was not part of the new tracker statuses
+              # * or the status was nil
               def tracker=(tracker)
                 if tracker != self.tracker
+                  if status == default_status
+                    self.status = nil
+                  elsif status && tracker && !tracker.issue_status_ids.include?(status.id)
+                    self.status = nil
+                  end
                   @custom_field_values = nil
                   @workflow_rule_by_attribute = nil
                 end
                 association(:tracker).writer(tracker)
+                self.status ||= default_status
+                self.tracker
               end
               def project_id=(project_id)
                 self.project_id
               end
+              # Sets the project.
+              # Unless keep_tracker argument is set to true, this will change the tracker
+              # to the first tracker of the new project if the previous tracker is not part
+              # of the new project trackers.
+              # This will clear the fixed_version is it's no longer valid for the new project.
+              # This will clear the parent issue if it's no longer valid for the new project.
+              # This will set the category to the category with the same name in the new
+              # project if it exists, or clear it if it doesn't.
               def project=(project, keep_tracker=false)
                 project_was = self.project
                 association(:project).writer(project)
                     self.parent_issue_id = nil
                   end
                   @custom_field_values = nil
+                  @workflow_rule_by_attribute = nil
                 end
+                self.project
               end
               def description=(arg)
                 !relations_to.detect {|ir| ir.relation_type == 'blocks' && !ir.issue_from.closed?}.nil?
               end
+              # Returns the default status of the issue based on its tracker
+              # Returns nil if tracker is nil
+              def default_status
+                tracker.try(:default_status)
+              end
               # Returns an array of statuses that user is able to apply
               def new_statuses_allowed_to(user=User.current, include_default=false)
                 if new_record? && @copied_from
-                  [IssueStatus.default, @copied_from.status].compact.uniq.sort
+                  [default_status, @copied_from.status].compact.uniq.sort
                 else
                   initial_status = nil
                   if new_record?
-                    initial_status = IssueStatus.default
+                    initial_status = default_status
+                  elsif tracker_id_changed?
+                    if Tracker.where(:id => tracker_id_was, :default_status_id => status_id_was).any?
+                      initial_status = default_status
+                    elsif tracker.issue_status_ids.include?(status_id_was)
+                      initial_status = IssueStatus.find_by_id(status_id_was)
+                    else
+                      initial_status = default_status
+                    end
                   else
                     initial_status = status_was
                   end
                       )
                   end
                   statuses << initial_status unless statuses.empty?
-                  statuses << IssueStatus.default if include_default
+                  statuses << default_status if include_default
                   statuses = statuses.compact.uniq.sort
                   if blocked?
                     statuses.reject!(&:is_closed?)

app/models/issue_status.rb +5 -11

               acts_as_list
               before_destroy :delete_workflow_rules
-              after_save     :update_default
               validates_presence_of :name
               validates_uniqueness_of :name
               scope :sorted, lambda { order(:position) }
               scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
-              def update_default
-                IssueStatus.where(['id <> ?', id]).update_all({:is_default => false}) if self.is_default?
-              end
-              # Returns the default status for new issues
-              def self.default
-                where(:is_default => true).first
-              end
               # Update all the +Issues+ setting their done_ratio to the value of their +IssueStatus+
               def self.update_issue_done_ratios
                 if Issue.use_status_for_done_ratio?
               private
               def check_integrity
-                raise "Can't delete status" if Issue.where(:status_id => id).any?
+                if Issue.where(:status_id => id).any?
+                  raise "This status is used by some issues"
+                elsif Tracker.where(:default_status_id => id).any?
+                  raise "This status is used as the default status by some trackers"
+                end
               end
               # Deletes associated workflows

app/models/tracker.rb +10 -7

               CORE_FIELDS_ALL = (CORE_FIELDS_UNDISABLABLE + CORE_FIELDS).freeze
               before_destroy :check_integrity
+              belongs_to :default_status, :class_name => 'IssueStatus'
               has_many :issues
               has_many :workflow_rules, :dependent => :delete_all do
                 def copy(source_tracker)
               attr_protected :fields_bits
+              validates_presence_of :default_status
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
               # Returns an array of IssueStatus that are used
               # in the tracker's workflows
               def issue_statuses
-                if @issue_statuses
+                @issue_statuses ||= IssueStatus.where(:id => issue_status_ids).to_a.sort
-                  return @issue_statuses
+              end
-                elsif new_record?
-                  return []
-                end
-                status_ids = WorkflowTransition.where(:tracker_id => id).uniq.pluck(:old_status_id, :new_status_id).flatten.uniq
+              def issue_status_ids
-                @issue_statuses = IssueStatus.where(:id => status_ids).to_a.sort
+                if new_record?
+                  []
+                else
+                  @issue_status_ids ||= WorkflowTransition.where(:tracker_id => id).uniq.pluck(:old_status_id, :new_status_id).flatten.uniq
+                end
               end
               def disabled_core_fields

app/views/issue_statuses/_form.html.erb 0 -1

               <p><%= f.select :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :include_blank => true, :label => :field_done_ratio %></p>
             <% end %>
             <p><%= f.check_box :is_closed %></p>
-            <p><%= f.check_box :is_default %></p>
             <%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %>
             </div>

app/views/issue_statuses/index.api.rsb 0 -1

                 api.issue_status do
                   api.id status.id
                   api.name status.name
-                  api.is_default status.is_default
                   api.is_closed status.is_closed
                 end
               end

app/views/issue_statuses/index.html.erb 0 -2

               <% if Issue.use_status_for_done_ratio? %>
               <th><%=l(:field_done_ratio)%></th>
               <% end %>
-              <th><%=l(:field_is_default)%></th>
               <th><%=l(:field_is_closed)%></th>
               <th><%=l(:button_sort)%></th>
               <th></th>
               <% if Issue.use_status_for_done_ratio? %>
               <td><%= h status.default_done_ratio %></td>
               <% end %>
-              <td><%= checked_image status.is_default? %></td>
               <td><%= checked_image status.is_closed? %></td>
               <td class="reorder"><%= reorder_links('issue_status', {:action => 'update', :id => status}, :put) %></td>
               <td class="buttons">

app/views/issues/_attributes.html.erb +2 -2

             <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},
                             :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %></p>
+            <%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %>
             <% else %>
-            <p><label><%= l(:field_status) %></label> <%= h(@issue.status.name) %></p>
+            <p><label><%= l(:field_status) %></label> <%= @issue.status %></p>
             <% end %>
             <% if @issue.safe_attribute? 'priority_id' %>

app/views/trackers/_form.html.erb +5 -1

             <div class="box tabular">
             <!--[form:tracker]-->
             <p><%= f.text_field :name, :required => true %></p>
+            <p><%= f.select :default_status_id,
+                    IssueStatus.sorted.map {|s| [s.name, s.id]},
+                    :include_blank => @tracker.default_status.nil?,
+                    :required => true %>
+            </p>
             <p><%= f.check_box :is_in_roadmap %></p>
             <p>
               <label><%= l(:field_core_fields) %></label>
               <% Tracker::CORE_FIELDS.each do |field| %>

app/views/trackers/index.api.rsb +1 0

                 api.tracker do
                   api.id tracker.id
                   api.name tracker.name
+                  api.default_status(:id => tracker.default_status.id, :name => tracker.default_status.name) unless tracker.default_status.nil?
                 end
               end
             end

config/locales/en.yml +1 0

               field_inherit_members: Inherit members
               field_generate_password: Generate password
               field_must_change_passwd: Must change password at next logon
+              field_default_status: Default status
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle

config/locales/fr.yml +1 0

               field_inherit_members: Hériter les membres
               field_generate_password: Générer un mot de passe
               field_must_change_passwd: Doit changer de mot de passe à la prochaine connexion
+              field_default_status: Statut par défaut
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application

lib/redmine/default_data/loader.rb +11 -11

@@ -125,18 +125,18 module Redmine
125	:browse_repository,	125	:browse_repository,
126	:view_changesets]	126	:view_changesets]
127		127
128	# Trackers
129	Tracker.create!(:name => l(:default_tracker_bug), :is_in_chlog => true, :is_in_roadmap => false, :position => 1)
130	Tracker.create!(:name => l(:default_tracker_feature), :is_in_chlog => true, :is_in_roadmap => true, :position => 2)
131	Tracker.create!(:name => l(:default_tracker_support), :is_in_chlog => false, :is_in_roadmap => false, :position => 3)
132
133	# Issue statuses	128	# Issue statuses
134	new = IssueStatus.create!(:name => l(:default_issue_status_new), :is_closed => false, ~~:is_default~~ => ~~true~~, :position => 1)	129	new = IssueStatus.create!(:name => l(:default_issue_status_new), :is_closed => false, :position => 1)
135	in_progress = IssueStatus.create!(:name => l(:default_issue_status_in_progress), :is_closed => false, ~~:is_default~~ => ~~false~~, :position => 2)	130	in_progress = IssueStatus.create!(:name => l(:default_issue_status_in_progress), :is_closed => false, :position => 2)
136	resolved = IssueStatus.create!(:name => l(:default_issue_status_resolved), :is_closed => false, ~~:is_default~~ => ~~false~~, :position => 3)	131	resolved = IssueStatus.create!(:name => l(:default_issue_status_resolved), :is_closed => false, :position => 3)
137	feedback = IssueStatus.create!(:name => l(:default_issue_status_feedback), :is_closed => false, ~~:is_default~~ => ~~false~~, :position => 4)	132	feedback = IssueStatus.create!(:name => l(:default_issue_status_feedback), :is_closed => false, :position => 4)
138	closed = IssueStatus.create!(:name => l(:default_issue_status_closed), :is_closed => true, ~~:is_default~~ => ~~false~~, :position => 5)	133	closed = IssueStatus.create!(:name => l(:default_issue_status_closed), :is_closed => true, :position => 5)
139	rejected = IssueStatus.create!(:name => l(:default_issue_status_rejected), :is_closed => true, ~~:is_default~~ => ~~false~~, :position => 6)	134	rejected = IssueStatus.create!(:name => l(:default_issue_status_rejected), :is_closed => true, :position => 6)
		135
		136	# Trackers
		137	Tracker.create!(:name => l(:default_tracker_bug), :default_status_id => new.id, :is_in_chlog => true, :is_in_roadmap => false, :position => 1)
		138	Tracker.create!(:name => l(:default_tracker_feature), :default_status_id => new.id, :is_in_chlog => true, :is_in_roadmap => true, :position => 2)
		139	Tracker.create!(:name => l(:default_tracker_support), :default_status_id => new.id, :is_in_chlog => false, :is_in_roadmap => false, :position => 3)
140		140
141	# Workflow	141	# Workflow
142	Tracker.all.each { \|t\|	142	Tracker.all.each { \|t\|

lib/tasks/migrate_from_mantis.rake +5 -5

               module MantisMigrate
-                  DEFAULT_STATUS = IssueStatus.default
+                  new_status = IssueStatus.find_by_position(1)
                   assigned_status = IssueStatus.find_by_position(2)
                   resolved_status = IssueStatus.find_by_position(3)
                   feedback_status = IssueStatus.find_by_position(4)
                   closed_status = IssueStatus.where(:is_closed => true).first
-                  STATUS_MAPPING = {10 => DEFAULT_STATUS,  # new
+                  STATUS_MAPPING = {10 => new_status,      # new
 => feedback_status, # feedback
-=> DEFAULT_STATUS,  # acknowledged
+=> new_status,      # acknowledged
-=> DEFAULT_STATUS,  # confirmed
+=> new_status,      # confirmed
 => assigned_status, # assigned
 => resolved_status, # resolved
 => closed_status    # closed
                     i.author = User.find_by_id(users_map[bug.reporter_id])
                     i.category = IssueCategory.find_by_project_id_and_name(i.project_id, bug.category[0,30]) unless bug.category.blank?
                     i.fixed_version = Version.find_by_project_id_and_name(i.project_id, bug.fixed_in_version) unless bug.fixed_in_version.blank?
-                    i.status = STATUS_MAPPING[bug.status] || DEFAULT_STATUS
                     i.tracker = (bug.severity == 10 ? TRACKER_FEATURE : TRACKER_BUG)
+                    i.status = STATUS_MAPPING[bug.status] || i.status
                     i.id = bug.id if keep_bug_ids
                     next unless i.save
                     issues_map[bug.id] = i.id

lib/tasks/migrate_from_trac.rake +3 -3

                 module TracMigrate
                     TICKET_MAP = []
-                    DEFAULT_STATUS = IssueStatus.default
+                    new_status = IssueStatus.find_by_position(1)
                     assigned_status = IssueStatus.find_by_position(2)
                     resolved_status = IssueStatus.find_by_position(3)
                     feedback_status = IssueStatus.find_by_position(4)
                     closed_status = IssueStatus.where(:is_closed => true).first
-                    STATUS_MAPPING = {'new' => DEFAULT_STATUS,
+                    STATUS_MAPPING = {'new' => new_status,
                                       'reopened' => feedback_status,
                                       'assigned' => assigned_status,
                                       'closed' => closed_status
                       i.author = find_or_create_user(ticket.reporter)
                       i.category = issues_category_map[ticket.component] unless ticket.component.blank?
                       i.fixed_version = version_map[ticket.milestone] unless ticket.milestone.blank?
-                      i.status = STATUS_MAPPING[ticket.status] || DEFAULT_STATUS
                       i.tracker = TRACKER_MAPPING[ticket.ticket_type] || DEFAULT_TRACKER
+                      i.status = STATUS_MAPPING[ticket.status] || i.default_status
                       i.id = ticket.id unless Issue.exists?(ticket.id)
                       next unless Time.fake(ticket.changetime) { i.save }
                       TICKET_MAP[ticket.id] = i.id

test/fixtures/issue_statuses.yml 0 -6

             issue_statuses_001:
               id: 1
               name: New
-              is_default: true
               is_closed: false
               position: 1
             issue_statuses_002:
               id: 2
               name: Assigned
-              is_default: false
               is_closed: false
               position: 2
             issue_statuses_003:
               id: 3
               name: Resolved
-              is_default: false
               is_closed: false
               position: 3
             issue_statuses_004:
               name: Feedback
               id: 4
-              is_default: false
               is_closed: false
               position: 4
             issue_statuses_005:
               id: 5
               name: Closed
-              is_default: false
               is_closed: true
               position: 5
             issue_statuses_006:
               id: 6
               name: Rejected
-              is_default: false
               is_closed: true
               position: 6

test/fixtures/trackers.yml +3 0

               name: Bug
               id: 1
               is_in_chlog: true
+              default_status_id: 1
               position: 1
             trackers_002:
               name: Feature request
               id: 2
               is_in_chlog: true
+              default_status_id: 1
               position: 2
             trackers_003:
               name: Support request
               id: 3
               is_in_chlog: false
+              default_status_id: 1
               position: 3

test/functional/issue_statuses_controller_test.rb +15 -2

               end
               def test_destroy
-                Issue.delete_all("status_id = 1")
+                Issue.where(:status_id => 1).delete_all
+                Tracker.where(:default_status_id => 1).delete_all
                 assert_difference 'IssueStatus.count', -1 do
                   delete :destroy, :id => '1'
               end
               def test_destroy_should_block_if_status_in_use
-                assert_not_nil Issue.find_by_status_id(1)
+                assert Issue.where(:status_id => 1).any?
+                Tracker.where(:default_status_id => 1).delete_all
+                assert_no_difference 'IssueStatus.count' do
+                  delete :destroy, :id => '1'
+                end
+                assert_redirected_to :action => 'index'
+                assert_not_nil IssueStatus.find_by_id(1)
+              end
+              def test_destroy_should_block_if_status_in_use
+                Issue.where(:status_id => 1).delete_all
+                assert Tracker.where(:default_status_id => 1).any?
                 assert_no_difference 'IssueStatus.count' do
                   delete :destroy, :id => '1'

test/functional/issues_controller_test.rb +49 -5

                 end
               end
+              def test_new_should_select_default_status
+                @request.session[:user_id] = 2
+                get :new, :project_id => 1
+                assert_response :success
+                assert_template 'new'
+                assert_select 'select[name=?]', 'issue[status_id]' do
+                  assert_select 'option[value=1][selected=selected]'
+                end
+                assert_select 'input[name=was_default_status][value=1]'
+              end
+              def test_new_should_select_default_status
+                @request.session[:user_id] = 2
+                get :new, :project_id => 1
+                assert_response :success
+                assert_template 'new'
+                assert_select 'select[name=?]', 'issue[status_id]' do
+                  assert_select 'option[value=1][selected=selected]'
+                end
+                assert_select 'input[name=was_default_status][value=1]'
+              end
               def test_get_new_with_list_custom_field
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1, :tracker_id => 1
                 assert_equal [1,2,5], assigns(:allowed_statuses).map(&:id).sort
               end
+              def test_update_form_with_default_status_should_ignore_submitted_status_id_if_equals
+                @request.session[:user_id] = 2
+                tracker = Tracker.find(2)
+                tracker.update! :default_status_id => 2
+                tracker.generate_transitions! 2, 1, :clear => true
+                xhr :post, :update_form, :project_id => 1,
+                                 :issue => {:tracker_id => 2,
+                                            :status_id => 1},
+                                 :was_default_status => 1
+                assert_equal 2, assigns(:issue).status_id
+              end
               def test_post_create
                 @request.session[:user_id] = 2
                 assert_difference 'Issue.count' do
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
+                issue = assigns(:issue)
+                assert_not_nil issue.default_status
                 assert_select 'select[name=?]', 'issue[status_id]' do
                   assert_select 'option', 1
-                  assert_select 'option[value=?]', IssueStatus.default.id.to_s
+                  assert_select 'option[value=?]', issue.default_status.id.to_s
                 end
               end
-              test "without workflow privilege #new should accept default status" do
+              test "without workflow privilege #create should accept default status" do
                 setup_without_workflow_privilege
                 assert_difference 'Issue.count' do
                   post :create, :project_id => 1,
                                             :status_id => 1}
                 end
                 issue = Issue.order('id').last
-                assert_equal IssueStatus.default, issue.status
+                assert_not_nil issue.default_status
+                assert_equal issue.default_status, issue.status
               end
-              test "without workflow privilege #new should ignore unauthorized status" do
+              test "without workflow privilege #create should ignore unauthorized status" do
                 setup_without_workflow_privilege
                 assert_difference 'Issue.count' do
                   post :create, :project_id => 1,
                                             :status_id => 3}
                 end
                 issue = Issue.order('id').last
-                assert_equal IssueStatus.default, issue.status
+                assert_not_nil issue.default_status
+                assert_equal issue.default_status, issue.status
               end
               test "without workflow privilege #update should ignore status change" do

test/functional/trackers_controller_test.rb +6 -6

             require File.expand_path('../../test_helper', __FILE__)
             class TrackersControllerTest < ActionController::TestCase
-              fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields
+              fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields, :issue_statuses
               def setup
                 User.current = nil
               def test_create
                 assert_difference 'Tracker.count' do
-                  post :create, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] }
+                  post :create, :tracker => { :name => 'New tracker', :default_status_id => 1, :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] }
                 end
                 assert_redirected_to :action => 'index'
                 tracker = Tracker.order('id DESC').first
                 assert_equal 0, tracker.workflow_rules.count
               end
-              def create_with_disabled_core_fields
+              def test_create_with_disabled_core_fields
                 assert_difference 'Tracker.count' do
-                  post :create, :tracker => { :name => 'New tracker', :core_fields => ['assigned_to_id', 'fixed_version_id', ''] }
+                  post :create, :tracker => { :name => 'New tracker', :default_status_id => 1, :core_fields => ['assigned_to_id', 'fixed_version_id', ''] }
                 end
                 assert_redirected_to :action => 'index'
                 tracker = Tracker.order('id DESC').first
               def test_create_new_with_workflow_copy
                 assert_difference 'Tracker.count' do
-                  post :create, :tracker => { :name => 'New tracker' }, :copy_workflow_from => 1
+                  post :create, :tracker => { :name => 'New tracker', :default_status_id => 1 }, :copy_workflow_from => 1
                 end
                 assert_redirected_to :action => 'index'
                 tracker = Tracker.find_by_name('New tracker')
               end
               def test_destroy
-                tracker = Tracker.create!(:name => 'Destroyable')
+                tracker = Tracker.generate!(:name => 'Destroyable')
                 assert_difference 'Tracker.count', -1 do
                   delete :destroy, :id => tracker.id
                 end

test/object_helpers.rb +32 -1

@@ -45,11 +45,22 module ObjectHelpers
45	project	45	project
46	end	46	end
47		47
		48	def IssueStatus.generate!(attributes={})
		49	@generated_status_name \|\|= 'Status 0'
		50	@generated_status_name.succ!
		51	status = IssueStatus.new(attributes)
		52	status.name = @generated_status_name.dup if status.name.blank?
		53	yield status if block_given?
		54	status.save!
		55	status
		56	end
		57
48	def Tracker.generate!(attributes={})	58	def Tracker.generate!(attributes={})
49	@generated_tracker_name \|\|= 'Tracker 0'	59	@generated_tracker_name \|\|= 'Tracker 0'
50	@generated_tracker_name.succ!	60	@generated_tracker_name.succ!
51	tracker = Tracker.new(attributes)	61	tracker = Tracker.new(attributes)
52	tracker.name = @generated_tracker_name.dup if tracker.name.blank?	62	tracker.name = @generated_tracker_name.dup if tracker.name.blank?
		63	tracker.default_status \|\|= IssueStatus.order('position').first \|\| IssueStatus.generate!
53	yield tracker if block_given?	64	yield tracker if block_given?
54	tracker.save!	65	tracker.save!
55	tracker	66	tracker
@@ -188,6 +199,27 module ObjectHelpers
188	end	199	end
189	end	200	end
190		201
		202	module TrackerObjectHelpers
		203	def generate_transitions!(*args)
		204	options = args.last.is_a?(Hash) ? args.pop : {}
		205	if args.size == 1
		206	args << args.first
		207	end
		208	if options[:clear]
		209	WorkflowTransition.where(:tracker_id => id).delete_all
		210	end
		211	args.each_cons(2) do \|old_status_id, new_status_id\|
		212	WorkflowTransition.create!(
		213	:tracker => self,
		214	:role_id => (options[:role_id] \|\| 1),
		215	:old_status_id => old_status_id,
		216	:new_status_id => new_status_id
		217	)
		218	end
		219	end
		220	end
		221	Tracker.send :include, TrackerObjectHelpers
		222
191	module IssueObjectHelpers	223	module IssueObjectHelpers
192	def close!	224	def close!
193	self.status = IssueStatus.where(:is_closed => true).first	225	self.status = IssueStatus.where(:is_closed => true).first
@@ -198,5 +230,4 module IssueObjectHelpers
198	Issue.generate!(attributes.merge(:parent_issue_id => self.id))	230	Issue.generate!(attributes.merge(:parent_issue_id => self.id))
199	end	231	end
200	end	232	end
201
202	Issue.send :include, IssueObjectHelpers	233	Issue.send :include, IssueObjectHelpers

test/unit/issue_status_test.rb 0 -24

@@ -28,7 +28,6 class IssueStatusTest < ActiveSupport::TestCase
28		28
29	status.name = "Test Status"	29	status.name = "Test Status"
30	assert status.save	30	assert status.save
31	assert !status.is_default
32	end	31	end
33		32
34	def test_destroy	33	def test_destroy
@@ -46,29 +45,6 class IssueStatusTest < ActiveSupport::TestCase
46	assert_raise(RuntimeError, "Can't delete status") { status.destroy }	45	assert_raise(RuntimeError, "Can't delete status") { status.destroy }
47	end	46	end
48		47
49	def test_default
50	status = IssueStatus.default
51	assert_kind_of IssueStatus, status
52	end
53
54	def test_change_default
55	status = IssueStatus.find(2)
56	assert !status.is_default
57	status.is_default = true
58	assert status.save
59	status.reload
60
61	assert_equal status, IssueStatus.default
62	assert !IssueStatus.find(1).is_default
63	end
64
65	def test_reorder_should_not_clear_default_status
66	status = IssueStatus.default
67	status.move_to_bottom
68	status.reload
69	assert status.is_default?
70	end
71
72	def test_new_statuses_allowed_to	48	def test_new_statuses_allowed_to
73	WorkflowTransition.delete_all	49	WorkflowTransition.delete_all
74		50

test/unit/issue_test.rb +67 -5

@@ -40,11 +40,11 class IssueTest < ActiveSupport::TestCase
40		40
41	assert_nil issue.project_id	41	assert_nil issue.project_id
42	assert_nil issue.tracker_id	42	assert_nil issue.tracker_id
		43	assert_nil issue.status_id
43	assert_nil issue.author_id	44	assert_nil issue.author_id
44	assert_nil issue.assigned_to_id	45	assert_nil issue.assigned_to_id
45	assert_nil issue.category_id	46	assert_nil issue.category_id
46		47
47	assert_equal IssueStatus.default, issue.status
48	assert_equal IssuePriority.default, issue.priority	48	assert_equal IssuePriority.default, issue.priority
49	end	49	end
50		50
@@ -59,10 +59,9 class IssueTest < ActiveSupport::TestCase
59	end	59	end
60		60
61	def test_create_minimal	61	def test_create_minimal
62	issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3,	62	issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :subject => 'test_create')
63	:status_id => 1, :priority => IssuePriority.all.first,
64	:subject => 'test_create')
65	assert issue.save	63	assert issue.save
		64	assert_equal issue.tracker.default_status, issue.status
66	assert issue.description.nil?	65	assert issue.description.nil?
67	assert_nil issue.estimated_hours	66	assert_nil issue.estimated_hours
68	end	67	end
@@ -908,7 +907,7 class IssueTest < ActiveSupport::TestCase
908		907
909	def test_copy_should_copy_status	908	def test_copy_should_copy_status
910	orig = Issue.find(8)	909	orig = Issue.find(8)
911	assert orig.status != ~~IssueStatus~~.default	910	assert orig.status != orig.default_status
912		911
913	issue = Issue.new.copy_from(orig)	912	issue = Issue.new.copy_from(orig)
914	assert issue.save	913	assert issue.save
@@ -2480,4 +2479,67 class IssueTest < ActiveSupport::TestCase
2480	issue.save!	2479	issue.save!
2481	assert_equal false, issue.reopening?	2480	assert_equal false, issue.reopening?
2482	end	2481	end
		2482
		2483	def test_default_status_without_tracker_should_be_nil
		2484	issue = Issue.new
		2485	assert_nil issue.tracker
		2486	assert_nil issue.default_status
		2487	end
		2488
		2489	def test_default_status_should_be_tracker_default_status
		2490	issue = Issue.new(:tracker_id => 1)
		2491	assert_not_nil issue.status
		2492	assert_equal issue.tracker.default_status, issue.default_status
		2493	end
		2494
		2495	def test_initializing_with_tracker_should_set_default_status
		2496	issue = Issue.new(:tracker => Tracker.find(1))
		2497	assert_not_nil issue.status
		2498	assert_equal issue.default_status, issue.status
		2499	end
		2500
		2501	def test_initializing_with_tracker_id_should_set_default_status
		2502	issue = Issue.new(:tracker_id => 1)
		2503	assert_not_nil issue.status
		2504	assert_equal issue.default_status, issue.status
		2505	end
		2506
		2507	def test_setting_tracker_should_set_default_status
		2508	issue = Issue.new
		2509	issue.tracker = Tracker.find(1)
		2510	assert_not_nil issue.status
		2511	assert_equal issue.default_status, issue.status
		2512	end
		2513
		2514	def test_changing_tracker_should_set_default_status_if_status_was_default
		2515	WorkflowTransition.delete_all
		2516	WorkflowTransition.create! :role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 1
		2517	Tracker.find(2).update! :default_status_id => 2
		2518
		2519	issue = Issue.new(:tracker_id => 1, :status_id => 1)
		2520	assert_equal IssueStatus.find(1), issue.status
		2521	issue.tracker = Tracker.find(2)
		2522	assert_equal IssueStatus.find(2), issue.status
		2523	end
		2524
		2525	def test_changing_tracker_should_set_default_status_if_status_is_not_used_by_tracker
		2526	WorkflowTransition.delete_all
		2527	Tracker.find(2).update! :default_status_id => 2
		2528
		2529	issue = Issue.new(:tracker_id => 1, :status_id => 3)
		2530	assert_equal IssueStatus.find(3), issue.status
		2531	issue.tracker = Tracker.find(2)
		2532	assert_equal IssueStatus.find(2), issue.status
		2533	end
		2534
		2535	def test_changing_tracker_should_keep_status_if_status_was_not_default_and_is_used_by_tracker
		2536	WorkflowTransition.delete_all
		2537	WorkflowTransition.create! :role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 3
		2538	Tracker.find(2).update! :default_status_id => 2
		2539
		2540	issue = Issue.new(:tracker_id => 1, :status_id => 3)
		2541	assert_equal IssueStatus.find(3), issue.status
		2542	issue.tracker = Tracker.find(2)
		2543	assert_equal IssueStatus.find(3), issue.status
		2544	end
2483	end	2545	end

test/unit/mail_handler_test.rb +1 -1

               def test_add_issue_with_japanese_keywords
                 ja_dev = "\xe9\x96\x8b\xe7\x99\xba".force_encoding('UTF-8')
-                tracker = Tracker.create!(:name => ja_dev)
+                tracker = Tracker.generate!(:name => ja_dev)
                 Project.find(1).trackers << tracker
                 issue = submit_email(
                           'japanese_keywords_iso_2022_jp.eml',

test/unit/tracker_test.rb +1 -1

                 source = Tracker.find(1)
                 assert_equal 89, source.workflow_rules.size
-                target = Tracker.new(:name => 'Target')
+                target = Tracker.new(:name => 'Target', :default_status_id => 1)
                 assert target.save
                 target.workflow_rules.copy(source)
                 target.reload

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