Run Rubocop on ERB templates

app/components/tab_navigation_component.html.erb

@@ -3,11 +3,11 @@
     <% items.each do |item| %>
       <% if item.fetch(:current, false) || current_page?(strip_query(item.fetch(:url))) %>
         <li class="app-tab-navigation__item app-tab-navigation__item--current">
-          <%= govuk_link_to item[:name], item[:url], class: 'app-tab-navigation__link', aria: { current: 'page' } %>
+          <%= govuk_link_to item[:name], item[:url], class: "app-tab-navigation__link", aria: { current: "page" } %>
         </li>
       <% else %>
         <li class="app-tab-navigation__item">
-          <%= govuk_link_to item[:name], item[:url], class: 'app-tab-navigation__link' %>
+          <%= govuk_link_to item[:name], item[:url], class: "app-tab-navigation__link" %>
         </li>
       <% end %>
     <% end %>

app/views/case_logs/_log_list.html.erb

@@ -28,21 +28,21 @@
             <%= govuk_link_to log.id, case_log_path(log) %>
           </th>
           <td class="govuk-table__cell app-!-font-tabular">
-            <%= log.tenant_code? ? log.tenant_code : '–' %>
+            <%= log.tenant_code? ? log.tenant_code : "–" %>
           </td>
           <td class="govuk-table__cell app-!-font-tabular">
-            <%= log.propcode? ? log.propcode : '–' %>
+            <%= log.propcode? ? log.propcode : "–" %>
           </td>
           <td class="govuk-table__cell">
-            <%= log.startdate.present? ? log.startdate.to_formatted_s(:govuk_date) : '–' %>
+            <%= log.startdate.present? ? log.startdate.to_formatted_s(:govuk_date) : "–" %>
           </td>
           <td class="govuk-table__cell">
             <%= log.created_at.to_formatted_s(:govuk_date) %>
           </td>
           <td class="govuk-table__cell">
             <%= govuk_tag(
-              colour: log.status == 'completed' ? 'blue' : 'grey',
-              text: log.status.humanize
+              colour: log.status == "completed" ? "blue" : "grey",
+              text: log.status.humanize,
             ) %>
           </td>
           <% if current_user.support? %>

app/views/case_logs/edit.html.erb

@@ -1,7 +1,7 @@
 <% content_for :title, "Log #{@case_log.id}" %>
 <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: {
   "Logs" => "/logs",
-  content_for(:title) => ""
+  content_for(:title) => "",
 }) %>
 
 <div class="govuk-grid-row">

app/views/case_logs/index.html.erb

@@ -13,7 +13,7 @@
   <% if @case_logs.present? %>
     <div class="app-filter-layout__content">
       <%= render partial: "log_list", locals: { case_logs: @case_logs, title: "Logs", pagy: @pagy } %>
-      <%== render partial: 'pagy/nav', locals: { pagy: @pagy, item_name: "logs" } %>
+      <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "logs" } %>
     </div>
   <% end %>
 </div>

app/views/devise/passwords/edit.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :before_content do %>
   <%= govuk_back_link(
-    text: 'Back',
+    text: "Back",
     href: :back,
   ) %>
 <% end %>

app/views/devise/passwords/new.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :before_content do %>
   <%= govuk_back_link(
-    text: 'Back',
+    text: "Back",
     href: :back,
   ) %>
 <% end %>

app/views/devise/passwords/reset_password.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :before_content do %>
   <%= govuk_back_link(
-    text: 'Back',
+    text: "Back",
     href: :back,
   ) %>
 <% end %>

app/views/devise/two_factor_authentication/resend.html.erb

@@ -2,8 +2,8 @@
 
 <% content_for :before_content do %>
   <%= govuk_back_link(
-    text: 'Back',
-    href: 'javascript:history.back()',
+    text: "Back",
+    href: "javascript:history.back()",
   ) %>
 <% end %>
 

app/views/devise/two_factor_authentication/show.html.erb

@@ -15,7 +15,7 @@
       <%= f.govuk_number_field :code,
         label: { text: "Security code", size: "m" },
         width: 5,
-        autocomplete: 'one-time-code',
+        autocomplete: "one-time-code",
         autofocus: true %>
 
       <%= f.govuk_submit "Submit" %>

