Run default linters on ERB templates

3 years ago · 42cb583332
29 changed files with 119 additions and 159 deletions
--- a/app/views/case_logs/_log_list.html.erb
+++ b/app/views/case_logs/_log_list.html.erb
@ -59,4 +59,3 @@
    </table>
  </section>
 </figure>
-
--- a/app/views/case_logs/bulk_upload.html.erb
+++ b/app/views/case_logs/bulk_upload.html.erb
@ -5,8 +5,7 @@

  <%= f.govuk_file_field :case_log_bulk_upload,
      label: { text: content_for(:title), size: "l" },
-      hint: { text: "Upload a spreadsheet using the template" }
-  %>
+      hint: { text: "Upload a spreadsheet using the template" } %>

  <%= f.govuk_submit "Upload" %>
 <% end %>
--- a/app/views/case_logs/index.html.erb
+++ b/app/views/case_logs/index.html.erb
@ -17,4 +17,3 @@
    </div>
  <% end %>
 </div>
-
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@ -7,8 +7,7 @@
    label: { text: "Email address" },
    autocomplete: "email",
    spellcheck: "false",
-    value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email)
-  %>
+    value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>

  <%= f.govuk_submit "Resend confirmation instructions" %>
 <% end %>
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@ -19,12 +19,10 @@
      <%= f.govuk_password_field :password,
        label: { text: "New password" },
        hint: @minimum_password_length ? { text: "Your password must be at least #{@minimum_password_length} characters and hard to guess." } : nil,
-        autocomplete: "new-password"
-      %>
+        autocomplete: "new-password" %>

      <%= f.govuk_password_field :password_confirmation,
-        label: { text: "Confirm new password" }
-      %>
+        label: { text: "Confirm new password" } %>

      <%= f.govuk_submit "Update" %>
    </div>
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@ -22,8 +22,7 @@
      <%= f.govuk_email_field :email,
        label: { text: "Email address" },
        autocomplete: "email",
-        spellcheck: "false"
-      %>
+        spellcheck: "false" %>

      <%= f.govuk_submit "Send email" %>
    </div>
--- a/app/views/devise/passwords/reset_password.html.erb
+++ b/app/views/devise/passwords/reset_password.html.erb
@ -20,12 +20,10 @@
      <%= f.govuk_password_field :password,
        label: { text: "New password" },
        hint: @minimum_password_length ? { text: "Your password must be at least #{@minimum_password_length} characters and hard to guess." } : nil,
-        autocomplete: "new-password"
-      %>
+        autocomplete: "new-password" %>

      <%= f.govuk_password_field :password_confirmation,
-        label: { text: "Confirm new password" }
-      %>
+        label: { text: "Confirm new password" } %>

      <%= f.govuk_submit "Update" %>
    </div>
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@ -19,12 +19,10 @@
      <%= f.govuk_email_field :email,
        label: { text: "Email address" },
        autocomplete: "email",
-        spellcheck: "false"
-      %>
+        spellcheck: "false" %>

      <%= f.govuk_password_field :password,
-        autocomplete: "current-password"
-      %>
+        autocomplete: "current-password" %>

      <%= f.hidden_field :start, value: request["start"] %>
      <%= f.govuk_submit "Sign in" %>
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
-  <p class="govuk-body">Already have an account? <%= govuk_link_to "Sign in", new_session_path(resource_name) %>.</p><br />
+  <p class="govuk-body">Already have an account? <%= govuk_link_to "Sign in", new_session_path(resource_name) %>.</p>
 <% end %>

 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= govuk_link_to "Sign up", new_registration_path(resource_name) %><br />
+  <%= govuk_link_to "Sign up", new_registration_path(resource_name) %><br>
 <% end %>

 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <p class="govuk-body"> You can <%= govuk_link_to "reset your password", new_password_path(resource_name) %> if you’ve forgotten it.<p><br />
+  <p class="govuk-body">You can <%= govuk_link_to "reset your password", new_password_path(resource_name) %> if you’ve forgotten it.</p>
 <% end %>

 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= govuk_link_to "Didn’t receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+  <%= govuk_link_to "Didn’t receive confirmation instructions?", new_confirmation_path(resource_name) %><br>
 <% end %>

 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= govuk_link_to "Didn’t receive unlock instructions?", new_unlock_path(resource_name) %><br />
