summaryrefslogtreecommitdiffstats
path: root/test/functional/timelog_controller_test.rb
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-12-08 00:10:43 +0000
committerGo MAEDA <maeda@farend.jp>2019-12-08 00:10:43 +0000
commit2de3dfeae556df9f2502c7949fd4463c127aeb10 (patch)
treed0758d8a7ce0734192065c6559a9a1382ea81f3e /test/functional/timelog_controller_test.rb
parente675eaedab189b31b4aac0e83732f24ed954b69b (diff)
downloadredmine-2de3dfeae556df9f2502c7949fd4463c127aeb10.tar.gz
redmine-2de3dfeae556df9f2502c7949fd4463c127aeb10.zip
CSV related tests fail with Rails 5.2.4 (#32526, #32525).
Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@19344 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/timelog_controller_test.rb')
-rw-r--r--test/functional/timelog_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 38f3c06bd..6046b1cd1 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -1383,7 +1383,7 @@ class TimelogControllerTest < Redmine::ControllerTest
with_settings :date_format => '%m/%d/%Y' do
get :index, :params => {:format => 'csv'}
assert_response :success
- assert_equal 'text/csv', response.content_type
+ assert_equal 'text/csv', response.media_type
end
end
@@ -1391,7 +1391,7 @@ class TimelogControllerTest < Redmine::ControllerTest
with_settings :date_format => '%m/%d/%Y' do
get :index, :params => {:project_id => 1, :format => 'csv'}
assert_response :success
- assert_equal 'text/csv', response.content_type
+ assert_equal 'text/csv', response.media_type
end
end