diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-12-06 00:28:18 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-12-06 00:28:18 +0000 |
| commit | eba47e112e3ed7da16cdcacb98bb4abafc1eefaa (patch) | |
| tree | c2efd86f43651c3291ce6a2ef0a6248bf8562d42 /test | |
| parent | 0e321e6a86635f09cb1d53e022c88c8804c79272 (diff) | |
| download | redmine-eba47e112e3ed7da16cdcacb98bb4abafc1eefaa.tar.gz redmine-eba47e112e3ed7da16cdcacb98bb4abafc1eefaa.zip | |
Merged r19341 from trunk to 4.0-stable (#32500).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19343 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 4929ba286..b25059f3d 100644 --- a/test/functional/timelog_report_test.rb +++ b/test/functional/timelog_report_test.rb @@ -246,14 +246,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 |