app/views/filters/_checkbox_filter.html.erb

@@ -1,6 +1,6 @@
 <%= f.govuk_check_boxes_fieldset category.to_sym, legend: { text: label, size: "s" }, small: true, form_group: { classes: "app-filter__group" } do %>
   <% options.map do |key, option| %>
-    <%= f.govuk_check_box category, "#{key}",
+    <%= f.govuk_check_box category, key.to_s,
     label: { text: option },
     checked: filter_selected?(category, key),
     size: "s" %>

app/views/form/_check_answers_table.html.erb

@@ -1,6 +1,6 @@
 <div class="govuk-summary-list__row">
   <dt class="govuk-summary-list__key">
-    <%= question.check_answer_label.to_s.present? ? question.check_answer_label.to_s : question.header.to_s %>
+    <%= question.check_answer_label.to_s.presence || question.header.to_s %>
   </dt>
   <dd class="govuk-summary-list__value">
     <%= get_answer_label(question, @case_log) %><br>

app/views/form/_checkbox_question.html.erb

@@ -12,8 +12,8 @@
       <%= f.govuk_check_box_divider %>
       <% else %>
         <%= f.govuk_check_box question.id, key,
-          label: { text: options['value'] },
-          hint: { text: options['hint'] },
+          label: { text: options["value"] },
+          hint: { text: options["hint"] },
           checked: @case_log[key] == 1,
           exclusive: after_divider,
           **stimulus_html_attributes(question) %>

app/views/form/_interruption_screen_question.html.erb

@@ -1,6 +1,6 @@
 <%= govuk_panel(
-  title_text: title_text,
-  classes: 'app-panel--interruption',
+  title_text:,
+  classes: "app-panel--interruption",
 ) do %>
   <%= display_informative_text(informative_text, case_log) %>
   <%= f.govuk_radio_buttons_fieldset question.id.to_sym,
@@ -12,8 +12,8 @@
       <% else %>
         <%= f.govuk_radio_button question.id,
           key,
-          label: { text: options['value'] },
-          hint: { text: options['hint'] },
+          label: { text: options["value"] },
+          hint: { text: options["hint"] },
           **stimulus_html_attributes(question) %>
       <% end %>
     <% end %>

app/views/form/_numeric_question.html.erb

@@ -5,7 +5,8 @@
   label: legend(question, page_header, conditional),
   hint: { text: question.hint_text&.html_safe },
   min: question.min, max: question.max, step: question.step,
-  width: question.width, :readonly => question.read_only?,
+  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) %>

app/views/form/_radio_question.html.erb

@@ -13,21 +13,21 @@
       <% if conditional_question.nil? %>
         <%= f.govuk_radio_button question.id,
           key,
-          label: { text: options['value'] },
-          hint: { text: options['hint'] },
+          label: { text: options["value"] },
+          hint: { text: options["hint"] },
           **stimulus_html_attributes(question) %>
       <% else %>
         <%= f.govuk_radio_button question.id,
           key,
-          label: { text: options['value'] },
-          hint: { text: options['hint'] },
+          label: { text: options["value"] },
+          hint: { text: options["hint"] },
           **stimulus_html_attributes(question) do %>
             <%= render partial: "#{conditional_question.type}_question", locals: {
               question: conditional_question,
-              caption_text: caption_text,
-              page_header: page_header,
-              f: f,
-              conditional: true
+              caption_text:,
+              page_header:,
+              f:,
+              conditional: true,
             } %>
         <% end %>
       <% end %>

app/views/form/_select_question.html.erb

@@ -1,13 +1,13 @@
 <%= render partial: "form/guidance/#{question.guidance_partial}" if question.guidance_partial %>
 
 <% selected = @case_log.public_send(question.id) || "" %>
-<%= answers = question.displayed_answer_options.map { |key, value| OpenStruct.new(id: key, name: value) }
-  f.govuk_collection_select question.id.to_sym,
+<%= answers = question.displayed_answer_options.map { |key, value| OpenStruct.new(id: key, name: value) } %>
+  <%= f.govuk_collection_select question.id.to_sym,
     answers,
     :id,
     :name,
     caption: caption(caption_text, page_header, conditional),
     label: legend(question, page_header, conditional),
     hint: { text: question.hint_text&.html_safe },
