From 0af19c1f71ba99892b5f08e6b66fdf9ed4fce9d9 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Mon, 8 Sep 2025 21:10:15 +0000 Subject: [PATCH] Merged r23961 from trunk to 5.1-stable (#43161). git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23963 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/issues_controller_test.rb | 2 +- test/functional/issues_custom_fields_visibility_test.rb | 6 +++--- test/functional/timelog_custom_fields_visibility_test.rb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 08de597d1..046f7c821 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -4442,7 +4442,7 @@ class IssuesControllerTest < Redmine::ControllerTest assert_equal Date.parse('2012-07-14'), issue.start_date assert_nil issue.due_date assert_equal 'value1', issue.custom_field_value(cf1) - assert_nil issue.custom_field_value(cf2) + assert_equal '', issue.custom_field_value(cf2) end def test_create_should_ignore_unallowed_trackers diff --git a/test/functional/issues_custom_fields_visibility_test.rb b/test/functional/issues_custom_fields_visibility_test.rb index 047a8a285..5c5afd43e 100644 --- a/test/functional/issues_custom_fields_visibility_test.rb +++ b/test/functional/issues_custom_fields_visibility_test.rb @@ -229,9 +229,9 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest user = User.generate! User.add_to_project(user, p1, Role.where(:id => [1, 3]).to_a) User.add_to_project(user, p2, Role.where(:id => 3).to_a) - Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueA'}) - Issue.generate!(:project => p2, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueB'}) - Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueC'}) + Issue.generate!(:project => p1, :tracker_id => 1, :author_id => 1, :custom_field_values => {@field2.id => 'ValueA'}) + Issue.generate!(:project => p2, :tracker_id => 1, :author_id => 1, :custom_field_values => {@field2.id => 'ValueB'}) + Issue.generate!(:project => p1, :tracker_id => 1, :author_id => 1, :custom_field_values => {@field2.id => 'ValueC'}) @request.session[:user_id] = user.id get( diff --git a/test/functional/timelog_custom_fields_visibility_test.rb b/test/functional/timelog_custom_fields_visibility_test.rb index 87023b864..034381c09 100644 --- a/test/functional/timelog_custom_fields_visibility_test.rb +++ b/test/functional/timelog_custom_fields_visibility_test.rb @@ -74,13 +74,13 @@ class TimelogCustomFieldsVisibilityTest < Redmine::ControllerTest User.add_to_project(user, p1, Role.where(:id => [1, 3]).to_a) User.add_to_project(user, p2, Role.where(:id => 3).to_a) TimeEntry.generate!( - :issue => Issue.generate!(:project => p1, :tracker_id => 1, + :issue => Issue.generate!(:project => p1, :tracker_id => 1, :author_id => 1, :custom_field_values => {@field2.id => 'ValueA'})) TimeEntry.generate!( - :issue => Issue.generate!(:project => p2, :tracker_id => 1, + :issue => Issue.generate!(:project => p2, :tracker_id => 1, :author_id => 1, :custom_field_values => {@field2.id => 'ValueB'})) TimeEntry.generate!( - :issue => Issue.generate!(:project => p1, :tracker_id => 1, + :issue => Issue.generate!(:project => p1, :tracker_id => 1, :author_id => 1, :custom_field_values => {@field2.id => 'ValueC'})) @request.session[:user_id] = user.id