jro_apps/redmine Commit - r13126:c0f082ad0252

Code cleanup....

Jean-Philippe Lang -

r13126:c0f082ad0252

parent child

Context file:

r13126:c0f082ad0252

Collapse all files

app/models/changeset.rb +1 -1

                 # the issue may have been updated by the closure of another one (eg. duplicate)
                 issue.reload
                 # don't change the status is the issue is closed
-                return if issue.status && issue.status.is_closed?
+                return if issue.closed?
                 journal = issue.init_journal(user || User.anonymous,
                                              ll(Setting.default_language,

app/models/issue.rb +18 -16

                 if fixed_version
                   if !assignable_versions.include?(fixed_version)
                     errors.add :fixed_version_id, :inclusion
-                  elsif reopened? && fixed_version.closed?
+                  elsif reopening? && fixed_version.closed?
                     errors.add :base, I18n.t(:error_can_not_reopen_issue_on_closed_version)
                   end
                 end
                 status.present? && status.is_closed?
               end
+              # Returns true if the issue was closed when loaded
+              def was_closed?
+                status_was.present? && status_was.is_closed?
+              end
               # Return true if the issue is being reopened
-              def reopened?
+              def reopening?
-                if !new_record? && status_id_changed?
+                if new_record?
-                  status_was = IssueStatus.find_by_id(status_id_was)
+                  false
-                  status_new = IssueStatus.find_by_id(status_id)
+                else
-                  if status_was && status_new && status_was.is_closed? && !status_new.is_closed?
+                  status_id_changed? && !closed? && was_closed?
-                    return true
-                  end
                 end
-                false
               end
+              alias :reopened? :reopening?
               # Return true if the issue is being closed
               def closing?
-                if !new_record? && status_id_changed?
+                if new_record?
-                  if closed? && status_was && !status_was.is_closed?
+                  closed?
-                    return true
+                else
-                  end
+                  status_id_changed? && closed? && !was_closed?
                 end
-                false
               end
               # Returns true if the issue is overdue
               def overdue?
-                !due_date.nil? && (due_date < Date.today) && !status.is_closed?
+                due_date.present? && (due_date < Date.today) && !closed?
               end
               # Is the amount of work done less than it should for the due date
               # The closed_on attribute stores the time of the last closing
               # and is preserved when the issue is reopened.
               def update_closed_on
-                if closing? || (new_record? && closed?)
+                if closing?
                   self.closed_on = updated_on
                 end
               end

test/unit/issue_test.rb +75 0

@@ -2398,6 +2398,13 class IssueTest < ActiveSupport::TestCase
2398	assert_equal IssueStatus.find(1), issue.status_was	2398	assert_equal IssueStatus.find(1), issue.status_was
2399	end	2399	end
2400		2400
		2401	def test_status_was_should_return_status_before_change_with_status_id
		2402	issue = Issue.find(1)
		2403	assert_equal IssueStatus.find(1), issue.status
		2404	issue.status_id = 2
		2405	assert_equal IssueStatus.find(1), issue.status_was
		2406	end
		2407
2401	def test_status_was_should_be_reset_on_save	2408	def test_status_was_should_be_reset_on_save
2402	issue = Issue.find(1)	2409	issue = Issue.find(1)
2403	issue.status = IssueStatus.find(2)	2410	issue.status = IssueStatus.find(2)
@@ -2405,4 +2412,72 class IssueTest < ActiveSupport::TestCase
2405	assert issue.save!	2412	assert issue.save!
2406	assert_equal IssueStatus.find(2), issue.status_was	2413	assert_equal IssueStatus.find(2), issue.status_was
2407	end	2414	end
		2415
		2416	def test_closing_should_return_true_when_closing_an_issue
		2417	issue = Issue.find(1)
		2418	issue.status = IssueStatus.find(2)
		2419	assert_equal false, issue.closing?
		2420	issue.status = IssueStatus.find(5)
		2421	assert_equal true, issue.closing?
		2422	end
		2423
		2424	def test_closing_should_return_true_when_closing_an_issue_with_status_id
		2425	issue = Issue.find(1)
		2426	issue.status_id = 2
		2427	assert_equal false, issue.closing?
		2428	issue.status_id = 5
		2429	assert_equal true, issue.closing?
		2430	end
		2431
		2432	def test_closing_should_return_true_for_new_closed_issue
		2433	issue = Issue.new
		2434	assert_equal false, issue.closing?
		2435	issue.status = IssueStatus.find(5)
		2436	assert_equal true, issue.closing?
		2437	end
		2438
		2439	def test_closing_should_return_true_for_new_closed_issue_with_status_id
		2440	issue = Issue.new
		2441	assert_equal false, issue.closing?
		2442	issue.status_id = 5
		2443	assert_equal true, issue.closing?
		2444	end
		2445
		2446	def test_closing_should_be_reset_after_save
		2447	issue = Issue.find(1)
		2448	issue.status_id = 5
		2449	assert_equal true, issue.closing?
		2450	issue.save!
		2451	assert_equal false, issue.closing?
		2452	end
		2453
		2454	def test_reopening_should_return_true_when_reopening_an_issue
		2455	issue = Issue.find(8)
		2456	issue.status = IssueStatus.find(6)
		2457	assert_equal false, issue.reopening?
		2458	issue.status = IssueStatus.find(2)
		2459	assert_equal true, issue.reopening?
		2460	end
		2461
		2462	def test_reopening_should_return_true_when_reopening_an_issue_with_status_id
		2463	issue = Issue.find(8)
		2464	issue.status_id = 6
		2465	assert_equal false, issue.reopening?
		2466	issue.status_id = 2
		2467	assert_equal true, issue.reopening?
		2468	end
		2469
		2470	def test_reopening_should_return_false_for_new_open_issue
		2471	issue = Issue.new
		2472	issue.status = IssueStatus.find(1)
		2473	assert_equal false, issue.reopening?
		2474	end
		2475
		2476	def test_reopening_should_be_reset_after_save
		2477	issue = Issue.find(8)
		2478	issue.status_id = 2
		2479	assert_equal true, issue.reopening?
		2480	issue.save!
		2481	assert_equal false, issue.reopening?
		2482	end
2408	end	2483	end

test/unit/repository_test.rb +2 -2

                 # make sure issue 1 is not already closed
                 fixed_issue = Issue.find(1)
-                assert !fixed_issue.status.is_closed?
+                assert !fixed_issue.closed?
                 old_status = fixed_issue.status
                 with_settings :notified_events => %w(issue_added issue_updated) do
                 # fixed issues
                 fixed_issue.reload
-                assert fixed_issue.status.is_closed?
+                assert fixed_issue.closed?
                 assert_equal 90, fixed_issue.done_ratio
                 assert_equal [101], fixed_issue.changeset_ids

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