-    options: { disabled: [""], selected: selected },
+    options: { disabled: [""], selected: },
     "data-controller": "accessible-autocomplete" %>

app/views/form/_text_question.html.erb

@@ -4,5 +4,5 @@
   caption: caption(caption_text, page_header, conditional),
   label: legend(question, page_header, conditional),
   hint: { text: question.hint_text&.html_safe },
-  width: question.width ? question.width : nil,
+  width: question.width || nil,
   **stimulus_html_attributes(question) %>

app/views/form/_textarea_question.html.erb

@@ -4,5 +4,5 @@
   caption: caption(caption_text, page_header, conditional),
   label: legend(question, page_header, conditional),
   hint: { text: question.hint_text&.html_safe },
-  width: question.width ? question.width : nil,
+  width: question.width || nil,
   **stimulus_html_attributes(question) %>

app/views/form/check_answers.html.erb

@@ -1,8 +1,8 @@
 <% content_for :title, "#{subsection.id.humanize} - Check your answers" %>
 <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: {
   "Logs" => "/logs",
-  "Log #{@case_log.id.to_s}" => "/logs/" + @case_log.id.to_s,
-  subsection.label => ""
+  "Log #{@case_log.id}" => "/logs/#{@case_log.id}",
+  subsection.label => "",
 }) %>
 
 <div class="govuk-grid-row">
@@ -16,16 +16,16 @@
 
     <dl class="govuk-summary-list">
       <% subsection.applicable_questions(@case_log).each do |question| %>
-        <%= render partial: 'form/check_answers_table', locals: { question: question, case_log: @case_log } %>
+        <%= render partial: "form/check_answers_table", locals: { question:, case_log: @case_log } %>
       <% end %>
     </dl>
 
     <%= form_with model: @case_log, method: "get" do |f| %>
-      <%= f.govuk_submit 'Save and return to log' do %>
+      <%= f.govuk_submit "Save and return to log" do %>
         <% if @case_log.status == "in_progress" && @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) == false %>
-          <%= govuk_button_link_to 'Save and go to next incomplete section', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
+          <%= govuk_button_link_to "Save and go to next incomplete section", "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
         <% elsif @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) %>
-          <%= govuk_button_link_to 'Save and go to submit', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
+          <%= govuk_button_link_to "Save and go to submit", "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
         <% end %>
       <% end %>
     <% end %>

app/views/form/guidance/_what_counts_as_income.html.erb

@@ -1,4 +1,4 @@
-<%= govuk_details(summary_text: 'What counts as income?') do %>
+<%= govuk_details(summary_text: "What counts as income?") do %>
   <p class="govuk-body">You should include any income after tax from:</p>
   <ul class="govuk-list govuk-list--bullet">
     <li>employment</li>

app/views/form/page.html.erb

@@ -1,9 +1,9 @@
-<% content_for :title, @page.header.present? ? @page.header : @page.questions.first().header.html_safe %>
+<% content_for :title, @page.header.presence || @page.questions.first.header.html_safe %>
 
 <% content_for :before_content do %>
   <%= govuk_back_link(
-    text: 'Back',
-    href: 'javascript:history.back()',
+    text: "Back",
+    href: "javascript:history.back()",
   ) %>
 <% end %>
 
@@ -34,9 +34,9 @@
             <hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m">
           <% end %>
           <% if question.type == "interruption_screen" %>
-            <%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, title_text: @page.title_text, informative_text:  @page.informative_text, form: @form, f: f, conditional: false } %>
+            <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f:, conditional: false } %>
           <% else %>
-            <%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, f: f, conditional: false } %>
+            <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, f:, conditional: false } %>
           <% end %>
         </div>
       <% end %>

app/views/layouts/_collection_resources.html.erb

@@ -1,13 +1,16 @@
 <div class="app-card">
   <h2 class="govuk-heading-s">Collection resources</h2>
 
