From 8c092a02e2854560c9defa212db394064d4315ae Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:42:35 +0000 Subject: [PATCH] Update paper form display name (#2797) --- .../mandatory_collection_resources_service.rb | 2 +- spec/factories/collection_resource.rb | 2 +- spec/helpers/collection_resources_helper_spec.rb | 14 +++++++------- .../mandatory_collection_resources_service_spec.rb | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/services/mandatory_collection_resources_service.rb b/app/services/mandatory_collection_resources_service.rb index 397e4b5d0..197e521d4 100644 --- a/app/services/mandatory_collection_resources_service.rb +++ b/app/services/mandatory_collection_resources_service.rb @@ -46,7 +46,7 @@ class MandatoryCollectionResourcesService year_range = "#{year} to #{year + 1}" case resource when "paper_form" - "#{log_type} log for tenants (#{year_range})" + "#{log_type} paper form (#{year_range})" when "bulk_upload_template" "#{log_type} bulk upload template (#{year_range})" when "bulk_upload_specification" diff --git a/spec/factories/collection_resource.rb b/spec/factories/collection_resource.rb index 0282e33e3..fb1895806 100644 --- a/spec/factories/collection_resource.rb +++ b/spec/factories/collection_resource.rb @@ -1,7 +1,7 @@ FactoryBot.define do factory :collection_resource, class: "CollectionResource" do resource_type { "paper_form" } - display_name { "lettings log for tenants (2021 to 2022)" } + display_name { "lettings paper form (2021 to 2022)" } short_display_name { "Paper Form" } year { 2024 } log_type { "lettings" } diff --git a/spec/helpers/collection_resources_helper_spec.rb b/spec/helpers/collection_resources_helper_spec.rb index 9fc77a4c9..05c164fc1 100644 --- a/spec/helpers/collection_resources_helper_spec.rb +++ b/spec/helpers/collection_resources_helper_spec.rb @@ -94,9 +94,9 @@ RSpec.describe CollectionResourcesHelper do context "and next year resources were manually released" do before do - create(:collection_resource, year: 2025, resource_type: "paper_form", display_name: "lettings log for tenants (2025 to 2026)", download_filename: "file.pdf", mandatory: true, released_to_user: true) + create(:collection_resource, year: 2025, resource_type: "paper_form", display_name: "lettings paper form (2025 to 2026)", download_filename: "file.pdf", mandatory: true, released_to_user: true) create(:collection_resource, year: 2025, resource_type: "bulk_upload_template", display_name: "bulk upload template (2025 to 2026)", download_filename: "file.xlsx", mandatory: true, released_to_user: true) - create(:collection_resource, year: 2025, resource_type: "bulk_upload_specification", display_name: "sales log for tenants (2025 to 2026)", download_filename: "file.xlsx", mandatory: true, released_to_user: true) + create(:collection_resource, year: 2025, resource_type: "bulk_upload_specification", display_name: "sales paper form (2025 to 2026)", download_filename: "file.xlsx", mandatory: true, released_to_user: true) end it "reutrns current and next years" do @@ -121,7 +121,7 @@ RSpec.describe CollectionResourcesHelper do describe "#document_list_component_items" do let(:resources) do [ - build(:collection_resource, year: 2023, resource_type: "paper_form", display_name: "lettings log for tenants (2023 to 2024)", download_filename: "2023_24_lettings_paper_form.pdf"), + build(:collection_resource, year: 2023, resource_type: "paper_form", display_name: "lettings paper form (2023 to 2024)", download_filename: "2023_24_lettings_paper_form.pdf"), build(:collection_resource, year: 2023, resource_type: "bulk_upload_template", display_name: "bulk upload template (2023 to 2024)", download_filename: "2023_24_lettings_bulk_upload_template.xlsx"), ] end @@ -134,7 +134,7 @@ RSpec.describe CollectionResourcesHelper do it "returns component items" do expect(document_list_component_items(resources)).to eq([ { - name: "Download the lettings log for tenants (2023 to 2024)", + name: "Download the lettings paper form (2023 to 2024)", href: "/collection-resources/lettings/2023/paper_form/download", metadata: "PDF, 286 KB", }, @@ -150,7 +150,7 @@ RSpec.describe CollectionResourcesHelper do describe "#document_list_edit_component_items" do let(:resources) do [ - build(:collection_resource, year: 2023, resource_type: "paper_form", display_name: "lettings log for tenants (2023 to 2024)", download_filename: "2023_24_lettings_paper_form.pdf"), + build(:collection_resource, year: 2023, resource_type: "paper_form", display_name: "lettings paper form (2023 to 2024)", download_filename: "2023_24_lettings_paper_form.pdf"), build(:collection_resource, year: 2023, resource_type: "bulk_upload_template", display_name: "bulk upload template (2023 to 2024)", download_filename: "2023_24_lettings_bulk_upload_template.xlsx"), ] end @@ -199,9 +199,9 @@ RSpec.describe CollectionResourcesHelper do context "and the resources have been manually released" do before do - create(:collection_resource, year: 2025, resource_type: "paper_form", display_name: "lettings log for tenants (2025 to 2026)", download_filename: "file.pdf", mandatory: true, released_to_user: true) + create(:collection_resource, year: 2025, resource_type: "paper_form", display_name: "lettings paper form (2025 to 2026)", download_filename: "file.pdf", mandatory: true, released_to_user: true) create(:collection_resource, year: 2025, resource_type: "bulk_upload_template", display_name: "bulk upload template (2025 to 2026)", download_filename: "file.xlsx", mandatory: true, released_to_user: true) - create(:collection_resource, year: 2025, resource_type: "bulk_upload_specification", display_name: "sales log for tenants (2025 to 2026)", download_filename: "file.xlsx", mandatory: true, released_to_user: true) + create(:collection_resource, year: 2025, resource_type: "bulk_upload_specification", display_name: "sales paper form (2025 to 2026)", download_filename: "file.xlsx", mandatory: true, released_to_user: true) end it "returns false" do diff --git a/spec/services/mandatory_collection_resources_service_spec.rb b/spec/services/mandatory_collection_resources_service_spec.rb index 423370e96..6b67e1d13 100644 --- a/spec/services/mandatory_collection_resources_service_spec.rb +++ b/spec/services/mandatory_collection_resources_service_spec.rb @@ -17,7 +17,7 @@ describe MandatoryCollectionResourcesService do it "returns a CollectionResource object with the correct attributes" do resource = service.generate_resource("lettings", 2024, "paper_form") expect(resource.resource_type).to eq("paper_form") - expect(resource.display_name).to eq("lettings log for tenants (2024 to 2025)") + expect(resource.display_name).to eq("lettings paper form (2024 to 2025)") expect(resource.short_display_name).to eq("Paper form") expect(resource.year).to eq(2024) expect(resource.log_type).to eq("lettings")