+
## Who uses ViewComponent?
diff --git a/lib/view_component/test_helpers.rb b/lib/view_component/test_helpers.rb
index 3a24b1aa31..02d1a9b7c4 100644
--- a/lib/view_component/test_helpers.rb
+++ b/lib/view_component/test_helpers.rb
@@ -163,10 +163,20 @@ def with_controller_class(klass)
# end
# ```
#
+ # To specify a request method, pass the method param:
+ #
+ # ```ruby
+ # with_request_url("/users/42", method: "POST") do
+ # render_inline(MyComponent.new)
+ # end
+ # ```
+ #
# @param path [String] The path to set for the current request.
# @param host [String] The host to set for the current request.
- def with_request_url(full_path, host: nil)
+ # @param method [String] The request method to set for the current request.
+ def with_request_url(full_path, host: nil, method: nil)
old_request_host = vc_test_request.host
+ old_request_method = vc_test_request.request_method
old_request_path_info = vc_test_request.path_info
old_request_path_parameters = vc_test_request.path_parameters
old_request_query_parameters = vc_test_request.query_parameters
@@ -177,6 +187,7 @@ def with_request_url(full_path, host: nil)
vc_test_request.instance_variable_set(:@fullpath, full_path)
vc_test_request.instance_variable_set(:@original_fullpath, full_path)
vc_test_request.host = host if host
+ vc_test_request.request_method = method if method
vc_test_request.path_info = path
vc_test_request.path_parameters = Rails.application.routes.recognize_path_with_request(vc_test_request, path, {})
vc_test_request.set_header("action_dispatch.request.query_parameters",
@@ -185,6 +196,7 @@ def with_request_url(full_path, host: nil)
yield
ensure
vc_test_request.host = old_request_host
+ vc_test_request.request_method = old_request_method
vc_test_request.path_info = old_request_path_info
vc_test_request.path_parameters = old_request_path_parameters
vc_test_request.set_header("action_dispatch.request.query_parameters", old_request_query_parameters)
diff --git a/test/sandbox/app/components/current_page_component.rb b/test/sandbox/app/components/current_page_component.rb
index 559862199d..afd1c327e7 100644
--- a/test/sandbox/app/components/current_page_component.rb
+++ b/test/sandbox/app/components/current_page_component.rb
@@ -2,10 +2,6 @@
class CurrentPageComponent < ViewComponent::Base
def text
- if current_page?("/slots")
- "Inside /slots"
- else
- "Outside /slots"
- end
+ "#{current_page?("/slots") ? "Inside" : "Outside"} /slots (#{request.method} #{request.path})"
end
end
diff --git a/test/sandbox/config/routes.rb b/test/sandbox/config/routes.rb
index e921c0003d..afbb357be9 100644
--- a/test/sandbox/config/routes.rb
+++ b/test/sandbox/config/routes.rb
@@ -29,6 +29,7 @@
get :cached_partial, to: "integration_examples#cached_partial"
get :inherited_sidecar, to: "integration_examples#inherited_sidecar"
get :inherited_from_uncompilable_component, to: "integration_examples#inherited_from_uncompilable_component"
+ post :create, to: "integration_examples#create"
constraints(lambda { |request| request.env["warden"].authenticate! }) do
get :constraints_with_env, to: "integration_examples#index"
diff --git a/test/sandbox/test/test_helper_test.rb b/test/sandbox/test/test_helper_test.rb
index 90339a10fc..c55dfc0ebf 100644
--- a/test/sandbox/test/test_helper_test.rb
+++ b/test/sandbox/test/test_helper_test.rb
@@ -8,7 +8,7 @@ def test_with_request_url_inside_slots_path
render_inline(CurrentPageComponent.new)
end
- assert_selector("div", text: "Inside /slots")
+ assert_selector("div", text: "Inside /slots (GET /slots)")
end
def test_with_request_url_outside_slots_path
@@ -16,7 +16,15 @@ def test_with_request_url_outside_slots_path
render_inline(CurrentPageComponent.new)
end
- assert_selector("div", text: "Outside /slots")
+ assert_selector("div", text: "Outside /slots (GET /)")
+ end
+
+ def test_with_request_url_specifying_method
+ with_request_url "/create", method: "POST" do
+ render_inline(CurrentPageComponent.new)
+ end
+
+ assert_selector("div", text: "Outside /slots (POST /create)")
end
def test_with_request_url_under_constraint
From 00cdde88e7b9d45e557edd70fd4839b32276a744 Mon Sep 17 00:00:00 2001
From: Reegan Viljoen <62689748+reeganviljoen@users.noreply.github.com>
Date: Tue, 7 Nov 2023 21:22:01 +0200
Subject: [PATCH 7/8] Don't add ActionDispatch::Static middleware continued
(#1892)
* Don't add ActionDispatch::Static middleware
In the case that rails do not serve static files is not
necessary to add ActionDispatch::Static middleware. Making
possible to deploy ViewComponenets previews on a production
environment where Nginx or Apache is managing the static files.
* Apply suggestions from code review
Co-authored-by: Joel Hawksley Source:
@@ -14,4 +14,4 @@
<% end %>
+
diff --git a/lib/view_component/engine.rb b/lib/view_component/engine.rb
index 7c3740bceb..47618fe261 100644
--- a/lib/view_component/engine.rb
+++ b/lib/view_component/engine.rb
@@ -110,11 +110,15 @@ class Engine < Rails::Engine # :nodoc:
end
initializer "static assets" do |app|
- if app.config.view_component.show_previews
+ if serve_static_preview_assets?(app.config)
app.middleware.use(::ActionDispatch::Static, "#{root}/app/assets/vendor")
end
end
+ def serve_static_preview_assets?(app_config)
+ app_config.view_component.show_previews && app_config.public_file_server.enabled
+ end
+
initializer "compiler mode" do |_app|
ViewComponent::Compiler.mode = if Rails.env.development? || Rails.env.test?
ViewComponent::Compiler::DEVELOPMENT_MODE
diff --git a/test/sandbox/test/preview_helper_test.rb b/test/sandbox/test/preview_helper_test.rb
index 108a8a71dd..5921a525d1 100644
--- a/test/sandbox/test/preview_helper_test.rb
+++ b/test/sandbox/test/preview_helper_test.rb
@@ -155,5 +155,37 @@ def test_raises_with_conflict_in_template_resolution
assert_equal("Found multiple templates for #{template_identifier}.", exception.message)
end
end
+
+ def test_prism_css_source_url_with_asset_pipeline
+ Rails.application.config.public_file_server.stub(:enabled, true) do
+ if Rails.version.to_f >= 6.1
+ assert_equal "/assets/prism.css", PreviewHelper.prism_css_source_url
+ else
+ assert_equal "/prism.css", PreviewHelper.prism_css_source_url
+ end
+ end
+ end
+
+ def test_prism_css_source_url_with_no_asset_pipeline
+ Rails.application.config.public_file_server.stub(:enabled, false) do
+ assert_equal "https://cdn.jsdelivr.net/npm/prismjs@1.28.0/themes/prism.min.css", PreviewHelper.prism_css_source_url
+ end
+ end
+
+ def test_prism_js_source_with_asset_pipeline
+ Rails.application.config.public_file_server.stub(:enabled, true) do
+ if Rails.version.to_f >= 6.1
+ assert_equal "/assets/prism.min.js", PreviewHelper.prism_js_source_url
+ else
+ assert_equal "/prism.min.js", PreviewHelper.prism_js_source_url
+ end
+ end
+ end
+
+ def test_prism_js_source_url_with_no_asset_pipeline
+ Rails.application.config.public_file_server.stub(:enabled, false) do
+ assert_equal "https://cdn.jsdelivr.net/npm/prismjs@1.28.0/prism.min.js", PreviewHelper.prism_js_source_url
+ end
+ end
end
end
diff --git a/test/view_component/engine_test.rb b/test/view_component/engine_test.rb
new file mode 100644
index 0000000000..5c5c037260
--- /dev/null
+++ b/test/view_component/engine_test.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class ViewComponent::EngineTest < ActionDispatch::IntegrationTest
+ def test_serve_static_previews?
+ app.config.public_file_server.enabled = false
+ refute ViewComponent::Engine.instance.serve_static_preview_assets?(app.config)
+ end
+end
From 0820ce829b0519bbc1573df6001a36750d322e2d Mon Sep 17 00:00:00 2001
From: halo