From 0c46bd11aa3dd5613ba49dfeed6971dc92587956 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Tue, 26 Mar 2019 17:33:26 +0100
Subject: [PATCH] Fix HTML validation (#10354)

* Fix HTML validation

* Report first HTML error instead on validation error
---
 app/validators/html_validator.rb | 10 +++++++---
 config/locales/en.yml            |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/validators/html_validator.rb b/app/validators/html_validator.rb
index 882c35d413..b7caee5a9e 100644
--- a/app/validators/html_validator.rb
+++ b/app/validators/html_validator.rb
@@ -3,12 +3,16 @@
 class HtmlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return if value.blank?
-    record.errors.add(attribute, I18n.t('html_validator.invalid_markup')) unless valid_html?(value)
+    errors = html_errors(value)
+    unless errors.empty?
+      record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s))
+    end
   end
 
   private
 
-  def valid_html?(str)
-    Nokogiri::HTML.fragment(str).to_s == str
+  def html_errors(str)
+    fragment = Nokogiri::HTML.fragment(str)
+    fragment.errors
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ad1332fd2b..42ba4e35e8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -638,7 +638,7 @@ en:
       one: Something isn't quite right yet! Please review the error below
       other: Something isn't quite right yet! Please review %{count} errors below
   html_validator:
-    invalid_markup: contains invalid HTML markup
+    invalid_markup: 'contains invalid HTML markup: %{error}'
   identity_proofs:
     active: Active
     authorize: Yes, authorize