From 26aa01f0917d4aa592d185157cf7888be2f90271 Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 11 Oct 2024 11:02:17 +0100 Subject: [PATCH] Update tests --- spec/factories/collection_resource.rb | 1 + spec/helpers/collection_resources_helper_spec.rb | 12 ++++++------ .../requests/collection_resources_controller_spec.rb | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/spec/factories/collection_resource.rb b/spec/factories/collection_resource.rb index e65e4c496..0282e33e3 100644 --- a/spec/factories/collection_resource.rb +++ b/spec/factories/collection_resource.rb @@ -6,6 +6,7 @@ FactoryBot.define do year { 2024 } log_type { "lettings" } download_filename { "24_25_lettings_paper_form.pdf" } + mandatory { true } trait(:additional) do resource_type { nil } display_name { "lettings additional resource (2024 to 2025)" } diff --git a/spec/helpers/collection_resources_helper_spec.rb b/spec/helpers/collection_resources_helper_spec.rb index 859d14cd1..9fc77a4c9 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 - CollectionResource.create!(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) - CollectionResource.create!(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) - CollectionResource.create!(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: "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: "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) end it "reutrns current and next years" do @@ -199,9 +199,9 @@ RSpec.describe CollectionResourcesHelper do context "and the resources have been manually released" do before do - CollectionResource.create!(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) - CollectionResource.create!(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) - CollectionResource.create!(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: "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: "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) end it "returns false" do diff --git a/spec/requests/collection_resources_controller_spec.rb b/spec/requests/collection_resources_controller_spec.rb index 3cc869ba6..3807f8d4a 100644 --- a/spec/requests/collection_resources_controller_spec.rb +++ b/spec/requests/collection_resources_controller_spec.rb @@ -626,7 +626,7 @@ RSpec.describe CollectionResourcesController, type: :request do context "when the file exists on S3" do before do - allow(storage_service).to receive(:get_file_io).and_return("file") + allow(storage_service).to receive(:get_file).and_return("file") get collection_resource_download_path(collection_resource) end @@ -637,7 +637,7 @@ RSpec.describe CollectionResourcesController, type: :request do context "when the file does not exist on S3" do before do - allow(storage_service).to receive(:get_file_io).and_return(nil) + allow(storage_service).to receive(:get_file).and_return(nil) get collection_resource_download_path(collection_resource) end @@ -648,7 +648,7 @@ RSpec.describe CollectionResourcesController, type: :request do context "when resource id is invalid" do before do - allow(storage_service).to receive(:get_file_io).and_return(nil) + allow(storage_service).to receive(:get_file).and_return(nil) get collection_resource_download_path(collection_resource_id: "invalid") end @@ -676,7 +676,7 @@ RSpec.describe CollectionResourcesController, type: :request do context "when year is in editable_collection_resource_years but not in displayed_collection_resource_years" do before do - allow(storage_service).to receive(:get_file_io).and_return("file") + allow(storage_service).to receive(:get_file).and_return("file") get collection_resource_download_path(collection_resource) end