Enable and fix ErbSafety check

unboxed · Apr 26, 2024 · 4c30109 · 4c30109
1 parent 4afd6d8
commit 4c30109
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/.erb-lint.yml b/.erb-lint.yml
@@ -5,7 +5,7 @@ linters:
       - "text/javascript"
       - "module"
   ErbSafety:
-    enabled: false
+    enabled: true
 
   # Enabling this caused a lot of test failures
   NoJavascriptTagHelper:

diff --git a/app/components/accordion_sections/feedback_component.html.erb b/app/components/accordion_sections/feedback_component.html.erb
@@ -3,6 +3,6 @@
       locals: {message: warning_message}
     ) %>
 <p class="govuk-body">
-  <%= t(".reason_given", feedback: feedback).html_safe %>
+  <%= t(".reason_given_html", feedback: feedback) %>
 </p>
 <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">
diff --git a/app/components/accordion_sections/pre_assessment_outcome_component.html.erb b/app/components/accordion_sections/pre_assessment_outcome_component.html.erb
@@ -29,7 +29,7 @@
   <% end %>
   <% if planning_application.result_override.present? %>
     <p class="govuk-body">
-      <%= t(".the_applicant_believes").html_safe %>
+      <%= t(".the_applicant_believes_html") %>
     </p>
     <div class="govuk-inset-text">
       <p class="govuk-body">

diff --git a/app/views/planning_applications/assessment/consultees/index.html.erb b/app/views/planning_applications/assessment/consultees/index.html.erb
@@ -24,7 +24,7 @@
         <div class="govuk-error-summary__body">
           <ul class="govuk-list govuk-error-summary__list">
             <% @consultation.errors.each do |error| %>
-              <li><%= error.message.html_safe %></li>
+              <li><%= error.message %></li>
             <% end %>
           </ul>
         </div>

diff --git a/app/views/planning_applications/assessment/policy_classes/_form_table.html.erb b/app/views/planning_applications/assessment/policy_classes/_form_table.html.erb
@@ -41,7 +41,7 @@
                             :status,
                             "&nbsp;".html_safe,
                             class: "govuk-label govuk-radios__label"
-                          ) %>
+                          ) %> <%# erblint:disable ErbSafety %>
                     </div>
                   </div>
                 </div>

diff --git a/app/views/planning_applications/confirm_validation.html.erb b/app/views/planning_applications/confirm_validation.html.erb
@@ -25,7 +25,7 @@
           <div class="govuk-error-summary__body">
             <ul class="govuk-list govuk-error-summary__list">
               <% @planning_application.errors.each do |error| %>
-                <li><%= error.message.html_safe %></li>
+                <li><%= error.message.html_safe %></li><%# erblint:disable ErbSafety %>
               <% end %>
             </ul>
           </div>

diff --git a/app/views/planning_applications/consultees/index.html.erb b/app/views/planning_applications/consultees/index.html.erb
@@ -30,7 +30,7 @@
         <div class="govuk-error-summary__body">
           <ul class="govuk-list govuk-error-summary__list">
             <% @consultation.errors.each do |error| %>
-              <li><%= error.message.html_safe %></li>
+              <li><%= error.message %></li>
             <% end %>
           </ul>
         </div>

diff --git a/app/views/planning_applications/consultees/new.html.erb b/app/views/planning_applications/consultees/new.html.erb
@@ -22,7 +22,7 @@
         <div class="govuk-error-summary__body">
           <ul class="govuk-list govuk-error-summary__list">
             <% @consultation.errors.each do |error| %>
-              <li><%= error.message.html_safe %></li>
+              <li><%= error.message %></li>
             <% end %>
           </ul>
         </div>

diff --git a/app/views/planning_applications/make_public.html.erb b/app/views/planning_applications/make_public.html.erb
@@ -23,7 +23,7 @@
           <div class="govuk-error-summary__body">
             <ul class="govuk-list govuk-error-summary__list">
               <% @planning_application.errors.each do |error| %>
-                <li><%= error.message.html_safe %></li>
+                <li><%= error.message %></li>
               <% end %>
             </ul>
           </div>

diff --git a/app/views/planning_applications/neighbour_letters/index.html.erb b/app/views/planning_applications/neighbour_letters/index.html.erb
@@ -58,7 +58,7 @@
           <div class="govuk-error-summary__body">
             <ul class="govuk-list govuk-error-summary__list">
               <% @consultation.errors.each do |error| %>
-                <li><%= error.message.html_safe %></li>
+                <li><%= error.message %></li>
               <% end %>
             </ul>
           </div>

diff --git a/app/views/planning_applications/neighbours/index.html.erb b/app/views/planning_applications/neighbours/index.html.erb
@@ -30,7 +30,7 @@
         <div class="govuk-error-summary__body">
           <ul class="govuk-list govuk-error-summary__list">
             <% @consultation.errors.each do |error| %>
-              <li><%= error.message.html_safe %></li>
+              <li><%= error.message %></li>
             <% end %>
           </ul>
         </div>

diff --git a/app/views/planning_applications/review/recommendations/new.html.erb b/app/views/planning_applications/review/recommendations/new.html.erb
@@ -52,7 +52,7 @@
           <div class="govuk-error-summary__body">
             <ul class="govuk-list govuk-error-summary__list">
               <% form.object.planning_application.errors.each do |error| %>
-                <li><%= error.message.html_safe %></li>
+                <li><%= error.message %></li>
               <% end %>
             </ul>
           </div>

diff --git a/app/views/planning_applications/site_notices/_status.html.erb b/app/views/planning_applications/site_notices/_status.html.erb
@@ -18,7 +18,7 @@
   <span id="application-reference"><%= @planning_application.reference %></span>
   <div id="site-notice-content">
     <div style="width: 430px; font-family: Arial;">
-      <%= raw @planning_application.last_site_notice.preview_content %>
+      <%= raw @planning_application.last_site_notice.preview_content %> <%# erblint:disable ErbSafety %>
     </div>
   </div>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -52,7 +52,7 @@ en:
     documents_component:
       manage_documents: Manage documents
     feedback_component:
-      reason_given: <strong>Reason given:</strong> "%{feedback}"
+      reason_given_html: <strong>Reason given:</strong> "%{feedback}"
     key_application_dates_component:
       application_received: 'Application received:'
       expiry_date: 'Expiry date:'
@@ -68,7 +68,7 @@ en:
     pre_assessment_outcome_component:
       details_identified_as: Details identified as relevant to the result
       no_result: No result
-      the_applicant_believes: 'The applicant believes this result is <strong>incorrect</strong> because:'
+      the_applicant_believes_html: 'The applicant believes this result is <strong>incorrect</strong> because:'
       the_applicant_or: The applicant or agent believes this result is inaccurate.
       the_application_was: The application was not assessed on submission
       this_application_has: This application has been updated. The result may no longer be accurate.