From 8c1ac0fcb6feabd22f26aca09447ac1c97a9cbc7 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 22 May 2024 16:59:25 +0100 Subject: [PATCH] Display correct assigned to user in CSV filters --- app/helpers/filters_helper.rb | 2 +- spec/requests/lettings_logs_controller_spec.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index 0fdb01d21..179cd47cf 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -251,7 +251,7 @@ private return "All" if session_filters["assigned_to"].include?("all") return "You" if session_filters["assigned_to"].include?("you") - user = User.find(session_filters["user"].first) + user = User.find(session_filters["user"]) "#{user.name} (#{user.email})" end diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index 68d6f6276..e1a4aad96 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -1433,6 +1433,14 @@ RSpec.describe LettingsLogsController, type: :request do expect(page).to have_link("Change", href: "/lettings-logs/filters/status?codes_only=false&referrer=check_answers&search=#{search_term}") expect(page).to have_link("Change", href: "/lettings-logs/filters/needstype?codes_only=false&referrer=check_answers&search=#{search_term}") end + + it "displays correct assigned to filter" do + create_list(:user, 12, organisation: user.organisation) + filtered_user = create(:user, organisation: user.organisation, name: "Obviously not usual name") + get("/lettings-logs/csv-download?years[]=#{lettings_log.form.start_date.year}&search=#{search_term}&codes_only=false&assigned_to=specific_user&user=#{filtered_user.id}", headers:) + + expect(page).to have_content("Obviously not usual name") + end end context "when there are no years selected in the filters" do