From 12f05181c7970dc3b8b8c6c52b5130cb2261584c Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <70247653+Grubba27@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:34:23 -0300
Subject: [PATCH] FIX: Add helpers for title and content for
`application.html.erb` and `crawler.html.erb` (#32290)
Previously, there was only those helpers in `crawler.html.erb` as we
added it in https://github.com/discourse/discourse/pull/32259
However, to keep it consistent, we need to add it in
`application.html.erb` as well.
---
app/helpers/application_helper.rb | 4 ++--
app/views/layouts/application.html.erb | 4 ++--
app/views/layouts/crawler.html.erb | 4 ++--
spec/helpers/application_helper_spec.rb | 16 ++++++++--------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 13f82d96eab..72a22ec0806 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -270,7 +270,7 @@ module ApplicationHelper
(request ? I18n.locale.to_s : SiteSetting.default_locale).sub("_", "-")
end
- def crawlable_title_content
+ def title_content
DiscoursePluginRegistry.apply_modifier(
:meta_data_content,
content_for(:title) || SiteSetting.title,
@@ -279,7 +279,7 @@ module ApplicationHelper
)
end
- def crawlable_description_content
+ def description_content
DiscoursePluginRegistry.apply_modifier(
:meta_data_content,
@description_meta || SiteSetting.site_description,
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0412f3e85b0..9b4524d7928 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,8 +2,8 @@
- <%= content_for?(:title) ? yield(:title) : SiteSetting.title %>
-
+ <%= title_content %>
+
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index dad9d4f7fd6..954a67d9332 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -2,8 +2,8 @@
- <%= crawlable_title_content %>
-
+ <%= title_content %>
+
<%= render partial: "layouts/head" %>
<%= render partial: "common/discourse_stylesheet" %>
<%= theme_lookup("head_tag") %>
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 2fe556380ea..8058f3ea977 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -745,10 +745,10 @@ RSpec.describe ApplicationHelper do
end
end
- describe "#crawlable_title_content" do
+ describe "#title_content" do
it "returns the correct title" do
SiteSetting.title = "Test Title"
- result = helper.crawlable_title_content
+ result = helper.title_content
expect(result).to include("Test Title")
end
@@ -757,16 +757,16 @@ RSpec.describe ApplicationHelper do
helper.stubs(:content_for?).with(:title).returns(true)
helper.stubs(:content_for).with(:title).returns("Custom Title")
- result = helper.crawlable_title_content
+ result = helper.title_content
expect(result).to include("Custom Title")
end
end
- describe "#crawlable_description_content" do
+ describe "#description_content" do
it "returns the correct description" do
SiteSetting.site_description = "Test Description"
- result = helper.crawlable_description_content
+ result = helper.description_content
expect(result).to include("Test Description")
end
@@ -774,7 +774,7 @@ RSpec.describe ApplicationHelper do
it "accepts a content argument" do
@description_meta = "Custom Description"
- result = helper.crawlable_description_content
+ result = helper.description_content
expect(result).to include("Custom Description")
end
@@ -810,7 +810,7 @@ RSpec.describe ApplicationHelper do
it "modifies the title tag" do
plugin.register_modifier(:meta_data_content, &block)
- title = helper.crawlable_title_content
+ title = helper.title_content
expect(title).to include("BIG TITLE")
end
@@ -818,7 +818,7 @@ RSpec.describe ApplicationHelper do
it "modifies the description tag" do
plugin.register_modifier(:meta_data_content, &block)
- description = helper.crawlable_description_content
+ description = helper.description_content
expect(description).to include(" - modified by plugin")
end