diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-12-06 00:26:45 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-12-06 00:26:45 +0000 |
| commit | 044052336ba5ff963728a50a9ca91e2384b00cdb (patch) | |
| tree | 7cf8e664fa7c53b3dee753ace0c9425de6e2cf12 /test | |
| parent | c039dc45967ba989b8e5057b1f61ecc0bfb70d87 (diff) | |
| download | redmine-044052336ba5ff963728a50a9ca91e2384b00cdb.tar.gz redmine-044052336ba5ff963728a50a9ca91e2384b00cdb.zip | |
Merged r19341 from trunk to 4.1-stable (#32500).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19342 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/timelog_report_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/timelog_report_test.rb b/test/functional/timelog_report_test.rb index a643522d3..842307050 100644 --- a/test/functional/timelog_report_test.rb +++ b/test/functional/timelog_report_test.rb @@ -247,14 +247,14 @@ class TimelogReportTest < Redmine::ControllerTest :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", - :criteria => ["project", "user", "activity"], + :criteria => ["project", "user", "cf_10"], :format => "csv" } assert_response :success assert_equal 'text/csv', @response.content_type lines = @response.body.chomp.split("\n") # Headers - assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first + assert_equal 'Project,User,Overtime,2007-3,2007-4,Total time', lines.first # Total row assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last end |