Skip to content

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

fix specs for time entry resource

Klaus Zandersae8ee32eb0dc
diff --git a/modules/costs/spec/requests/api/time_entry_resource_spec.rb b/modules/costs/spec/requests/api/time_entry_resource_spec.rb
index f8adf998ee8..86f4cc91bef 100644
--- a/modules/costs/spec/requests/api/time_entry_resource_spec.rb
+++ b/modules/costs/spec/requests/api/time_entry_resource_spec.rb
@@ -39,16 +39,16 @@ RSpec.describe "API v3 time_entry resource" do
create(:user, member_with_roles: { project => role })
end
let(:time_entry) do
- create(:time_entry, project:, work_package:, user: current_user)
+ create(:time_entry, project:, entity: work_package, user: current_user)
end
let(:other_time_entry) do
- create(:time_entry, project:, work_package:, user: other_user)
+ create(:time_entry, project:, entity: work_package, user: other_user)
end
let(:other_user) do
create(:user, member_with_roles: { project => role })
end
let(:invisible_time_entry) do
- create(:time_entry, project: other_project, work_package: other_work_package, user: other_user)
+ create(:time_entry, project: other_project, entity: other_work_package, user: other_user)
end
let(:project) { work_package.project }
let(:work_package) { create(:work_package) }
@@ -141,7 +141,7 @@ RSpec.describe "API v3 time_entry resource" do
context "when filtering by user" do
let(:invisible_time_entry) do
- create(:time_entry, project: other_project, work_package: other_work_package, user: other_user)
+ create(:time_entry, project: other_project, entity: other_work_package, user: other_user)
end
let(:path) do
filter = [{ "user" => {
@@ -177,14 +177,14 @@ RSpec.describe "API v3 time_entry resource" do
end
let(:other_time_entry) do
- create(:time_entry, project:, work_package: unwanted_work_package, user: current_user)
+ create(:time_entry, project:, entity: unwanted_work_package, user: current_user)
end
let(:path) do
- filter = [{ "work_package" => {
- "operator" => "=",
- "values" => [work_package.id]
- } }]
+ filter = [
+ { "entity_type" => { "operator" => "=", "values" => ["WorkPackage"] } },
+ { "entity_id" => { "operator" => "=", "values" => [work_package.id] } }
+ ]
"#{api_v3_paths.time_entries}?#{{ filters: filter.to_json }.to_query}"
end
@@ -210,13 +210,12 @@ RSpec.describe "API v3 time_entry resource" do
context "when filtering by project" do
let(:other_time_entry) do
- create(:time_entry, project: other_project, work_package: other_work_package, user: current_user)
+ create(:time_entry, project: other_project, entity: other_work_package, user: current_user)
end
let(:path) do
- filter = [{ "project" => {
- "operator" => "=",
- "values" => [other_project.id]
- } }]
+ filter = [
+ { "project" => { "operator" => "=", "values" => [other_project.id] } }
+ ]
"#{api_v3_paths.time_entries}?#{{ filters: filter.to_json }.to_query}"
end
@@ -264,25 +263,13 @@ RSpec.describe "API v3 time_entry resource" do
create(:time_entry_activity)
end
let!(:time_entry) do
- create(:time_entry,
- project:,
- work_package:,
- user: current_user,
- activity:)
+ create(:time_entry, project:, entity: work_package, user: current_user, activity:)
end
let!(:other_time_entry) do
- create(:time_entry,
- project: other_project,
- work_package: other_work_package,
- user: current_user,
- activity:)
+ create(:time_entry, project: other_project, entity: other_work_package, user: current_user, activity:)
end
let!(:another_time_entry) do
- create(:time_entry,
- project:,
- work_package:,
- user: current_user,
- activity: another_activity)
+ create(:time_entry, project:, entity: work_package, user: current_user, activity: another_activity)
end
before do
@@ -333,7 +320,7 @@ RSpec.describe "API v3 time_entry resource" do
context "when start- & end-time tracking is enabled", with_settings: { allow_tracking_start_and_end_times: true } 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 "includes start and end timestamps in the API response" do
@@ -351,7 +338,7 @@ RSpec.describe "API v3 time_entry resource" do
context "when start and end time were not tracked" do
let!(:time_entry) do
- create(:time_entry, project:, work_package:, user: current_user)
+ create(:time_entry, project:, entity: work_package, user: current_user)
end
it "returns nil as start and end timestamps in the API response" do
@@ -384,7 +371,7 @@ RSpec.describe "API v3 time_entry resource" do
context "when start and end time were not tracked" do
let!(:time_entry) do
- create(:time_entry, project:, work_package:, user: current_user)
+ create(:time_entry, project:, entity: work_package, user: current_user)
end
it "does not include start and end time fields" do
@@ -448,7 +435,7 @@ RSpec.describe "API v3 time_entry resource" do
activity: {
href: api_v3_paths.time_entries_activity(activity.id)
},
- workPackage: {
+ entity: {
href: api_v3_paths.work_package(work_package.id)
}
},
@@ -491,7 +478,7 @@ RSpec.describe "API v3 time_entry resource" do
expect(new_entry.activity)
.to eql activity
- expect(new_entry.work_package)
+ expect(new_entry.entity)
.to eql work_package
expect(new_entry.hours)
@@ -543,7 +530,7 @@ RSpec.describe "API v3 time_entry resource" do
activity: {
href: api_v3_paths.time_entries_activity(activity.id)
},
- workPackage: {
+ entity: {
href: api_v3_paths.work_package(work_package.id + 1)
}
},
@@ -556,12 +543,12 @@ RSpec.describe "API v3 time_entry resource" do
}
end
- it "returns 422 and complains about work packages" do
+ it "returns 422 and complains about entity being required" do
expect(subject.status)
.to be(422)
expect(subject.body)
- .to be_json_eql("Work package is invalid.".to_json)
+ .to be_json_eql("Entity can't be blank.".to_json)
.at_path("message")
end
end
@@ -651,19 +638,19 @@ RSpec.describe "API v3 time_entry resource" do
let(:params) do
{
_links: {
- workPackage: {
+ entity: {
href: api_v3_paths.work_package(work_package.id + 1)
}
}
}
end
- it "returns 422 and complains about work packages" do
+ it "returns 422 and complains about entity being blank" do
expect(subject.status)
.to be(422)
expect(subject.body)
- .to be_json_eql("Work package is invalid.".to_json)
+ .to be_json_eql("Entity can't be blank.".to_json)
.at_path("message")
end
end