From 5835778a58e948ab0fbc74d74bf105c545f62e37 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Tue, 10 Dec 2019 04:00:27 +0000 Subject: [PATCH] Merged r19344 from trunk to 4.1-stable (#32526, #32525). git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19351 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/issues_controller_test.rb | 21 ++++++++++----------- test/functional/projects_controller_test.rb | 2 +- test/functional/timelog_controller_test.rb | 4 ++-- test/functional/timelog_report_test.rb | 10 +++++----- test/functional/users_controller_test.rb | 8 ++++---- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 352f5cedf..ee7dbfac0 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -667,7 +667,7 @@ class IssuesControllerTest < Redmine::ControllerTest } assert_response :success - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type assert response.body.starts_with?("#,") lines = response.body.chomp.split("\n") # default columns + id and project @@ -680,8 +680,7 @@ class IssuesControllerTest < Redmine::ControllerTest :format => 'csv' } assert_response :success - - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type end def test_index_csv_without_any_filters @@ -706,7 +705,7 @@ class IssuesControllerTest < Redmine::ControllerTest } assert_response :success end - assert_equal 'text/csv', response.content_type + assert_equal 'text/csv', response.media_type headers = response.body.chomp.split("\n").first.split(',') assert_include 'Description', headers assert_include 'test_index_csv_with_description', response.body @@ -722,7 +721,7 @@ class IssuesControllerTest < Redmine::ControllerTest :c => %w(subject spent_hours) } assert_response :success - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") assert_include "#{issue.id},#{issue.subject},7.33", lines end @@ -734,7 +733,7 @@ class IssuesControllerTest < Redmine::ControllerTest } assert_response :success - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type assert_match /\A#,/, response.body lines = response.body.chomp.split("\n") assert_equal IssueQuery.new.available_inline_columns.size, lines[0].split(',').size @@ -806,7 +805,7 @@ class IssuesControllerTest < Redmine::ControllerTest :subject => str_utf8, :format => 'csv' } - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") header = lines[0] status = (+"\xaa\xac\xbaA").force_encoding('Big5') @@ -828,7 +827,7 @@ class IssuesControllerTest < Redmine::ControllerTest :format => 'csv', :set_filter => 1 } - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") header = lines[0] issue_line = lines.find {|l| l =~ /^#{issue.id},/} @@ -852,7 +851,7 @@ class IssuesControllerTest < Redmine::ControllerTest :format => 'csv', :set_filter => 1 } - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") assert_include "#{issue.id},1234.50,#{str1}", lines end @@ -870,7 +869,7 @@ class IssuesControllerTest < Redmine::ControllerTest :format => 'csv', :set_filter => 1 } - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") assert_include "#{issue.id};1234,50;#{str1}", lines end @@ -1337,7 +1336,7 @@ class IssuesControllerTest < Redmine::ControllerTest :format => 'csv' } assert_response :success - assert_equal 'text/csv', response.content_type + assert_equal 'text/csv', response.media_type lines = response.body.chomp.split("\n") assert_include '1,"Related to #7, Related to #8, Blocks #11"', lines assert_include '2,Blocked by #12', lines diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 34c25d930..cd3c16f96 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -205,7 +205,7 @@ class ProjectsControllerTest < 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 diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index 0b5f3aab0..ab4ed364e 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 diff --git a/test/functional/timelog_report_test.rb b/test/functional/timelog_report_test.rb index 842307050..e9c13b311 100644 --- a/test/functional/timelog_report_test.rb +++ b/test/functional/timelog_report_test.rb @@ -233,7 +233,7 @@ class TimelogReportTest < Redmine::ControllerTest :format => "csv" } assert_response :success - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") # Headers assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first @@ -251,7 +251,7 @@ class TimelogReportTest < Redmine::ControllerTest :format => "csv" } assert_response :success - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") # Headers assert_equal 'Project,User,Overtime,2007-3,2007-4,Total time', lines.first @@ -289,7 +289,7 @@ class TimelogReportTest < Redmine::ControllerTest } end assert_response :success - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") # Headers s1 = (+"\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp").force_encoding('Big5') @@ -334,7 +334,7 @@ class TimelogReportTest < Redmine::ControllerTest } end assert_response :success - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") # Headers s1 = (+"\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp").force_encoding('Big5') @@ -369,7 +369,7 @@ class TimelogReportTest < Redmine::ControllerTest :format => "csv" } assert_response :success - assert_equal 'text/csv', @response.content_type + assert_equal 'text/csv', @response.media_type lines = @response.body.chomp.split("\n") # Headers s1 = (+"Utilisateur;2011-11-11;Temps total").force_encoding('ISO-8859-1') diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index 2a6a5d138..3081c0d7e 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 -- 2.39.5