Remove remaining usages of work_package instead of entity in Unit Specs

modules/budgets/app/components/budgets/actual_labor_budget_items_component.rb

@@ -36,7 +36,8 @@ class Budgets::ActualLaborBudgetItemsComponent < ApplicationComponent
       .time_entries
       .not_ongoing
       .visible(User.current)
-      .group_by(&:work_package)
+      .where(entity_type: "WorkPackage")
+      .group_by(&:entity)
       .each do |work_package, time_entries|
         consolidate_time_entries(time_entries).each do |t|
           yield work_package, t

modules/budgets/spec/components/budgets/actual_labor_budget_items_component_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe Budgets::ActualLaborBudgetItemsComponent, type: :component do
   end
 
   describe "with time entries" do
-    let!(:time_entry) { create :time_entry, work_package:, user: }
+    let!(:time_entry) { create :time_entry, entity: work_package, user: }
 
     it "renders the link to the time entry's user's avatar" do
       rendered = render_inline(subject)

modules/costs/spec/controllers/time_entries_controller_spec.rb

@@ -50,8 +50,8 @@ RSpec.describe TimeEntriesController do
   describe "#dialog" do
     describe "authorization checks" do
       context "when opening dialog on an existing time entry" do
-        let!(:time_entry1) { create(:time_entry, user: user, work_package: work_package1) }
-        let!(:time_entry2) { create(:time_entry, user: other_user, work_package: work_package1) }
+        let!(:time_entry1) { create(:time_entry, user: user, entity: work_package1) }
+        let!(:time_entry2) { create(:time_entry, user: other_user, entity: work_package1) }
 
         context "and the user has the edit_own_time_entries permission on the work package" do
           before do
@@ -198,7 +198,7 @@ RSpec.describe TimeEntriesController do
             time_entry = assigns(:time_entry)
             expect(time_entry).to be_new_record
             expect(time_entry.project).to eq(project1)
-            expect(time_entry.work_package).to eq(work_package1)
+            expect(time_entry.entity).to eq(work_package1)
           end
 
           it "does not allow to open the dialog for another work package" do

modules/costs/spec/lib/api/v3/cost_entries/work_package_costs_by_type_representer_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe API::V3::CostEntries::WorkPackageCostsByTypeRepresenter do
     create_list(:cost_entry,
                 2,
                 units: 1,
-                work_package:,
+                entity: work_package,
                 project:,
                 cost_type: cost_type_A)
   end
@@ -47,7 +47,7 @@ RSpec.describe API::V3::CostEntries::WorkPackageCostsByTypeRepresenter do
     create_list(:cost_entry,
                 3,
                 units: 2,
-                work_package:,
+                entity: work_package,
                 project:,
                 cost_type: cost_type_B)
   end

modules/costs/spec/models/work_package/ask_before_destruction_spec.rb

@@ -57,12 +57,12 @@ RSpec.describe WorkPackage do
   let(:priority) { create(:priority) }
   let(:cost_type) { create(:cost_type) }
   let(:cost_entry) do
