From dc98cec17f914b6a490243ca456988312fd0e284 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 28 Jul 2013 20:49:41 +0000 Subject: [PATCH] Merged r12060 from trunk (#14369). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12066 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/reports_helper.rb | 2 +- test/functional/reports_controller_test.rb | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb index 9d52b673f..48647bcc3 100644 --- a/app/helpers/reports_helper.rb +++ b/app/helpers/reports_helper.rb @@ -24,7 +24,7 @@ module ReportsHelper data.each { |row| match = 1 criteria.each { |k, v| - match = 0 unless (row[k].to_s == v.to_s) || (k == 'closed' && row[k] == (v == 0 ? "f" : "t")) + match = 0 unless (row[k].to_s == v.to_s) || (k == 'closed' && (v == 0 ? ['f', false] : ['t', true]).include?(row[k])) } unless criteria.nil? a = a + row["total"].to_i if match == 1 } unless data.nil? diff --git a/test/functional/reports_controller_test.rb b/test/functional/reports_controller_test.rb index 56a1aca3f..25e4f7ba5 100644 --- a/test/functional/reports_controller_test.rb +++ b/test/functional/reports_controller_test.rb @@ -54,6 +54,24 @@ class ReportsControllerTest < ActionController::TestCase end end + def test_get_issue_report_details_by_tracker_should_show_issue_count + Issue.delete_all + Issue.generate!(:tracker_id => 1) + Issue.generate!(:tracker_id => 1) + Issue.generate!(:tracker_id => 1, :status_id => 5) + Issue.generate!(:tracker_id => 2) + + get :issue_report_details, :id => 1, :detail => 'tracker' + assert_select 'table.list tbody :nth-child(1)' do + assert_select 'td', :text => 'Bug' + assert_select ':nth-child(2)', :text => '2' # status:1 + assert_select ':nth-child(3)', :text => '-' # status:2 + assert_select ':nth-child(8)', :text => '2' # open + assert_select ':nth-child(9)', :text => '1' # closed + assert_select ':nth-child(10)', :text => '3' # total + end + end + def test_get_issue_report_details_by_priority get :issue_report_details, :id => 1, :detail => 'priority' assert_equal IssuePriority.all.reverse, assigns(:rows)