From c6f44540d655bb5e9d7c43e2a425cc83af11ed95 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Tue, 10 Dec 2019 04:36:47 +0000 Subject: [PATCH] Merged r19344 from trunk to 4.0-stable (#32526, #32525). git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19353 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/issues_controller_test.rb | 22 ++++++++++------------ test/functional/timelog_controller_test.rb | 4 ++-- test/functional/timelog_report_test.rb | 10 +++++----- test/functional/users_controller_test.rb | 8 ++++---- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 849cb092b..81312123c 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -592,7 +592,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 @@ -605,8 +605,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 @@ -633,8 +632,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 @@ -650,7 +648,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 @@ -662,7 +660,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 @@ -734,7 +732,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') @@ -756,7 +754,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},/} @@ -780,7 +778,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 @@ -798,7 +796,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 @@ -1264,7 +1262,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/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index e025563c2..a75c8b246 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -1236,7 +1236,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 @@ -1244,7 +1244,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 b25059f3d..73814b547 100644 --- a/test/functional/timelog_report_test.rb +++ b/test/functional/timelog_report_test.rb @@ -232,7 +232,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 @@ -250,7 +250,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') @@ -336,7 +336,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') @@ -371,7 +371,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 a949626f5..d516e3259 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -72,7 +72,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 @@ -84,7 +84,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 @@ -94,7 +94,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 @@ -102,7 +102,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