From 63a32b21f10450ae8e0e854cf7a50617b0c3f513 Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Thu, 28 Mar 2019 08:03:28 +0000 Subject: [PATCH] Update Rails to 5.2.3 --- Gemfile | 2 +- plugins/README | 1 - test/functional/issues_controller_test.rb | 20 ++++++++++---------- test/functional/timelog_controller_test.rb | 4 ++-- test/functional/timelog_report_test.rb | 10 +++++----- test/functional/users_controller_test.rb | 8 ++++---- 6 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 plugins/README diff --git a/Gemfile b/Gemfile index f5f5fd0..0f518ef 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem "bundler", ">= 1.5.0" -gem "rails", "5.2.2.1" +gem "rails", "5.2.3" gem "rouge", "~> 3.3.0" gem "request_store", "1.0.5" gem "mini_mime", "~> 1.0.1" diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 7b12f19..195c05d 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -639,7 +639,7 @@ class IssuesControllerTest < Redmine::ControllerTest } assert_response :success - assert_equal 'text/csv; header=present', @response.content_type + assert_equal 'text/csv', @response.content_type assert response.body.starts_with?("#,") lines = response.body.chomp.split("\n") # default columns + id and project @@ -653,7 +653,7 @@ class IssuesControllerTest < Redmine::ControllerTest } assert_response :success - assert_equal 'text/csv; header=present', @response.content_type + assert_equal 'text/csv', @response.content_type end def test_index_csv_without_any_filters @@ -681,7 +681,7 @@ class IssuesControllerTest < Redmine::ControllerTest assert_response :success end - assert_equal 'text/csv; header=present', response.content_type + assert_equal 'text/csv', response.content_type headers = response.body.chomp.split("\n").first.split(',') assert_include 'Description', headers assert_include 'test_index_csv_with_description', response.body @@ -697,7 +697,7 @@ class IssuesControllerTest < Redmine::ControllerTest :c => %w(subject spent_hours) } assert_response :success - assert_equal 'text/csv; header=present', @response.content_type + assert_equal 'text/csv', @response.content_type lines = @response.body.chomp.split("\n") assert_include "#{issue.id},#{issue.subject},7.33", lines end @@ -709,7 +709,7 @@ class IssuesControllerTest < Redmine::ControllerTest } assert_response :success - assert_equal 'text/csv; header=present', @response.content_type + assert_equal 'text/csv', @response.content_type assert_match /\A#,/, response.body lines = response.body.chomp.split("\n") assert_equal IssueQuery.new.available_inline_columns.size, lines[0].split(',').size @@ -781,7 +781,7 @@ class IssuesControllerTest < Redmine::ControllerTest :subject => str_utf8, :format => 'csv' } - assert_equal 'text/csv; header=present', @response.content_type + assert_equal 'text/csv', @response.content_type lines = @response.body.chomp.split("\n") header = lines[0] status = (+"\xaa\xac\xbaA").force_encoding('Big5') @@ -803,7 +803,7 @@ class IssuesControllerTest < Redmine::ControllerTest :format => 'csv', :set_filter => 1 } - assert_equal 'text/csv; header=present', @response.content_type + assert_equal 'text/csv', @response.content_type lines = @response.body.chomp.split("\n") header = lines[0] issue_line = lines.find {|l| l =~ /^#{issue.id},/} @@ -827,7 +827,7 @@ class IssuesControllerTest < Redmine::ControllerTest :format => 'csv', :set_filter => 1 } - assert_equal 'text/csv; header=present', @response.content_type + assert_equal 'text/csv', @response.content_type lines = @response.body.chomp.split("\n") assert_include "#{issue.id},1234.50,#{str1}", lines end @@ -845,7 +845,7 @@ class IssuesControllerTest < Redmine::ControllerTest :format => 'csv', :set_filter => 1 } - assert_equal 'text/csv; header=present', @response.content_type + assert_equal 'text/csv', @response.content_type lines = @response.body.chomp.split("\n") assert_include "#{issue.id};1234,50;#{str1}", lines end @@ -1313,7 +1313,7 @@ class IssuesControllerTest < Redmine::ControllerTest :format => 'csv' } assert_response :success - assert_equal 'text/csv; header=present', response.content_type + assert_equal 'text/csv', response.content_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 5c33192..27efa25 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -1350,7 +1350,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; header=present', response.content_type + assert_equal 'text/csv', response.content_type end end @@ -1358,7 +1358,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; header=present', response.content_type + assert_equal 'text/csv', response.content_type end end diff --git a/test/functional/timelog_report_test.rb b/test/functional/timelog_report_test.rb index eef5fc4..d372073 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; header=present', @response.content_type + 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 @@ -251,7 +251,7 @@ class TimelogReportTest < Redmine::ControllerTest :format => "csv" } assert_response :success - assert_equal 'text/csv; header=present', @response.content_type + 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 @@ -289,7 +289,7 @@ class TimelogReportTest < Redmine::ControllerTest } end assert_response :success - assert_equal 'text/csv; header=present', @response.content_type + assert_equal 'text/csv', @response.content_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; header=present', @response.content_type + assert_equal 'text/csv', @response.content_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; header=present', @response.content_type + assert_equal 'text/csv', @response.content_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 1e8a750..d1fdd21 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; header=present', @response.content_type + assert_equal 'text/csv', @response.content_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; header=present', @response.content_type + assert_equal 'text/csv', @response.content_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; header=present', @response.content_type + assert_equal 'text/csv', @response.content_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; header=present', @response.content_type + assert_equal 'text/csv', @response.content_type end def test_show -- 2.1.4