Merge branch 'main' into v4

Author: joelhawksley

lib/view_component/base.rb

@@ -267,7 +267,7 @@ def method_missing(method_name, *args) # rubocop:disable Style/MissingRespondToM
         raise e, <<~MESSAGE.chomp if view_context && e.is_a?(NameError) && helpers.respond_to?(method_name)
           #{e.message}
 
-          You may be trying to call a method provided as a view helper. Did you mean `helpers.#{method_name}'?
+          You may be trying to call a method provided as a view helper. Did you mean `helpers.#{method_name}`?
         MESSAGE
 
         raise

test/sandbox/config/application.rb

@@ -42,6 +42,7 @@ class Application < Rails::Application
     # Prepare test_set_no_duplicate_autoload_paths
     config.autoload_paths.push("#{config.root}/my/components/previews")
     config.view_component.preview_paths << "#{config.root}/my/components/previews"
+    config.view_component.preview_paths << "#{Rails.root}/lib/component_previews"
   end
 end
 

test/sandbox/config/environments/test.rb

@@ -30,7 +30,6 @@
 
   config.view_component.show_previews = true
   config.view_component.instrumentation_enabled = true
-  config.view_component.preview_paths << "#{Rails.root}/lib/component_previews"
   config.view_component.test_controller = "IntegrationExamplesController"
 
   # Tell Action Mailer not to deliver emails to the real world.

test/sandbox/test/base_test.rb

@@ -121,7 +121,7 @@ def test_no_method_error_does_not_reference_helper_if_view_context_not_present
     exception_message_regex = Regexp.new <<~MESSAGE.chomp, Regexp::MULTILINE
       undefined method `current_user' for .*
 
-      You may be trying to call a method provided as a view helper. Did you mean `helpers.current_user'?
+      You may be trying to call a method provided as a view helper. Did you mean `helpers.current_user`?
     MESSAGE
     assert !exception_message_regex.match?(exception.message)
   end
@@ -134,15 +134,15 @@ def current_user
       end
     }
     exception = assert_raises(NameError) { ReferencesMethodOnHelpersComponent.new.render_in(view_context) }
-    exception_advice = "You may be trying to call a method provided as a view helper. Did you mean `helpers.current_user'?"
+    exception_advice = "You may be trying to call a method provided as a view helper. Did you mean `helpers.current_user`?"
     assert exception.message.include?(exception_advice)
   end
 
   def test_no_method_error_does_not_reference_missing_helper
     view_context = ActionController::Base.new.view_context
     exception = assert_raises(NameError) { ReferencesMethodOnHelpersComponent.new.render_in(view_context) }
     exception_message_regex = Regexp.new <<~MESSAGE.chomp
-      You may be trying to call a method provided as a view helper\\. Did you mean `helpers.current_user'\\?$
+      You may be trying to call a method provided as a view helper\\. Did you mean `helpers.current_user`\\?$
     MESSAGE
     assert !exception_message_regex.match?(exception.message)
   end

test/sandbox/test/components/render_preview_test.rb

@@ -24,4 +24,10 @@ def test_render_preview_unsuffixed
 
     assert_selector("div", text: "subclass")
   end
+
+  def test_render_preview_custom_path
+    render_preview(:default, from: MyComponentLibPreview)
+
+    assert_selector("div", text: "hello,world!")
+  end
 end

test/sandbox/test/integration_test.rb

@@ -723,4 +723,10 @@ def test_slotable_default_override
 
     assert_includes response.body, "foo"
   end
+
+  def test_renders_preview_from_custom_preview_path
+    get "/rails/view_components/my_component_lib/default"
+
+    assert_select "div", "hello,world!"
+  end
 end