+  <%= govuk_link_to "Didn’t receive unlock instructions?", new_unlock_path(resource_name) %><br>
 <% end %>

 <%- if devise_mapping.omniauthable? %>
  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= govuk_link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), method: :post %><br />
+    <%= govuk_link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), method: :post %><br>
  <% end %>
 <% end %>
--- a/app/views/devise/two_factor_authentication/show.html.erb
+++ b/app/views/devise/two_factor_authentication/show.html.erb
@ -16,8 +16,7 @@
        label: { text: "Security code", size: "m" },
        width: 5,
        autocomplete: 'one-time-code',
-        autofocus: true
-      %>
+        autofocus: true %>

      <%= f.govuk_submit "Submit" %>
    </div>
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@ -6,8 +6,7 @@
  <%= f.govuk_email_field :email,
    label: { text: "Email address" },
    autocomplete: "email",
-    spellcheck: "false"
-  %>
+    spellcheck: "false" %>

  <%= f.govuk_submit "Resend unlock instructions" %>
 <% end %>
--- a/app/views/form/_check_answers_table.html.erb
+++ b/app/views/form/_check_answers_table.html.erb
@ -3,9 +3,9 @@
    <%= question.check_answer_label.to_s.present? ? question.check_answer_label.to_s : question.header.to_s %>
  </dt>
  <dd class="govuk-summary-list__value">
-    <%= get_answer_label(question, @case_log) %><br/>
+    <%= get_answer_label(question, @case_log) %><br>
    <% question.get_inferred_answers(@case_log).each do |inferred_answer| %>
-     <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span><br/>
+      <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span><br>
    <% end %>
  </dd>
  <dd class="govuk-summary-list__actions">
--- a/app/views/form/_checkbox_question.html.erb
+++ b/app/views/form/_checkbox_question.html.erb
@ -16,8 +16,7 @@
          hint: { text: options['hint'] },
          checked: @case_log[key] == 1,
          exclusive: after_divider,
-          **stimulus_html_attributes(question)
-        %>
+          **stimulus_html_attributes(question) %>
      <% end %>
    <% end %>
 <% end %>
--- a/app/views/form/_date_question.html.erb
+++ b/app/views/form/_date_question.html.erb
@ -5,5 +5,4 @@
  legend: legend(question, page_header, conditional),
  hint: { text: question.hint_text&.html_safe },
  width: 20,
-    **stimulus_html_attributes(question)
-%>
+  **stimulus_html_attributes(question) %>
--- a/app/views/form/_interruption_screen_question.html.erb
+++ b/app/views/form/_interruption_screen_question.html.erb
@ -14,8 +14,7 @@
          key,
          label: { text: options['value'] },
          hint: { text: options['hint'] },
-          **stimulus_html_attributes(question)
-        %>
+          **stimulus_html_attributes(question) %>
      <% end %>
    <% end %>
  <% end %>
--- a/app/views/form/_numeric_question.html.erb
+++ b/app/views/form/_numeric_question.html.erb
@ -8,5 +8,4 @@
  width: question.width, :readonly => question.read_only?,
  prefix_text: question.prefix.to_s,
  suffix_text: question.suffix.is_a?(String) ? question.suffix : nil,
-   **stimulus_html_attributes(question)
-%>
+  **stimulus_html_attributes(question) %>
--- a/app/views/form/_radio_question.html.erb
+++ b/app/views/form/_radio_question.html.erb
@ -15,8 +15,7 @@
          key,
          label: { text: options['value'] },
          hint: { text: options['hint'] },
-            **stimulus_html_attributes(question)
-          %>
+          **stimulus_html_attributes(question) %>
      <% else %>
        <%= f.govuk_radio_button question.id,
          key,
--- a/app/views/form/_select_question.html.erb
+++ b/app/views/form/_select_question.html.erb
@ -10,5 +10,4 @@
    label: legend(question, page_header, conditional),
    hint: { text: question.hint_text&.html_safe },
    options: { disabled: [""], selected: selected },
-    "data-controller": "accessible-autocomplete"
- %>
+    "data-controller": "accessible-autocomplete" %>
--- a/app/views/form/_text_question.html.erb
+++ b/app/views/form/_text_question.html.erb
@ -5,5 +5,4 @@
  label: legend(question, page_header, conditional),
  hint: { text: question.hint_text&.html_safe },
  width: question.width ? question.width : nil,
