From f5b971c12da0907e02ba4ff26238928830babee3 Mon Sep 17 00:00:00 2001 From: Paul Robert Lloyd Date: Thu, 9 Jun 2022 12:02:29 +0100 Subject: [PATCH] Use section break helper (#651) * Use section break helper * Fix failing TagHelper spec * Bump govuk-components for zeitwerk fix * Fix heisenspec Co-authored-by: baarkerlounger --- Gemfile.lock | 3 ++- app/views/case_logs/index.html.erb | 2 +- app/views/form/page.html.erb | 2 +- app/views/organisations/index.html.erb | 2 +- app/views/organisations/logs.html.erb | 2 +- app/views/organisations/users.html.erb | 2 +- app/views/users/index.html.erb | 2 +- spec/helpers/tag_helper_spec.rb | 2 +- spec/requests/organisations_controller_spec.rb | 6 +++--- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1859e66a6..59dc47bae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,8 +174,9 @@ GEM ffi (1.15.5) globalid (1.0.0) activesupport (>= 5.0) - govuk-components (3.0.4) + govuk-components (3.0.6) activemodel (>= 6.1) + html-attributes-utils (~> 0.9.0) railties (>= 6.1) view_component (~> 2.49.1) govuk_design_system_formbuilder (3.0.3) diff --git a/app/views/case_logs/index.html.erb b/app/views/case_logs/index.html.erb index 583eac968..6d52d0060 100644 --- a/app/views/case_logs/index.html.erb +++ b/app/views/case_logs/index.html.erb @@ -14,7 +14,7 @@ <%= render partial: "log_filters" %>
<%= render SearchComponent.new(current_user:, search_label: "Search by log ID, tenant code, property reference or postcode", value: @searched) %> -
+ <%= govuk_section_break(visible: true, size: "m") %> <%= render partial: "log_list", locals: { case_logs: @case_logs, title: "Logs", pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %> <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "logs" } %>
diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb index 999fd664f..ebbdd681b 100644 --- a/app/views/form/page.html.erb +++ b/app/views/form/page.html.erb @@ -31,7 +31,7 @@ <% @page.non_conditional_questions.map do |question| %>
> <% if question.read_only? %> -
+ <%= govuk_section_break(visible: true, size: "m") %> <% end %> <% if question.type == "interruption_screen" %> <%= 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 } %> diff --git a/app/views/organisations/index.html.erb b/app/views/organisations/index.html.erb index 65f8134b7..967c2d0bf 100644 --- a/app/views/organisations/index.html.erb +++ b/app/views/organisations/index.html.erb @@ -13,7 +13,7 @@ <%= render SearchComponent.new(current_user:, search_label: "Search by organisation name", value: @searched) %> -
+<%= govuk_section_break(visible: true, size: "m") %> <%= render partial: "organisation_list", locals: { organisations: @organisations, title: "Organisations", pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %> <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "organisations" } %> diff --git a/app/views/organisations/logs.html.erb b/app/views/organisations/logs.html.erb index a12ef6a32..b4625d594 100644 --- a/app/views/organisations/logs.html.erb +++ b/app/views/organisations/logs.html.erb @@ -15,7 +15,7 @@ <%= render partial: "case_logs/log_filters" %>
<%= render SearchComponent.new(current_user:, search_label: "Search by log ID, tenant code, property reference or postcode", value: @searched) %> -
+ <%= govuk_section_break(visible: true, size: "m") %> <%= render partial: "case_logs/log_list", locals: { case_logs: @case_logs, title: "Logs", pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %> <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "logs" } %>
diff --git a/app/views/organisations/users.html.erb b/app/views/organisations/users.html.erb index d7a889b2e..e8dc383ed 100644 --- a/app/views/organisations/users.html.erb +++ b/app/views/organisations/users.html.erb @@ -17,7 +17,7 @@ <%= render SearchComponent.new(current_user:, search_label: "Search by name or email address", value: @searched) %> -
+<%= govuk_section_break(visible: true, size: "m") %> <%= render partial: "users/user_list", locals: { users: @users, title:, pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %> <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "users" } %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 3444479c2..da05e2905 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -13,7 +13,7 @@ <%= render SearchComponent.new(current_user:, search_label: "Search by name or email address", value: @searched) %> -
+<%= govuk_section_break(visible: true, size: "m") %> <%= render partial: "users/user_list", locals: { users: @users, title:, pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %> <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "users" } %> diff --git a/spec/helpers/tag_helper_spec.rb b/spec/helpers/tag_helper_spec.rb index bbdaeb8be..dd7ad664d 100644 --- a/spec/helpers/tag_helper_spec.rb +++ b/spec/helpers/tag_helper_spec.rb @@ -10,7 +10,7 @@ RSpec.describe TagHelper do end it "returns tag with correct status text and colour and custom class" do - expect(status_tag("not_started", "app-tag--small")).to eq("Not started") + expect(status_tag("not_started", "app-tag--small")).to eq("Not started") end end end diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb index 5c4cef674..8470d50ef 100644 --- a/spec/requests/organisations_controller_spec.rb +++ b/spec/requests/organisations_controller_spec.rb @@ -572,10 +572,10 @@ RSpec.describe OrganisationsController, type: :request do it "shows only logs matching both search and filters" do get "/organisations/#{organisation.id}/logs?search=#{matching_postcode}&status[]=#{matching_status}", headers: headers, params: {} - expect(page).to have_content(log_matching_filter_and_search.id) - expect(page).not_to have_content(log_to_search.id) + expect(page).to have_link(log_matching_filter_and_search.id.to_s) + expect(page).not_to have_link(log_to_search.id.to_s) logs.each do |log| - expect(page).not_to have_content(log.id) + expect(page).not_to have_link(log.id.to_s) end end end