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
Revert "Make sure cost entry and time entry factories are used correctly"
Klaus Zanders8a0e3f575a36
diff --git a/modules/costs/spec/factories/cost_entry_factory.rb b/modules/costs/spec/factories/cost_entry_factory.rbindex 4c4422b8a83..32c86bb81f3 100644--- a/modules/costs/spec/factories/cost_entry_factory.rb+++ b/modules/costs/spec/factories/cost_entry_factory.rb@@ -28,11 +28,6 @@FactoryBot.define dofactory :cost_entry do- transient do- # detect incorrect usage of `work_package` parameter instead of `entity`- work_package { nil }- end-projectuserentity factory: :work_package@@ -41,13 +36,6 @@ FactoryBot.define dounits { 1 }comments { "" }- after(:build) do |_cost_entry, evaluator|- if evaluator.work_package.present?- raise "Please update parameter `work_package` to `entity`. " \- "A cost entry can reference objects like work packages, meetings, etc."- end- end-before(:create) do |ce|ce.project = ce.entity.projectdiff --git a/modules/costs/spec/factories/time_entry_factory.rb b/modules/costs/spec/factories/time_entry_factory.rbindex f0aabde36ba..0759b812aaf 100644--- a/modules/costs/spec/factories/time_entry_factory.rb+++ b/modules/costs/spec/factories/time_entry_factory.rb@@ -28,11 +28,6 @@FactoryBot.define dofactory :time_entry do- transient do- # detect incorrect usage of `work_package` parameter instead of `entity`- work_package { nil }- end-userentity factory: :work_packagespent_on { Time.zone.today }@@ -40,13 +35,8 @@ FactoryBot.define dohours { 1.0 }logged_by { user }- after(:build) do |time_entry, evaluator|+ after(:build) do |time_entry|time_entry.project ||= time_entry.entity.project-- if evaluator.work_package.present?- raise "Please update parameter `work_package` to `entity`. " \- "A time entry can reference objects like work packages, meetings, etc."- endendafter(:create) do |time_entry|