summaryrefslogtreecommitdiffstats
path: root/test/functional/users_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/users_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/users_controller_test.rb')
-rw-r--r--test/functional/users_controller_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 437e59666..eda3a2db6 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -74,7 +74,7 @@ class UsersControllerTest < Redmine::ControllerTest
assert_equal User.logged.status(1).count, response.body.chomp.split("\n").size - 1
assert_include 'active', response.body
assert_not_include 'locked', response.body
- assert_equal 'text/csv', @response.content_type
+ assert_equal 'text/csv', @response.media_type
end
end
@@ -86,7 +86,7 @@ class UsersControllerTest < Redmine::ControllerTest
assert_equal User.logged.status(3).count, response.body.chomp.split("\n").size - 1
assert_include 'locked', response.body
assert_not_include 'active', response.body
- assert_equal 'text/csv', @response.content_type
+ assert_equal 'text/csv', @response.media_type
end
end
@@ -96,7 +96,7 @@ class UsersControllerTest < Redmine::ControllerTest
assert_equal User.logged.like('John').count, response.body.chomp.split("\n").size - 1
assert_include 'John', response.body
- assert_equal 'text/csv', @response.content_type
+ assert_equal 'text/csv', @response.media_type
end
def test_index_csv_with_group_filter
@@ -104,7 +104,7 @@ class UsersControllerTest < Redmine::ControllerTest
assert_response :success
assert_equal Group.find(10).users.count, response.body.chomp.split("\n").size - 1
- assert_equal 'text/csv', @response.content_type
+ assert_equal 'text/csv', @response.media_type
end
def test_show