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

Be more lenient in the fields passed to the modal

Klaus Zanders68dfbee6291c
diff --git a/app/components/work_packages/progress/base_modal_component.rb b/app/components/work_packages/progress/base_modal_component.rb
index e63d03d379f..6ba3656a1e6 100644
--- a/app/components/work_packages/progress/base_modal_component.rb
+++ b/app/components/work_packages/progress/base_modal_component.rb
@@ -91,11 +91,7 @@ module WorkPackages
# an element by default.
return nil if field.nil?
- field = FIELD_MAP[field.to_s]
-
- return field if field.present?
-
- raise ArgumentError, "The selected field is not one of #{FIELD_MAP.keys.join(', ')}."
+ FIELD_MAP[field.to_s].presence || :no_field
end
end
end
diff --git a/spec/components/work_packages/progress/shared_modal_examples.rb b/spec/components/work_packages/progress/shared_modal_examples.rb
index 4df5a1ad075..398c3ebd155 100644
--- a/spec/components/work_packages/progress/shared_modal_examples.rb
+++ b/spec/components/work_packages/progress/shared_modal_examples.rb
@@ -30,23 +30,11 @@
RSpec.shared_examples_for "progress modal validations" do
describe "validations" do
- context "when focused_field is not an accepted value" do
- it "raises an ArgumentError" do
+ context "when focused_field is not an accepted value (Regression #62075)" do
+ it "returns :no_field" do
work_package = build(:work_package)
- expect do
- described_class.new(work_package, focused_field: :foo)
- end.to raise_error(ArgumentError, /The selected field is not one of/)
- end
- end
-
- context "when given another progress related not accepted by the component" do
- it "raises an ArgumentError" do
- work_package = build(:work_package)
-
- expect do
- described_class.new(work_package, focused_field: "jerry")
- end.to raise_error(ArgumentError, /The selected field is not one of/)
+ expect(described_class.new(work_package, focused_field: "global-search--input").focused_field).to eq(:no_field)
end
end
end