diff options
| author | Go MAEDA <maeda@farend.jp> | 2022-01-29 06:19:31 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2022-01-29 06:19:31 +0000 |
| commit | 0a2a3f554b4d619e01f567eee5e4e89839042861 (patch) | |
| tree | aeb3e666415863e8808beed9cd432b224f7d4f2e /test/functional | |
| parent | 00c0e38499a9bc39c28e15ace5b1df226d018049 (diff) | |
| download | redmine-0a2a3f554b4d619e01f567eee5e4e89839042861.tar.gz redmine-0a2a3f554b4d619e01f567eee5e4e89839042861.zip | |
Merged r21371 from trunk to 4.2-stable (#20018).
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@21388 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/timelog_report_test.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/test/functional/timelog_report_test.rb b/test/functional/timelog_report_test.rb index 5b56f1ea9..bfdfdae01 100644 --- a/test/functional/timelog_report_test.rb +++ b/test/functional/timelog_report_test.rb @@ -224,6 +224,19 @@ class TimelogReportTest < Redmine::ControllerTest assert_select 'td', :text => 'New' end + def test_report_activity_criterion_should_aggregate_system_activity_and_project_activity + activity = TimeEntryActivity.create!(:name => 'Design', :parent_id => 9, :project_id => 3) + TimeEntry.generate!(:project_id => 3, :issue_id => 5, :activity_id => activity.id, :spent_on => '2007-05-23', :hours => 10.0) + + get :report, :params => {:project_id => 1, :criteria => ['activity']} + assert_response :success + + assert_select 'tr.last-level:first' do + assert_select 'td.name', :text => 'Design' + assert_select 'td.hours:last', :text => '165.25' + end + end + def test_report_all_projects_csv_export get :report, :params => { :columns => 'month', |