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
Remove remaining usages of work_package instead of entity in Feature Specs
Klaus Zanders2d8e1000a34f
diff --git a/modules/costs/spec/features/destroy_work_package_with_cost_entries_spec.rb b/modules/costs/spec/features/destroy_work_package_with_cost_entries_spec.rbindex 9ac74610d0b..ba9db7a02b0 100644--- a/modules/costs/spec/features/destroy_work_package_with_cost_entries_spec.rb+++ b/modules/costs/spec/features/destroy_work_package_with_cost_entries_spec.rb@@ -56,7 +56,7 @@ RSpec.describe "Deleting time entries", :js dolet(:other_work_package) { create(:work_package, project:, budget:) }let(:cost_entry) docreate(:cost_entry,- work_package:,+ entity: work_package,project:,units: 2.00,cost_type:,diff --git a/modules/costs/spec/features/time_entries_spec.rb b/modules/costs/spec/features/time_entries_spec.rbindex 1ea9a23c973..272abca410e 100644--- a/modules/costs/spec/features/time_entries_spec.rb+++ b/modules/costs/spec/features/time_entries_spec.rb@@ -39,7 +39,7 @@ RSpec.describe "Work Package table time entries", :js dolet!(:time_entry1) docreate(:time_entry,user:,- work_package: parent,+ entity: parent,project:,hours: 10)end@@ -47,7 +47,7 @@ RSpec.describe "Work Package table time entries", :js dolet!(:time_entry2) docreate(:time_entry,user:,- work_package:,+ entity: work_package,project:,hours: 2.50)enddiff --git a/modules/costs/spec/features/timer_spec.rb b/modules/costs/spec/features/timer_spec.rbindex ba757fc6408..b45b9acd60e 100644--- a/modules/costs/spec/features/timer_spec.rb+++ b/modules/costs/spec/features/timer_spec.rb@@ -135,7 +135,7 @@ RSpec.describe "Work Package timer", :js, :selenium docontext "when an old timer exists" dolet!(:active_timer) doTimecop.travel(2.days.ago) do- create(:time_entry, project:, work_package: work_package_a, user:, ongoing: true)+ create(:time_entry, project:, entity: work_package_a, user:, ongoing: true)endenddiff --git a/modules/costs/spec/features/view_own_rates_spec.rb b/modules/costs/spec/features/view_own_rates_spec.rbindex cf5b3988212..163ea225152 100644--- a/modules/costs/spec/features/view_own_rates_spec.rb+++ b/modules/costs/spec/features/view_own_rates_spec.rb@@ -51,7 +51,7 @@ RSpec.describe "Only see your own rates", :js doendlet(:time_entry) docreate(:time_entry, user:,- work_package:,+ entity: work_package,project:,hours: 1.00)end@@ -62,7 +62,7 @@ RSpec.describe "Only see your own rates", :js dotypeendlet(:cost_entry) do- create(:cost_entry, work_package:,+ create(:cost_entry, entity: work_package,project:,units: 2.00,cost_type:,@@ -81,10 +81,10 @@ RSpec.describe "Only see your own rates", :js docreate(:time_entry, user: other_user,hours: 3.00,project:,- work_package:)+ entity: work_package)endlet(:other_cost_entry) do- create(:cost_entry, work_package:,+ create(:cost_entry, entity: work_package,project:,units: 5.00,user: other_user,diff --git a/modules/my_page/spec/features/my/my_spent_time_widget_with_a_negative_time_zone_spec.rb b/modules/my_page/spec/features/my/my_spent_time_widget_with_a_negative_time_zone_spec.rbindex 4c0aeb1264a..0636abe1eca 100644--- a/modules/my_page/spec/features/my/my_spent_time_widget_with_a_negative_time_zone_spec.rb+++ b/modules/my_page/spec/features/my/my_spent_time_widget_with_a_negative_time_zone_spec.rb@@ -52,7 +52,7 @@ RSpec.describe "My spent time widget with a negative time zone", :js,let!(:time_entry) docreate(:time_entry,spent_on: monday,- work_package:,+ entity: work_package,project:,activity:,user:)diff --git a/modules/reporting/spec/features/calculations_spec.rb b/modules/reporting/spec/features/calculations_spec.rbindex 54f8d7ef232..181c65e5f31 100644--- a/modules/reporting/spec/features/calculations_spec.rb+++ b/modules/reporting/spec/features/calculations_spec.rb@@ -16,7 +16,7 @@ RSpec.describe "Cost Report", "calculations", :js docreate(:time_entry,spent_on:,user:,- work_package:,+ entity: work_package,project:,hours: 10)enddiff --git a/modules/reporting/spec/features/custom_fields_spec.rb b/modules/reporting/spec/features/custom_fields_spec.rbindex 371240f3f96..b1f758a3f16 100644--- a/modules/reporting/spec/features/custom_fields_spec.rb+++ b/modules/reporting/spec/features/custom_fields_spec.rb@@ -44,7 +44,7 @@ RSpec.describe "Custom fields reporting", :js dolet!(:time_entry1) docreate(:time_entry,user:,- work_package:,+ entity: work_package,project:,hours: 10)end@@ -52,7 +52,7 @@ RSpec.describe "Custom fields reporting", :js dolet!(:time_entry2) docreate(:time_entry,user:,- work_package:,+ entity: work_package,project:,hours: 2.50)end@@ -167,7 +167,7 @@ RSpec.describe "Custom fields reporting", :js dolet!(:time_entry1) docreate(:time_entry,user:,- work_package: work_package2,+ entity: work_package2,project:,hours: 10)enddiff --git a/modules/reporting/spec/features/export_timesheet_spec.rb b/modules/reporting/spec/features/export_timesheet_spec.rbindex bc783d8a4a7..6eba30a009b 100644--- a/modules/reporting/spec/features/export_timesheet_spec.rb+++ b/modules/reporting/spec/features/export_timesheet_spec.rb@@ -34,7 +34,7 @@ RSpec.describe "Timesheet PDF export", :js doshared_let(:user) { create(:admin) }shared_let(:cost_type) { create(:cost_type, name: "Post-war", unit: "cap", unit_plural: "caps") }shared_let(:work_package) { create(:work_package, project:, subject: "Some task") }- shared_let(:cost_entry) { create(:cost_entry, user:, work_package:, project:, cost_type:) }+ shared_let(:cost_entry) { create(:cost_entry, user:, entity: work_package, project:, cost_type:) }let(:report_page) { Pages::CostReportPage.new project }current_user { user }diff --git a/modules/reporting/spec/features/group_by_spec.rb b/modules/reporting/spec/features/group_by_spec.rbindex a71f6bfb7a2..e9b79fa6c33 100644--- a/modules/reporting/spec/features/group_by_spec.rb+++ b/modules/reporting/spec/features/group_by_spec.rb@@ -11,7 +11,7 @@ RSpec.describe "Cost report calculations", "grouping", :js docreate(:time_entry,spent_on: 6.months.ago,user:,- work_package:,+ entity: work_package,project:,hours: 10)enddiff --git a/modules/reporting/spec/features/me_value_spec.rb b/modules/reporting/spec/features/me_value_spec.rbindex 91a6f774cef..6a8d2861920 100644--- a/modules/reporting/spec/features/me_value_spec.rb+++ b/modules/reporting/spec/features/me_value_spec.rb@@ -11,14 +11,14 @@ RSpec.describe "Cost report showing my own times", :js dolet!(:time_entry1) docreate(:time_entry,user:,- work_package:,+ entity: work_package,project:,hours: 10)endlet!(:time_entry2) docreate(:time_entry,user: user2,- work_package:,+ entity: work_package,project:,hours: 15)end@@ -71,14 +71,14 @@ RSpec.describe "Cost report showing my own times", :js dolet!(:time_entry1) docreate(:time_entry,user:,- work_package:,+ entity: work_package,project:,hours: 10)endlet!(:time_entry2) docreate(:time_entry,user: user2,- work_package: work_package2,+ entity: work_package2,project:,hours: 15)enddiff --git a/modules/reporting/spec/features/my_time_spec.rb b/modules/reporting/spec/features/my_time_spec.rbindex 093811d9c63..8a8928711fb 100644--- a/modules/reporting/spec/features/my_time_spec.rb+++ b/modules/reporting/spec/features/my_time_spec.rb@@ -11,7 +11,7 @@ RSpec.describe "Cost report showing my own times", :js dolet!(:time_entry1) docreate(:time_entry,user:,- work_package:,+ entity: work_package,project:,hours: 10)enddiff --git a/modules/reporting/spec/features/permissions_spec.rb b/modules/reporting/spec/features/permissions_spec.rbindex 73e4b11803c..b29b5be6f1b 100644--- a/modules/reporting/spec/features/permissions_spec.rb+++ b/modules/reporting/spec/features/permissions_spec.rb@@ -21,14 +21,14 @@ RSpec.describe "Cost report calculations", :js dolet!(:time_entry_user) docreate(:time_entry,user: admin,- work_package:,+ entity: work_package,project:,hours: 10)endlet!(:time_entry_admin) docreate(:time_entry,user:,- work_package:,+ entity: work_package,project:,hours: 5)end@@ -39,8 +39,8 @@ RSpec.describe "Cost report calculations", :js doendlet!(:cost_entry_user) docreate(:cost_entry,- work_package:,- project:,+ entity: work_package,+ project: project,units: 3.00,cost_type:,user:)diff --git a/modules/reporting/spec/features/time_entries_spec.rb b/modules/reporting/spec/features/time_entries_spec.rbindex 59cf2e54764..b322492420c 100644--- a/modules/reporting/spec/features/time_entries_spec.rb+++ b/modules/reporting/spec/features/time_entries_spec.rb@@ -9,14 +9,14 @@ RSpec.describe "Cost report showing time entries with start & end times", :js doshared_let(:user) { create(:admin) }shared_let(:work_package) { create(:work_package, project:) }shared_let(:time_entry) do- create :time_entry, user:, work_package:, project:,+ create :time_entry, user:, entity: work_package, project:,start_time: 1 * 60,spent_on: 1.day.ago,hours: 1.25,time_zone: "UTC"endshared_let(:time_entry_long) do- create :time_entry, user:, work_package:, project:,+ create :time_entry, user:, entity: work_package, project:,start_time: 1 * 60,hours: 28.0,time_zone: "UTC"diff --git a/modules/reporting/spec/features/update_entries_spec.rb b/modules/reporting/spec/features/update_entries_spec.rbindex eac0d367e7b..2d7e07722e6 100644--- a/modules/reporting/spec/features/update_entries_spec.rb+++ b/modules/reporting/spec/features/update_entries_spec.rb@@ -38,7 +38,7 @@ RSpec.describe "Updating entries within the cost report", :js dolet!(:time_entry_user) docreate(:time_entry,user:,- work_package:,+ entity: work_package,project:,hours: 5)end@@ -51,7 +51,7 @@ RSpec.describe "Updating entries within the cost report", :js dolet!(:cost_entry_user) docreate(:cost_entry,- work_package:,+ entity: work_package,project:,units: 3.00,cost_type:,diff --git a/modules/reporting/spec/features/work_package_costlog_spec.rb b/modules/reporting/spec/features/work_package_costlog_spec.rbindex 4c8a43983b2..c9d0eb3883e 100644--- a/modules/reporting/spec/features/work_package_costlog_spec.rb+++ b/modules/reporting/spec/features/work_package_costlog_spec.rb@@ -19,8 +19,8 @@ RSpec.describe "Cost report showing my own times", :js dobuild(:cost_entry,cost_type:,project:,- work_package:,- spent_on: Date.today,+ entity: work_package,+ spent_on: Date.current,units: "10",user:,comments: "foobar")diff --git a/spec/features/work_packages/index_sums_spec.rb b/spec/features/work_packages/index_sums_spec.rbindex bcca3d834fc..6eebabfd9ed 100644--- a/spec/features/work_packages/index_sums_spec.rb+++ b/spec/features/work_packages/index_sums_spec.rb@@ -92,7 +92,7 @@ RSpec.describe "Work package index sums", :js dolet!(:time_entry) docreate(:time_entry,user:,- work_package: work_package1,+ entity: work_package1,project:,hours: 1.50)end@@ -106,7 +106,7 @@ RSpec.describe "Work package index sums", :js doendlet!(:cost_entry) docreate(:cost_entry,- work_package: work_package1,+ entity: work_package1,project:,units: 2.50,cost_type:,@@ -256,14 +256,14 @@ RSpec.describe "Work package index sums", :js dolet!(:time_entry2) docreate(:time_entry,user:,- work_package: work_package3,+ entity: work_package3,project:,hours: 2.50)end# unit costslet!(:cost_entry2) docreate(:cost_entry,- work_package: work_package3,+ entity: work_package3,project:,units: 3.50,cost_type:,