-    create(:cost_entry, work_package:,
+    create(:cost_entry, entity: work_package,
                         project: work_package.project,
                         cost_type:)
   end
   let(:cost_entry2) do
-    create(:cost_entry, work_package: work_package2,
+    create(:cost_entry, entity: work_package2,
                         project: work_package2.project,
                         cost_type:)
   end
@@ -155,7 +155,7 @@ RSpec.describe WorkPackage do
         action
 
         cost_entry.reload
-        expect(cost_entry.work_package_id).to eq(work_package.id)
+        expect(cost_entry.entity).to eq(work_package)
       end
     end
 
@@ -170,7 +170,7 @@ RSpec.describe WorkPackage do
         action
 
         cost_entry.reload
-        expect(cost_entry.work_package_id).to eq(work_package.id)
+        expect(cost_entry.entity).to eq(work_package)
       end
     end
 
@@ -181,11 +181,11 @@ RSpec.describe WorkPackage do
         expect(action).to be_falsey
       end
 
-      it "does not alter the work_package_id of all cost entries" do
+      it "does not alter the entity of all cost entries" do
         action
 
         cost_entry.reload
-        expect(cost_entry.work_package_id).to eq(work_package.id)
+        expect(cost_entry.entity).to eq(work_package)
       end
 
       it "sets an error on work packages" do
@@ -213,11 +213,11 @@ RSpec.describe WorkPackage do
         expect(action).to be_truthy
       end
 
-      it "sets the work_package_id of all cost entries to the new work package" do
+      it "sets the entity of all cost entries to the new work package" do
         action
 
         cost_entry.reload
-        expect(cost_entry.work_package_id).to eq(work_package2.id)
+        expect(cost_entry.entity).to eq(work_package2)
       end
 
       it "sets the project_id of all cost entries to the new work package's project" do
@@ -243,11 +243,11 @@ RSpec.describe WorkPackage do
         expect(action).to be_falsey
       end
 
-      it "does not alter the work_package_id of all cost entries" do
+      it "does not alter the entity of all cost entries" do
         action
 
         cost_entry.reload
-        expect(cost_entry.work_package_id).to eq(work_package.id)
+        expect(cost_entry.entity).to eq(work_package)
       end
     end
 
@@ -261,11 +261,11 @@ RSpec.describe WorkPackage do
         expect(action).to be_falsey
       end
 
-      it "does not alter the work_package_id of all cost entries" do
+      it "does not alter the entity of all cost entries" do
         action
 
         cost_entry.reload
-        expect(cost_entry.work_package_id).to eq(work_package.id)
+        expect(cost_entry.entity).to eq(work_package)
       end
     end
 
@@ -277,11 +277,11 @@ RSpec.describe WorkPackage do
         expect(action).to be_falsey
       end
 
-      it "does not alter the work_package_id of all cost entries" do
+      it "does not alter the entity of all cost entries" do
         action
 
         cost_entry.reload
-        expect(cost_entry.work_package_id).to eq(work_package.id)
+        expect(cost_entry.entity).to eq(work_package)
       end
     end
 

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

@@ -358,7 +358,7 @@ RSpec.describe "API v3 time_entry resource" do
     context "when start- & end-time tracking is disabled", with_settings: { allow_tracking_start_and_end_times: false } do
       context "when start and end time were tracked" do
         let!(:time_entry) do
-          create(:time_entry, :with_start_and_end_time, project:, work_package:, user: current_user)
+          create(:time_entry, :with_start_and_end_time, project:, entity: work_package, user: current_user)
         end
 
         it "does not include start and end time fields" do
@@ -557,7 +557,7 @@ RSpec.describe "API v3 time_entry resource" do
       let(:additional_setup) { -> { existing_ongoing_time_entry } }
 
       let(:existing_ongoing_time_entry) do
-        create(:time_entry, ongoing: true, project:, work_package:, user: current_user)
+        create(:time_entry, ongoing: true, project:, entity: work_package, user: current_user)
       end
 
       let(:params) do

modules/reporting/spec/models/cost_query/results_spec.rb

@@ -33,8 +33,8 @@ RSpec.describe CostQuery, :reporting_query_helper do
     create(:admin)
     project = create(:project_with_types)
     work_package = create(:work_package, project:)
-    create(:time_entry, work_package:, project:)
-    create(:cost_entry, work_package:, project:)
+    create(:time_entry, entity: work_package, project:)
+    create(:cost_entry, entity: work_package, project:)
   end
 
   minimal_query

spec/lib/api/v3/activities/activity_eager_loading_wrapper_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe API::V3::Activities::ActivityEagerLoadingWrapper, with_settings:
     end
 
     it "can wrap TimeEntry journals" do
-      time_entry = create(:time_entry, project:, work_package:, user:)
+      time_entry = create(:time_entry, project:, entity: work_package, user:)
       expect(time_entry.journals).to be_wrappable
     end
 

spec/lib/api/v3/work_packages/eager_loading/cost_eager_loading_integration_spec.rb

@@ -58,27 +58,27 @@ RSpec.describe API::V3::WorkPackages::WorkPackageEagerLoadingWrapper, "cost eage
     create(:cost_entry,
            cost_type:,
            user:,
-           work_package:,
+           entity: work_package,
            project:)
   end
   let(:cost_entry2) do
     create(:cost_entry,
            cost_type:,
            user:,
-           work_package:,
+           entity: work_package,
            project:)
   end
   let(:time_entry1) do
     create(:time_entry,
            user:,
            project:,
-           work_package:)
+           entity: work_package)
   end
   let(:time_entry2) do
     create(:time_entry,
            user:,
            project:,
-           work_package:)
+           entity: work_package)
   end
   let(:user_rates) do
     create(:hourly_rate,

spec/models/projects/activity_spec.rb

@@ -103,13 +103,13 @@ RSpec.describe Projects::Activity, "core" do
 
   let(:time_entry) do
     create(:time_entry,
-           work_package:,
+           entity: work_package,
            project:)
   end
 
   let(:time_entry2) do
     create(:time_entry,
-           work_package:,
+           entity: work_package,
            project:)
   end
 

spec/models/work_package_spec.rb

@@ -321,12 +321,12 @@ RSpec.describe WorkPackage do
     let!(:time_entry1) do
       create(:time_entry,
              project:,
-             work_package:)
+             entity: work_package)
     end
     let!(:time_entry2) do
       create(:time_entry,
              project:,
-             work_package:)
+             entity: work_package)
     end
 
     before do
@@ -651,7 +651,7 @@ RSpec.describe WorkPackage do
     end
 
     it "has already the work_package assigned" do
-      expect(stub_work_package.add_time_entry.work_package).to eq(stub_work_package)
+      expect(stub_work_package.add_time_entry.entity).to eq(stub_work_package)
     end
 
     it "returns an unsaved entry" do

spec/models/work_packages/spent_time_spec.rb

@@ -51,22 +51,22 @@ RSpec.describe WorkPackage, "spent_time" do
   end
   let!(:time_entry) do
     create(:time_entry,
-           work_package:,
+           entity: work_package,
            project:)
   end
   let(:time_entry2) do
     create(:time_entry,
-           work_package:,
+           entity: work_package,
            project:)
   end
   let(:child_time_entry) do
     create(:time_entry,
-           work_package: child_work_package,
+           entity: child_work_package,
            project:)
   end
   let(:child_time_entry_in_other_project) do
     create(:time_entry,
-           work_package: child_work_package_in_other_project,
+           entity: child_work_package_in_other_project,
            project: other_project)
   end
   let(:role) do

spec/services/work_packages/update_service_integration_spec.rb

@@ -159,7 +159,7 @@ RSpec.describe WorkPackages::UpdateService, "integration", type: :model do
 
     describe "time_entries" do
       let!(:time_entries) do
-        create_list(:time_entry, 2, project:, work_package:)
+        create_list(:time_entry, 2, project:, entity: work_package)
       end
 
       it "moves the time entries along" do

spec/workers/principals/delete_job_integration_spec.rb

@@ -110,7 +110,7 @@ RSpec.describe Principals::DeleteJob, type: :model do
                project: work_package.project,
                units: 100.0,
                spent_on: Time.zone.today,
-               work_package:,
+               entity: work_package,
                comments: "")
       end