-  <%= render DocumentListComponent.new(items: [{
+  <%= render DocumentListComponent.new(items: [
+    {
       name: "Lettings log for tenants (2022/23)",
       href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2022-23%20Lettings%20paper%20form.pdf?download-format=pdf",
-    metadata: "PDF, 654 KB, 4 pages"
-  }, {
+      metadata: "PDF, 654 KB, 4 pages",
+    },
+    {
       name: "Lettings log for tenants (2021/22)",
       href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2021_22%20Lettings%20Log.pdf?download-format=pdf",
-    metadata: "PDF, 302 KB, 3 pages"
-  }]) %>
+      metadata: "PDF, 302 KB, 3 pages",
+    },
+  ]) %>
 </div>

app/views/layouts/application.html.erb

@@ -4,19 +4,19 @@
     <title><%= browser_title(yield(:title), @pagy, @admin_user, @user, @organisation, @case_log, @resource) %></title>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
-    <%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
-    <%= tag :meta, property: 'og:image', content: asset_path('images/govuk-opengraph-image.png') %>
-    <%= tag :meta, name: 'theme-color', content: '#0b0c0c' %>
-    <%= favicon_link_tag asset_path('images/favicon.ico') %>
-    <%= favicon_link_tag asset_path('images/govuk-mask-icon.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
-    <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon.png'), rel: 'apple-touch-icon', type: 'image/png' %>
-    <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-152x152.png'), rel: 'apple-touch-icon', type: 'image/png', size: '152x152' %>
-    <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-167x167.png'), rel: 'apple-touch-icon', type: 'image/png', size: '167x167' %>
-    <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-180x180.png'), rel: 'apple-touch-icon', type: 'image/png', size: '180x180' %>
+    <%= tag.meta name: "viewport", content: "width=device-width, initial-scale=1" %>
+    <%= tag.meta property: "og:image", content: asset_path("images/govuk-opengraph-image.png") %>
+    <%= tag.meta name: "theme-color", content: "#0b0c0c" %>
+    <%= favicon_link_tag asset_path("images/favicon.ico") %>
+    <%= favicon_link_tag asset_path("images/govuk-mask-icon.svg"), rel: "mask-icon", type: "image/svg", color: "#0b0c0c" %>
+    <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon.png"), rel: "apple-touch-icon", type: "image/png" %>
+    <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-152x152.png"), rel: "apple-touch-icon", type: "image/png", size: "152x152" %>
+    <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-167x167.png"), rel: "apple-touch-icon", type: "image/png", size: "167x167" %>
+    <%= 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" %>
     <script>
-      window.html5.elements = 'output';
+      window.html5.elements = "output";
       html5.shivDocument(document);
     </script>
     <%= javascript_include_tag "vendor/polyfill-output-value.js" %>
@@ -37,42 +37,43 @@
 
   <body class="govuk-template__body app-template--wide">
     <script>
-      document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
+      document.body.className = ((document.body.className) ? document.body.className + " js-enabled" : "js-enabled");
     </script>
 
     <%= govuk_skip_link %>
 
     <%= govuk_header(
-      logotype: 'GOV.UK',
-      service_name: t('service_name'),
-      service_url: current_user.nil? ? "/" : '/logs'
+      logotype: "GOV.UK",
+      service_name: t("service_name"),
+      service_url: current_user.nil? ? "/" : "/logs",
     ) do |component|
       if current_user.nil?
-        component.navigation_item(text: 'Sign in', href: user_session_path)
-      elsif
-        component.navigation_item(text: 'Logs', href: case_logs_path)
-        component.navigation_item(text: 'Your organisation', href: "/organisations/#{current_user.organisation.id}")
-        component.navigation_item(text: 'Your account', href: account_path)
-        component.navigation_item(text: 'Sign out', href: destroy_user_session_path)
+        component.navigation_item(text: "Sign in", href: user_session_path)
+      else
+        component.navigation_item(text: "Logs", href: case_logs_path)
+        component.navigation_item(text: "Your organisation", href: "/organisations/#{current_user.organisation.id}")
+        component.navigation_item(text: "Your account", href: account_path)
+        component.navigation_item(text: "Sign out", href: destroy_user_session_path)
       end
     end %>
 
     <div class="govuk-width-container">
       <aside>
         <%= govuk_phase_banner(
-          tag: { text: 'Beta' },
-          text: "This is a new service – help us improve it by <a class=\"govuk-link\" href=\"#{t('feedback_form')}\" rel=\"noreferrer noopener\" target=\"_blank\">giving us your feedback (opens in a new tab)</a>".html_safe
+          tag: { text: "Beta" },
+          text: "This is a new service – help us improve it by <a class=\"govuk-link\" href=\"#{t('feedback_form')}\" rel=\"noreferrer noopener\" target=\"_blank\">giving us your feedback (opens in a new tab)</a>".html_safe,
         ) %>
         <%= content_for(:breadcrumbs) %>
         <%= content_for(:before_content) %>
       </aside>
 
       <main class="govuk-main-wrapper" id="main-content" role="main">
-        <% if flash.notice && !flash.notice.include?('translation missing') %>
+        <% if flash.notice && !flash.notice.include?("translation missing") %>
           <%= govuk_notification_banner(
-            title_text: 'Success',
+            title_text: "Success",
             success: true, title_heading_level: 3,
-            title_id: "swanky-notifications") do |notification_banner|
+            title_id: "swanky-notifications"
+          ) do |notification_banner|
             notification_banner.heading(text: flash.notice)
           end %>
         <% end %>

