From 3881a9ade447ae6b992a2e4add72058e7e96ac37 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 15 Sep 2018 09:08:35 +0000 Subject: [PATCH] Merged r17488 to 3.4-stable (#28925). git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17489 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/enumerations_controller_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb index c1e52f67d..8e411c53e 100644 --- a/test/functional/enumerations_controller_test.rb +++ b/test/functional/enumerations_controller_test.rb @@ -68,7 +68,7 @@ class EnumerationsControllerTest < Redmine::ControllerTest end def test_create_with_custom_field_values - custom_field = CustomField.generate!(:type => "TimeEntryActivityCustomField") + custom_field = TimeEntryActivityCustomField.generate! assert_difference 'TimeEntryActivity.count' do post :create, :params => { :enumeration => { @@ -152,7 +152,7 @@ class EnumerationsControllerTest < Redmine::ControllerTest end def test_update_custom_field_values - custom_field = CustomField.generate!(:type => "TimeEntryActivityCustomField") + custom_field = TimeEntryActivityCustomField.generate! enumeration = Enumeration.find(9) assert_nil enumeration.custom_field_values.last.value put :update, :params => { -- 2.39.5