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
Update delete contract to use same error messages
Mir Bhatia3178db63dde7
diff --git a/app/contracts/relations/delete_contract.rb b/app/contracts/relations/delete_contract.rbindex fd6f9d2052c..669d38fc277 100644--- a/app/contracts/relations/delete_contract.rb+++ b/app/contracts/relations/delete_contract.rb@@ -30,14 +30,14 @@module Relationsclass DeleteContract < ::DeleteContract- delete_permission -> { user.allowed_in_work_package?(:manage_work_package_relations, model.from) }+ delete_permission -> {+ user.allowed_in_work_package?(:manage_work_package_relations, model.from) &&+ user.allowed_in_work_package?(:manage_work_package_relations, model.to)+ }- validate :validate_to_deletable-- def validate_to_deletable- return unless user.allowed_in_work_package?(:manage_work_package_relations, model.from)-- unless user.allowed_in_work_package?(:manage_work_package_relations, model.to)+ # Override method to add more specific error+ def user_allowed+ unless authorized?errors.add :base, :error_not_deletableendenddiff --git a/spec/contracts/relations/delete_contract_spec.rb b/spec/contracts/relations/delete_contract_spec.rbindex dce64973fd6..22389e94992 100644--- a/spec/contracts/relations/delete_contract_spec.rb+++ b/spec/contracts/relations/delete_contract_spec.rb@@ -73,13 +73,13 @@ RSpec.describe Relations::DeleteContract do})end- it_behaves_like "contract is invalid", base: :error_unauthorized+ it_behaves_like "contract is invalid", base: :error_not_deletableendcontext "when user has no permissions for either work package" dolet(:current_user) { create(:user) }- it_behaves_like "contract is invalid", base: :error_unauthorized+ it_behaves_like "contract is invalid", base: :error_not_deletableendcontext "when user is an admin" dodiff --git a/spec/requests/api/v3/relations/relations_api_spec.rb b/spec/requests/api/v3/relations/relations_api_spec.rbindex 34c48258e4c..5017de0407e 100644--- a/spec/requests/api/v3/relations/relations_api_spec.rb+++ b/spec/requests/api/v3/relations/relations_api_spec.rb@@ -401,8 +401,8 @@ RSpec.describe "API v3 Relation resource", content_type: :json docontext "lacking the permission" dolet(:permissions) { %i[view_work_packages] }- it "returns 403" do- expect(last_response).to have_http_status :forbidden+ it "returns 422" do+ expect(last_response).to have_http_status :unprocessable_entityendit "leaves the relation" do