From 8379232bb36eb37aa3f5496d6575b3f1c5ae7c1f Mon Sep 17 00:00:00 2001
From: Mac Siri <krairit.siri@gmail.com>
Date: Wed, 16 Mar 2022 17:15:15 -0400
Subject: [PATCH] Fix missing dc:creator on RSS feed (#16898)

* Fix missing dc:creator on RSS feed

* Update spec

* Remove aggregate_failures
---
 app/views/articles/feed.rss.builder     |  2 +-
 spec/requests/articles/articles_spec.rb | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/views/articles/feed.rss.builder b/app/views/articles/feed.rss.builder
index f545287a9..46e3bec47 100644
--- a/app/views/articles/feed.rss.builder
+++ b/app/views/articles/feed.rss.builder
@@ -40,7 +40,7 @@ xml.rss(:version => "2.0",
     articles.each do |article|
       xml.item do
         xml.title article.title
-        xml.tag!("dc:creator") { user.instance_of?(User) ? user.name : article.user.name }
+        xml.tag!("dc:creator", user.instance_of?(User) ? user.name : article.user.name)
         xml.pubDate article.published_at.to_s(:rfc822) if article.published_at
         xml.link app_url(article.path)
         xml.guid app_url(article.path)
diff --git a/spec/requests/articles/articles_spec.rb b/spec/requests/articles/articles_spec.rb
index 49b3ab3fc..467fdb454 100644
--- a/spec/requests/articles/articles_spec.rb
+++ b/spec/requests/articles/articles_spec.rb
@@ -95,16 +95,15 @@ RSpec.describe "Articles", type: :request do
         expect(response.body).not_to include(organization_article.title)
       end
 
-      it "contains the full user URL" do
-        expect(response.body).to include("<link>#{URL.user(user)}</link>")
-      end
-
-      it "contains a user composite profile image tag", :aggregate_failures do
-        expect(response.body).to include("<image>")
-        expect(response.body).to include("<url>#{app_url(user.profile_image_90)}</url>")
-        expect(response.body).to include("<title>#{community_name}: #{user.name}</title>")
-        expect(response.body).to include("<link>#{URL.user(user)}</link>")
-        expect(response.body).to include("</image>")
+      it "contains user's name, link, and composite profile image tag" do
+        expect(response.body).to include(
+          "<image>",
+          "<url>#{app_url(user.profile_image_90)}</url>",
+          "<title>#{community_name}: #{user.name}</title>",
+          "<link>#{URL.user(user)}</link>",
+          "</image>",
+          "<dc:creator>#{user.name}</dc:creator>",
+        )
       end
     end