mirror of
https://github.com/opf/openproject.git
synced 2026-06-14 03:30:14 +00:00
Remove remaining usages of work_package instead of entity in Feature Specs
This commit is contained in:
@@ -56,7 +56,7 @@ RSpec.describe "Deleting time entries", :js do
|
||||
let(:other_work_package) { create(:work_package, project:, budget:) }
|
||||
let(:cost_entry) do
|
||||
create(:cost_entry,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
units: 2.00,
|
||||
cost_type:,
|
||||
|
||||
@@ -39,7 +39,7 @@ RSpec.describe "Work Package table time entries", :js do
|
||||
let!(:time_entry1) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package: parent,
|
||||
entity: parent,
|
||||
project:,
|
||||
hours: 10)
|
||||
end
|
||||
@@ -47,7 +47,7 @@ RSpec.describe "Work Package table time entries", :js do
|
||||
let!(:time_entry2) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 2.50)
|
||||
end
|
||||
|
||||
@@ -135,7 +135,7 @@ RSpec.describe "Work Package timer", :js, :selenium do
|
||||
context "when an old timer exists" do
|
||||
let!(:active_timer) do
|
||||
Timecop.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)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ RSpec.describe "Only see your own rates", :js do
|
||||
end
|
||||
let(:time_entry) do
|
||||
create(: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 do
|
||||
type
|
||||
end
|
||||
let(: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 do
|
||||
create(:time_entry, user: other_user,
|
||||
hours: 3.00,
|
||||
project:,
|
||||
work_package:)
|
||||
entity: work_package)
|
||||
end
|
||||
let(:other_cost_entry) do
|
||||
create(:cost_entry, work_package:,
|
||||
create(:cost_entry, entity: work_package,
|
||||
project:,
|
||||
units: 5.00,
|
||||
user: other_user,
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ RSpec.describe "My spent time widget with a negative time zone", :js,
|
||||
let!(:time_entry) do
|
||||
create(:time_entry,
|
||||
spent_on: monday,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
activity:,
|
||||
user:)
|
||||
|
||||
@@ -16,7 +16,7 @@ RSpec.describe "Cost Report", "calculations", :js do
|
||||
create(:time_entry,
|
||||
spent_on:,
|
||||
user:,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 10)
|
||||
end
|
||||
|
||||
@@ -44,7 +44,7 @@ RSpec.describe "Custom fields reporting", :js do
|
||||
let!(:time_entry1) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 10)
|
||||
end
|
||||
@@ -52,7 +52,7 @@ RSpec.describe "Custom fields reporting", :js do
|
||||
let!(:time_entry2) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 2.50)
|
||||
end
|
||||
@@ -167,7 +167,7 @@ RSpec.describe "Custom fields reporting", :js do
|
||||
let!(:time_entry1) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package: work_package2,
|
||||
entity: work_package2,
|
||||
project:,
|
||||
hours: 10)
|
||||
end
|
||||
|
||||
@@ -34,7 +34,7 @@ RSpec.describe "Timesheet PDF export", :js do
|
||||
shared_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 }
|
||||
|
||||
@@ -11,7 +11,7 @@ RSpec.describe "Cost report calculations", "grouping", :js do
|
||||
create(:time_entry,
|
||||
spent_on: 6.months.ago,
|
||||
user:,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 10)
|
||||
end
|
||||
|
||||
@@ -11,14 +11,14 @@ RSpec.describe "Cost report showing my own times", :js do
|
||||
let!(:time_entry1) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 10)
|
||||
end
|
||||
let!(:time_entry2) do
|
||||
create(: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 do
|
||||
let!(:time_entry1) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 10)
|
||||
end
|
||||
let!(:time_entry2) do
|
||||
create(:time_entry,
|
||||
user: user2,
|
||||
work_package: work_package2,
|
||||
entity: work_package2,
|
||||
project:,
|
||||
hours: 15)
|
||||
end
|
||||
|
||||
@@ -11,7 +11,7 @@ RSpec.describe "Cost report showing my own times", :js do
|
||||
let!(:time_entry1) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 10)
|
||||
end
|
||||
|
||||
@@ -21,14 +21,14 @@ RSpec.describe "Cost report calculations", :js do
|
||||
let!(:time_entry_user) do
|
||||
create(:time_entry,
|
||||
user: admin,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 10)
|
||||
end
|
||||
let!(:time_entry_admin) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
hours: 5)
|
||||
end
|
||||
@@ -39,8 +39,8 @@ RSpec.describe "Cost report calculations", :js do
|
||||
end
|
||||
let!(:cost_entry_user) do
|
||||
create(:cost_entry,
|
||||
work_package:,
|
||||
project:,
|
||||
entity: work_package,
|
||||
project: project,
|
||||
units: 3.00,
|
||||
cost_type:,
|
||||
user:)
|
||||
|
||||
@@ -9,14 +9,14 @@ RSpec.describe "Cost report showing time entries with start & end times", :js do
|
||||
shared_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"
|
||||
end
|
||||
shared_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"
|
||||
|
||||
@@ -38,7 +38,7 @@ RSpec.describe "Updating entries within the cost report", :js do
|
||||
let!(:time_entry_user) do
|
||||
create(: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 do
|
||||
|
||||
let!(:cost_entry_user) do
|
||||
create(:cost_entry,
|
||||
work_package:,
|
||||
entity: work_package,
|
||||
project:,
|
||||
units: 3.00,
|
||||
cost_type:,
|
||||
|
||||
@@ -19,8 +19,8 @@ RSpec.describe "Cost report showing my own times", :js do
|
||||
build(:cost_entry,
|
||||
cost_type:,
|
||||
project:,
|
||||
work_package:,
|
||||
spent_on: Date.today,
|
||||
entity: work_package,
|
||||
spent_on: Date.current,
|
||||
units: "10",
|
||||
user:,
|
||||
comments: "foobar")
|
||||
|
||||
@@ -92,7 +92,7 @@ RSpec.describe "Work package index sums", :js do
|
||||
let!(:time_entry) do
|
||||
create(: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 do
|
||||
end
|
||||
let!(:cost_entry) do
|
||||
create(: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 do
|
||||
let!(:time_entry2) do
|
||||
create(:time_entry,
|
||||
user:,
|
||||
work_package: work_package3,
|
||||
entity: work_package3,
|
||||
project:,
|
||||
hours: 2.50)
|
||||
end
|
||||
# unit costs
|
||||
let!(:cost_entry2) do
|
||||
create(:cost_entry,
|
||||
work_package: work_package3,
|
||||
entity: work_package3,
|
||||
project:,
|
||||
units: 3.50,
|
||||
cost_type:,
|
||||
|
||||
Reference in New Issue
Block a user