Merge pull request #13578 from opf/refactor/simplify-custom-field-fac…

…tory

Refactor CustomField factories using traits

modules/bim/spec/features/bcf/create_spec.rb

@@ -30,7 +30,7 @@
     create(:type, custom_fields: [integer_cf])
   end
   let(:integer_cf) do
-    create(:int_wp_custom_field)
+    create(:integer_wp_custom_field)
   end
 
   shared_examples 'bcf details creation' do |with_viewpoints|

modules/costs/spec/lib/api/v3/time_entries/schemas/time_entry_schema_representer_spec.rb

@@ -271,7 +271,7 @@
     end
 
     context 'for a custom value' do
-      let(:custom_field) { build_stubbed(:text_time_entry_custom_field) }
+      let(:custom_field) { build_stubbed(:time_entry_custom_field) }
       let(:path) { "customField#{custom_field.id}" }
       let(:writable_attributes) { [custom_field.attribute_name] }
 

modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_parsing_spec.rb

@@ -53,10 +53,10 @@
     described_class.create(time_entry, current_user: user, embed_links: true)
   end
   let(:user_custom_field) do
-    build_stubbed(:time_entry_custom_field, field_format: 'user')
+    build_stubbed(:time_entry_custom_field, :user)
   end
-  let(:test_custom_field) do
-    build_stubbed(:time_entry_custom_field, field_format: 'text')
+  let(:text_custom_field) do
+    build_stubbed(:time_entry_custom_field)
   end
 
   let(:hash) do
@@ -81,7 +81,7 @@
         "raw" => "some comment"
       },
       "spentOn" => "2017-07-28",
-      test_custom_field.attribute_name(:camel_case) => {
+      text_custom_field.attribute_name(:camel_case) => {
         "raw" => "some text"
       }
     }
@@ -90,7 +90,7 @@
   before do
     allow(time_entry)
       .to receive(:available_custom_fields)
-      .and_return([test_custom_field, user_custom_field])
+      .and_return([text_custom_field, user_custom_field])
   end
 
   describe '_links' do
@@ -171,7 +171,7 @@
       it 'updates the custom value' do
         time_entry = representer.from_hash(hash)
 
-        expect(time_entry.custom_field_values.detect { |cv| cv.custom_field_id == test_custom_field.id }.value)
+        expect(time_entry.custom_field_values.detect { |cv| cv.custom_field_id == text_custom_field.id }.value)
           .to eql("some text")
       end
     end

modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_rendering_spec.rb

@@ -106,7 +106,7 @@
 
     context 'custom value' do
       let(:custom_field) do
-        build_stubbed(:time_entry_custom_field, field_format: 'user')
+        build_stubbed(:time_entry_custom_field, :user)
       end
       let(:custom_value) do
         double('CustomValue',
@@ -255,7 +255,7 @@
     end
 
     context 'custom value' do
-      let(:custom_field) { build_stubbed(:text_time_entry_custom_field) }
+      let(:custom_field) { build_stubbed(:time_entry_custom_field) }
       let(:custom_value) do
         CustomValue.new(custom_field:,
                         value: '1234',

modules/costs/spec/requests/api/time_entries/create_form_resource_spec.rb

@@ -39,7 +39,7 @@
       TimeEntryActivitiesProject.insert(project_id: project.id, activity_id: tea.id, active: false)
     end
   end
-  let(:custom_field) { create(:text_time_entry_custom_field) }
+  let(:custom_field) { create(:time_entry_custom_field) }
   let(:user) do
     create(:user,
            member_in_project: project,

modules/costs/spec/requests/api/time_entries/update_form_resource_spec.rb

@@ -40,7 +40,7 @@
       TimeEntryActivitiesProject.insert(project_id: project.id, activity_id: tea.id, active: false)
     end
   end
-  let(:custom_field) { create(:text_time_entry_custom_field) }
+  let(:custom_field) { create(:time_entry_custom_field) }
   let(:user) do
     create(:user,
            member_in_project: project,

modules/costs/spec/requests/api/time_entry_resource_spec.rb

@@ -54,7 +54,7 @@
   let(:other_project) { other_work_package.project }
   let(:role) { create(:role, permissions:) }
   let(:permissions) { %i(view_time_entries view_work_packages) }
-  let(:custom_field) { create(:text_time_entry_custom_field) }
+  let(:custom_field) { create(:time_entry_custom_field) }
   let(:custom_value) do
     CustomValue.create(custom_field:,
                        value: '1234',

modules/dashboards/spec/features/project_details_spec.rb

@@ -32,9 +32,9 @@
 
 RSpec.describe 'Project details widget on dashboard', js: true do
   let!(:version_cf) { create(:version_project_custom_field) }
-  let!(:bool_cf) { create(:bool_project_custom_field) }
+  let!(:bool_cf) { create(:boolean_project_custom_field) }
   let!(:user_cf) { create(:user_project_custom_field) }
-  let!(:int_cf) { create(:int_project_custom_field) }
+  let!(:int_cf) { create(:integer_project_custom_field) }
   let!(:float_cf) { create(:float_project_custom_field) }
   let!(:text_cf) { create(:text_project_custom_field) }
   let!(:string_cf) { create(:string_project_custom_field) }

modules/my_page/spec/features/my/time_entries_current_user_spec.rb

@@ -98,7 +98,7 @@
            hours: 4)
   end
   let!(:custom_field) do
-    create(:time_entry_custom_field, field_format: 'text')
+    create(:time_entry_custom_field)
   end
   let(:other_user) do
     create(:user)

spec/contracts/projects/shared_contract_examples.rb

@@ -262,8 +262,8 @@ def expect_valid(valid, symbols = {})
   end
 
   describe 'available_custom_fields' do
-    let(:visible_custom_field) { build_stubbed(:int_project_custom_field, visible: true) }
-    let(:invisible_custom_field) { build_stubbed(:int_project_custom_field, visible: false) }
+    let(:visible_custom_field) { build_stubbed(:integer_project_custom_field, visible: true) }
+    let(:invisible_custom_field) { build_stubbed(:integer_project_custom_field, visible: false) }
 
     before do
       allow(project)
@@ -280,14 +280,14 @@ def expect_valid(valid, symbols = {})
 
       it 'returns all available_custom_fields of the project' do
         expect(subject.available_custom_fields)
-          .to match_array([visible_custom_field, invisible_custom_field])
+          .to contain_exactly(visible_custom_field, invisible_custom_field)
       end
     end
 
     context 'if the user is no admin' do
       it 'returns all visible and available_custom_fields of the project' do
         expect(subject.available_custom_fields)
-          .to match_array([visible_custom_field])
+          .to contain_exactly(visible_custom_field)
       end
     end
   end

spec/controllers/my_controller_spec.rb

@@ -121,7 +121,7 @@
   end
 
   describe 'account' do
-    let(:custom_field) { create(:text_user_custom_field) }
+    let(:custom_field) { create(:user_custom_field, :text) }
 
     before do
       custom_field

spec/controllers/work_packages/bulk_controller_spec.rb

@@ -38,7 +38,7 @@
            is_for_all: true)
   end
   let(:custom_field2) { create(:work_package_custom_field) }
-  let(:custom_field_user) { create(:user_issue_custom_field) }
+  let(:custom_field_user) { create(:issue_custom_field, :user) }
   let(:status) { create(:status) }
   let(:type) do
     create(:type_standard,