app/views/layouts/organisations.html.erb

@@ -5,7 +5,7 @@
 
   <% items = tab_items(current_user) %>
 
-  <%= render TabNavigationComponent.new(items: items) %>
+  <%= render TabNavigationComponent.new(items:) %>
 
   <h2 class="govuk-visually-hidden"><%= content_for(:tab_title) %></h2>
 

app/views/organisations/edit.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :before_content do %>
   <%= govuk_back_link(
-    text: 'Back',
+    text: "Back",
     href: :back,
   ) %>
 <% end %>

app/views/organisations/show.html.erb

@@ -10,17 +10,21 @@
       <% @organisation.display_attributes.each do |attr| %>
 
         <% if current_user.data_coordinator? && attr[:editable] %>
-          <%= summary_list.row do |row|
-            row.key { attr[:name].to_s.humanize }
-            row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") }
-            row.action(visually_hidden_text: 'name', href: edit_organisation_path, html_attributes: { 'data-qa': "change-#{attr[:name]}" })
-          end %>
+          <%= summary_list.row do |row| %>
+            <% row.key { attr[:name].to_s.humanize } %>
+            <% row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") } %>
+            <% row.action(
+              visually_hidden_text: "name",
+              href: edit_organisation_path,
+              html_attributes: { "data-qa": "change-#{attr[:name]}" },
+            ) %>
+          <% end %>
         <% else %>
-          <%= summary_list.row do |row|
-            row.key { attr[:name].to_s.humanize }
-            row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") }
-            row.action()
-          end %>
+          <%= summary_list.row do |row| %>
+            <% row.key { attr[:name].to_s.humanize } %>
+            <% row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") } %>
+            <% row.action %>
+          <% end %>
         <% end %>
 
       <% end %>

app/views/organisations/users.html.erb

@@ -9,19 +9,19 @@
 <% end %>
 <%= govuk_table do |table| %>
   <%= table.head do |head| %>
-    <%= head.row do |row|
-      row.cell(header: true, text: "Name and email adress")
-      row.cell(header: true, text: "Organisation and role")
-      row.cell(header: true, text: "Last logged in")
-    end %>
+    <%= head.row do |row| %>
+      <% row.cell(header: true, text: "Name and email adress") %>
+      <% row.cell(header: true, text: "Organisation and role") %>
+      <% row.cell(header: true, text: "Last logged in") %>
+    <% end %>
   <% end %>
   <% @organisation.users.each do |user| %>
     <%= table.body do |body| %>
-      <%= body.row do |row|
-        row.cell(text: simple_format(user_cell(user), {}, wrapper_tag: "div"))
-        row.cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div"))
-        row.cell(text: user.last_sign_in_at&.to_formatted_s(:govuk_date) )
-      end %>
+      <%= body.row do |row| %>
+        <% row.cell(text: simple_format(user_cell(user), {}, wrapper_tag: "div")) %>
+        <% row.cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div")) %>
+        <% row.cell(text: user.last_sign_in_at&.to_formatted_s(:govuk_date)) %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

app/views/start/index.html.erb

