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

Skip StreamComponent template rendering if blank

Alexander Brandon Coles47b4d3a95b66
diff --git a/app/components/op_turbo/stream_component.html.erb b/app/components/op_turbo/stream_component.html.erb
index 8a0a9e20775..df66e76c4a2 100644
--- a/app/components/op_turbo/stream_component.html.erb
+++ b/app/components/op_turbo/stream_component.html.erb
@@ -27,7 +27,7 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
<%= content_tag("turbo-stream", action: @action, target: @target, **@turbo_stream_args) do %>
- <% if @template %>
+ <% if @template.present? %>
<template>
<%= @template %>
</template>
diff --git a/spec/components/op_turbo/stream_component_spec.rb b/spec/components/op_turbo/stream_component_spec.rb
new file mode 100644
index 00000000000..1860a7628ec
--- /dev/null
+++ b/spec/components/op_turbo/stream_component_spec.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "rails_helper"
+
+RSpec.describe OpTurbo::StreamComponent, type: :component do
+ def render_component(...)
+ render_inline(described_class.new(...))
+ end
+
+ subject(:rendered_component) { render_component(action: "my-action", target: nil, template:) }
+
+ let(:rendered_template) { Nokogiri(rendered_component.to_s).css("turbo-stream template").first&.inner_html&.strip }
+
+ context "with a template" do
+ let(:template) { "Template Content" }
+
+ it "renders a turbo-stream element" do
+ expect(rendered_component).to have_element "turbo-stream", action: "my-action"
+ end
+
+ it "renders a template" do
+ expect(rendered_template).to eq "Template Content"
+ end
+ end
+
+ context "with a blank template" do
+ let(:template) { " " }
+
+ it "renders a turbo-stream element" do
+ expect(rendered_component).to have_element "turbo-stream", action: "my-action"
+ end
+
+ it "does not render a template" do
+ expect(rendered_template).to be_nil
+ end
+ end
+
+ context "with a nil template" do
+ let(:template) { nil }
+
+ it "renders a turbo-stream element" do
+ expect(rendered_component).to have_element "turbo-stream", action: "my-action"
+ end
+
+ it "does not render a template" do
+ expect(rendered_template).to be_nil
+ end
+ end
+end