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

diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb
index c1e52f67d2aef2def1104e75941339a592755a13..8e411c53e46a7557f4a1151120a118a52c951356 100644 (file)
--- 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 => {