-    **stimulus_html_attributes(question)
-%>
+  **stimulus_html_attributes(question) %>
--- a/app/views/form/_textarea_question.html.erb
+++ b/app/views/form/_textarea_question.html.erb
@ -5,5 +5,4 @@
  label: legend(question, page_header, conditional),
  hint: { text: question.hint_text&.html_safe },
  width: question.width ? question.width : nil,
-    **stimulus_html_attributes(question)
-%>
+  **stimulus_html_attributes(question) %>
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@ -11,7 +11,7 @@

 <%= form_with model: @case_log, url: form_case_log_path(@case_log), method: "post", local: true do |f| %>
  <div class="govuk-grid-row">
-    <div class=<%= @page.questions[0].type == "interruption_screen" ? "govuk-grid-column-full-from-desktop" : "govuk-grid-column-two-thirds-from-desktop"%>>
+    <div class="govuk-grid-column-<%= @page.questions[0].type == "interruption_screen" ? "full-from-desktop" : "two-thirds-from-desktop" %>">
      <% remove_other_page_errors(@case_log, @page) %>
      <%= f.govuk_error_summary %>

@ -29,7 +29,7 @@
      <% end %>

      <% @page.non_conditional_questions.map do |question| %>
-        <div id=<%= question.id + "_div " %><%= display_question_key_div(@page, question) %> >
+        <div id="<%= question.id %>_div" <%= display_question_key_div(@page, question) %>>
          <% if question.read_only? %>
            <hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m">
          <% end %>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -15,10 +15,10 @@
    <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-180x180.png'), rel: 'apple-touch-icon', type: 'image/png', size: '180x180' %>
    <%= stylesheet_link_tag "application" %>
    <%= javascript_include_tag "vendor/html5shiv.min.js" %>
-    <%= javascript_tag do -%>
+    <script>
      window.html5.elements = 'output';
      html5.shivDocument(document);
-    <% end -%>
+    </script>
    <%= javascript_include_tag "vendor/polyfill-output-value.js" %>
    <%= javascript_include_tag "vendor/outerHTML.js" %>
    <%= javascript_include_tag "application", defer: true %>
@ -55,8 +55,7 @@
        component.navigation_item(text: 'Your account', href: account_path)
        component.navigation_item(text: 'Sign out', href: destroy_user_session_path)
      end
-      end
-    %>
+    end %>

    <div class="govuk-width-container">
      <aside>
@ -75,8 +74,7 @@
            success: true, title_heading_level: 3,
            title_id: "swanky-notifications") do |notification_banner|
              notification_banner.heading(text: flash.notice)
-            end
-          %>
+          end %>
        <% end %>
        <%= content_for?(:content) ? yield(:content) : yield %>
      </main>
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    <style>
      /* Email styles need to be inline */
    </style>
--- a/app/views/organisations/edit.html.erb
+++ b/app/views/organisations/edit.html.erb
@ -15,29 +15,24 @@
      </h1>

      <%= f.govuk_text_field :name,
-        autocomplete: "name"
-      %>
+        autocomplete: "name" %>

      <%= f.govuk_text_field :address_line1,
        label: { text: "Address line 1" },
-        autocomplete: "address-line1"
-      %>
+        autocomplete: "address-line1" %>

      <%= f.govuk_text_field :address_line2,
        label: { text: "Address line 2" },
-        autocomplete: "address-line2"
-      %>
+        autocomplete: "address-line2" %>

      <%= f.govuk_text_field :postcode,
        autocomplete: "postal-code",
-        width: 10
-      %>
+        width: 10 %>

      <%= f.govuk_phone_field :phone,
        label: { text: "Telephone number" },
        autocomplete: "tel",
-        width: 20
-      %>
+        width: 20 %>

      <%= f.govuk_submit "Save changes" %>
    </div>
--- a/app/views/pagy/_nav.html.erb
+++ b/app/views/pagy/_nav.html.erb
@ -5,7 +5,7 @@
    <ul class="app-pagination__list">
      <li class="app-pagination__item app-pagination__item--prev">
        <% if pagy.prev %>
-          <a class="app-pagination__link" href=<%= "/logs?page=#{pagy.prev}" %>>
+          <a class="app-pagination__link" href="<%= "/logs?page=#{pagy.prev}" %>">
        <% end %>
          <span class="app-pagination__link-title">
            <svg class="app-pagination__icon" xmlns="http://www.w3.org/2000/svg" height="13" width="17">
@ -20,12 +20,12 @@
        <% elsif item.is_a?(String) %>
          <li class="app-pagination__item app-pagination__item--current"><span class="govuk-visually-hidden">Page </span><%= item %><span class="govuk-visually-hidden"> (current page) </span></li>
        <% else %>
