OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Fix specs for time entry dialog and remove deprecation in TE Representer
Klaus Zanders51ab553a704a
diff --git a/modules/costs/lib/api/v3/time_entries/time_entry_representer.rb b/modules/costs/lib/api/v3/time_entries/time_entry_representer.rbindex d0074315ea8..024b9df2267 100644--- a/modules/costs/lib/api/v3/time_entries/time_entry_representer.rb+++ b/modules/costs/lib/api/v3/time_entries/time_entry_representer.rb@@ -100,7 +100,9 @@ module API# TODO: DEPRECATED!associated_resource :work_package,- skip_render: ->(*) { represented.entity_type != "WorkPackage" }+ skip_render: ->(*) { represented.entity_type != "WorkPackage" },+ getter: ->(*) { represented.entity if represented.entity_type == "WorkPackage" },+ setter: ->(value) { represented.entity = value }associated_resource :userdiff --git a/modules/costs/spec/features/time_entry_dialog_spec.rb b/modules/costs/spec/features/time_entry_dialog_spec.rbindex 467563f38cc..27f541689ee 100644--- a/modules/costs/spec/features/time_entry_dialog_spec.rb+++ b/modules/costs/spec/features/time_entry_dialog_spec.rb@@ -218,7 +218,7 @@ RSpec.describe "time entry dialog", :js dodescribe "when the user can edit time entries" dolet(:permissions) { %i[log_own_time view_own_time_entries edit_own_time_entries view_work_packages] }- let!(:time_entry) { create(:time_entry, work_package: work_package_a, project: work_package_a.project, user: user) }+ let!(:time_entry) { create(:time_entry, entity: work_package_a, project: work_package_a.project, user: user) }context "with work packages from different projects" dolet(:other_project) { create(:project_with_types) }@@ -239,7 +239,7 @@ RSpec.describe "time entry dialog", :js dofind("opce-time-entry-trigger-actions .icon-edit").clicktime_logging_modal.is_visible(true)- time_logging_modal.update_field("work_package_id", work_package_c.id)+ time_logging_modal.update_field("entity_id", work_package_c.id)wait_for_network_idle # form refresh is happening heretime_logging_modal.submitwait_for_network_idle@@ -248,7 +248,7 @@ RSpec.describe "time entry dialog", :js do# also check that everything is updated in the databasetime_entry.reload- expect(time_entry.work_package).to eq(work_package_c)+ expect(time_entry.entity).to eq(work_package_c)endend@@ -266,7 +266,7 @@ RSpec.describe "time entry dialog", :js doexpect dotime_logging_modal.is_visible(true)- time_logging_modal.update_field("work_package_id", work_package_b.id)+ time_logging_modal.update_field("entity_id", work_package_b.id)wait_for_network_idle # form refresh is happening heretime_logging_modal.submitwait_for_network_idle@@ -276,7 +276,7 @@ RSpec.describe "time entry dialog", :js do# also check that everything is updated in the databasetime_entry.reload- expect(time_entry.work_package).to eq(work_package_b)+ expect(time_entry.entity).to eq(work_package_b)endendend