Refactor changes and test for passed-in HTML

app/helpers/markup_helper.rb

@@ -55,10 +55,11 @@ module MarkupHelper
       # either pure text or emojis, wrapping anything found in the
       # requested link
       fragment.children.each do |node|
-        next unless node.text? || node.name == 'gl-emoji'
-
-        node.replace(link_to(node.text, url, html_options)) if node.text?
-        node.replace(link_to(node.to_html.html_safe, url, html_options)) if node.name == 'gl-emoji'
+        if node.text?
+          node.replace(link_to(node.text, url, html_options))
+        elsif node.name == 'gl-emoji'
+          node.replace(link_to(node.to_html.html_safe, url, html_options))
+        end
       end
     end
 

spec/helpers/markup_helper_spec.rb

@@ -232,6 +232,12 @@ describe MarkupHelper do
       expect(doc.css('a')[0].attr('href')).to eq link
       expect(doc.css('a')[0].text).to eq 'This should finally fix '
     end
+
+    it "escapes HTML passed as an emoji" do
+      rendered = '<gl-emoji>&lt;div class="test"&gt;test&lt;/div&gt;</gl-emoji>'
+      expect(helper.link_to_html(rendered, '/foo'))
+        .to eq '<a href="/foo"><gl-emoji>&lt;div class="test"&gt;test&lt;/div&gt;</gl-emoji></a>'
+    end
   end
 
   describe '#render_wiki_content' do