-          <li class="app-pagination__item"><a class="app-pagination__link" href=<%= "/logs?page=#{item}" %>><span class="govuk-visually-hidden">Page </span><%= item %></a></li>
+          <li class="app-pagination__item"><a class="app-pagination__link" href="<%= "/logs?page=#{item}" %>"><span class="govuk-visually-hidden">Page </span><%= item %></a></li>
        <% end %>
      <% end %>
      <li class="app-pagination__item app-pagination__item--next">
        <% if pagy.next %>
-          <a class="app-pagination__link" href=<%= "/logs?page=#{pagy.next}" %>>
+          <a class="app-pagination__link" href="<%= "/logs?page=#{pagy.next}" %>">
        <% end %>
          Next <span class="govuk-visually-hidden">page</span>
          <span class="app-pagination__link-title">
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@ -17,36 +17,31 @@
      </h1>

      <%= f.govuk_text_field :name,
-        autocomplete: "name"
-      %>
+        autocomplete: "name" %>

      <%= f.govuk_email_field :email,
        label: { text: "Email address" },
        autocomplete: "email",
-        spellcheck: "false"
-      %>
+        spellcheck: "false" %>

      <% if current_user.data_coordinator? || current_user.support? %>
        <%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) }

-          f.govuk_collection_radio_buttons :role, roles, :id, :name, legend: { text: "Role", size: "m" }
-        %>
+          f.govuk_collection_radio_buttons :role, roles, :id, :name, legend: { text: "Role", size: "m" } %>

        <%= f.govuk_collection_radio_buttons :is_dpo,
          [OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")],
          :id,
          :name,
          inline: true,
-          legend: { text: "Are #{pronoun(@user, current_user)} a data protection officer?", size: "m" }
-        %>
+          legend: { text: "Are #{pronoun(@user, current_user)} a data protection officer?", size: "m" } %>

        <%= f.govuk_collection_radio_buttons :is_key_contact,
          [OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")],
          :id,
          :name,
          inline: true,
-          legend: { text: "Are #{pronoun(@user, current_user)} a key contact?", size: "m" }
-        %>
+          legend: { text: "Are #{pronoun(@user, current_user)} a key contact?", size: "m" } %>
      <% end %>

      <%= f.govuk_submit "Save changes" %>
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@ -17,35 +17,30 @@
      </h1>

      <%= f.govuk_text_field :name,
-        autocomplete: "name"
-      %>
+        autocomplete: "name" %>

      <%= f.govuk_email_field :email,
        label: { text: "Email address" },
        autocomplete: "email",
        spellcheck: "false",
-        value: @resource.email
-      %>
+        value: @resource.email %>

      <%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) }
-        f.govuk_collection_radio_buttons :role, roles, :id, :name, legend: { text: "Role", size: "m" }
-      %>
+        f.govuk_collection_radio_buttons :role, roles, :id, :name, legend: { text: "Role", size: "m" } %>

      <%= f.govuk_collection_radio_buttons :is_dpo,
        [OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")],
        :id,
        :name,
        inline: true,
-        legend: { text: "Are #{pronoun(@user, current_user)} a data protection officer?", size: "m" }
-      %>
+        legend: { text: "Are #{pronoun(@user, current_user)} a data protection officer?", size: "m" } %>

      <%= f.govuk_collection_radio_buttons :is_key_contact,
        [OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")],
        :id,
        :name,
        inline: true,
-        legend: { text: "Are #{pronoun(@user, current_user)} a key contact?", size: "m" }
-      %>
+        legend: { text: "Are #{pronoun(@user, current_user)} a key contact?", size: "m" } %>

      <%= f.govuk_submit "Continue" %>
    </div>
--- a/spec/features/reset_password.html.erb
+++ b/spec/features/reset_password.html.erb
@ -20,12 +20,10 @@
      <%= f.govuk_password_field :password,
        label: { text: "New password" },
        hint: @minimum_password_length ? { text: "Your password must be at least #{@minimum_password_length} characters and hard to guess." } : nil,
-        autocomplete: "new-password"
-      %>
+        autocomplete: "new-password" %>

      <%= f.govuk_password_field :password_confirmation,
-        label: { text: "Confirm new password" }
-      %>
+        label: { text: "Confirm new password" } %>

      <%= f.govuk_submit "Update" %>
    </div>