@@ -10,10 +10,10 @@
     <p class="govuk-body">The data will be used to update the national record for social housing. It will also help to inform policy about the cost of social housing and what type of housing needs to be built.</p>
     <p class="govuk-body">This service is only for social housing in England.</p>
 
-    <% start_path = current_user ? case_logs_path : (user_session_path + "?start=true") %>
+    <% start_path = current_user ? case_logs_path : "#{user_session_path}?start=true" %>
     <%= govuk_start_button(
-      text: 'Start now',
-      href: start_path
+      text: "Start now",
+      href: start_path,
     ) %>
 
     <h2 class="govuk-heading-m">Before you start</h2>

app/views/users/edit.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :before_content do %>
   <%= govuk_back_link(
-    text: 'Back',
+    text: "Back",
     href: :back,
   ) %>
 <% end %>
@@ -25,9 +25,13 @@
         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) }
+        <%= 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")],

app/views/users/new.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :before_content do %>
   <%= govuk_back_link(
-    text: 'Back',
+    text: "Back",
     href: :back,
   ) %>
 <% end %>
@@ -25,8 +25,13 @@
         spellcheck: "false",
         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" } %>
+      <%= 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 :is_dpo,
         [OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")],

app/views/users/show.html.erb

@@ -17,17 +17,17 @@
             if can_edit_names?(@user, current_user)
               row.action(visually_hidden_text: "name", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-name" })
             else
-          row.action()
+              row.action
             end
           end %>
 
-      <%= summary_list.row() do |row|
+      <%= summary_list.row do |row|
             row.key { "Email address" }
             row.value { @user.email }
             if can_edit_emails?(@user, current_user)
               row.action(visually_hidden_text: "email address", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-email-address" })
             else
-          row.action()
+              row.action
             end
           end %>
 
@@ -35,25 +35,33 @@
             row.key { "Password" }
             row.value { "••••••••" }
             if can_edit_password?(@user, current_user)
-          row.action(visually_hidden_text: "password", href: edit_password_account_path, html_attributes: { "data-qa": "change-password" })
+              row.action(
+                visually_hidden_text: "password",
+                href: edit_password_account_path,
+                html_attributes: { "data-qa": "change-password" },
+              )
             else
-          row.action()
+              row.action
             end
           end %>
 
       <%= summary_list.row do |row|
             row.key { "Organisation" }
             row.value { @user.organisation.name }
-        row.action()
+            row.action
           end %>
 
       <%= summary_list.row do |row|
             row.key { "Role" }
             row.value { @user.role.humanize }
             if can_edit_roles?(@user, current_user)
-          row.action(visually_hidden_text: "role", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-role" })
+              row.action(
+                visually_hidden_text: "role",
+                href: aliased_user_edit(@user, current_user),
+                html_attributes: { "data-qa": "change-role" },
+              )
             else
-          row.action()
+              row.action
             end
           end %>
 
@@ -61,9 +69,13 @@
             row.key { "Data protection officer" }
             row.value { @user.is_data_protection_officer? ? "Yes" : "No" }
             if can_edit_dpo?(@user, current_user)
-          row.action(visually_hidden_text: "are #{pronoun(@user, current_user)} a data protection officer?", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-data-protection-officer" })
+              row.action(
+                visually_hidden_text: "are #{pronoun(@user, current_user)} a data protection officer?",
+                href: aliased_user_edit(@user, current_user),
+                html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-data-protection-officer" },
+              )
             else
-          row.action()
+              row.action
             end
           end %>
 
@@ -71,9 +83,13 @@
             row.key { "Key contact" }
             row.value { @user.is_key_contact? ? "Yes" : "No" }
             if can_edit_key_contact?(@user, current_user)
-          row.action(visually_hidden_text: "are #{pronoun(@user, current_user)} a key contact?", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-key-contact" })
+              row.action(
+                visually_hidden_text: "are #{pronoun(@user, current_user)} a key contact?",
+                href: aliased_user_edit(@user, current_user),
+                html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-key-contact" },
+              )
             else
-          row.action()
+              row.action
             end
           end %>
     <% end %>

spec/features/reset_password.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :before_content do %>
   <%= govuk_back_link(
-    text: 'Back',
+    text: "Back",
     href: :back,
   ) %>
 <% end %>