Merge remote-tracking branch 'origin/main' into patch-1

pantographe · Oct 11, 2023 · 8681de7 · 8681de7
2 parents 2a875f5 + 53d7cb8
commit 8681de7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/components/view_component/form/field_component.rb b/app/components/view_component/form/field_component.rb
@@ -71,13 +71,13 @@ def label_text
       end
 
       def optional?(context: validation_context)
-        return nil if object.nil?
+        return false if object.nil?
 
         !required?(context: context)
       end
 
       def required?(context: validation_context)
-        return nil if object.nil?
+        return false if object.nil?
 
         validators(context: context).any?(ActiveModel::Validations::PresenceValidator)
       end

diff --git a/spec/view_component/form/grouped_collection_select_component_spec.rb b/spec/view_component/form/grouped_collection_select_component_spec.rb
@@ -39,6 +39,7 @@
   end
   let(:component_html_attributes) { component.css("select").last.attributes }
 
+  # rubocop:disable RSpec/ExampleLength
   context "with simple args" do
     it do
       expect(component).to eq_html <<~HTML
@@ -50,6 +51,7 @@
       HTML
     end
   end
+  # rubocop:enable RSpec/ExampleLength
 
   include_examples "component with custom html classes", :html_options
   include_examples "component with custom data attributes", :html_options