From e867421b53f9ef8a8d1bc2608fd140506d51938a Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Fri, 27 Sep 2024 13:36:33 +0100 Subject: [PATCH] Some test fixes --- app/components/bulk_upload_summary_component.html.erb | 2 +- app/controllers/lettings_logs_controller.rb | 2 +- app/controllers/sales_logs_controller.rb | 2 +- app/services/bulk_upload/downloader.rb | 2 +- spec/features/organisation_spec.rb | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/components/bulk_upload_summary_component.html.erb b/app/components/bulk_upload_summary_component.html.erb index 24a81111b..4e390f5d7 100644 --- a/app/components/bulk_upload_summary_component.html.erb +++ b/app/components/bulk_upload_summary_component.html.erb @@ -27,7 +27,7 @@ [bulk_upload.total_logs_count, "total log"], [setup_errors_count, "error on important questions", "errors on important questions"], [critical_errors_count, "critical error"], - [potential_errors_count, "potential error"] + [potential_errors_count, "potential error"], ) %> diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index 1dadc80b6..3abe367d1 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -139,7 +139,7 @@ class LettingsLogsController < LogsController downloader = BulkUpload::Downloader.new(bulk_upload:) if Rails.env.development? - send_file downloader.file_path, filename: bulk_upload.filename, type: "text/csv" + send_file downloader.path, filename: bulk_upload.filename, type: "text/csv" else presigned_url = downloader.presigned_url redirect_to presigned_url diff --git a/app/controllers/sales_logs_controller.rb b/app/controllers/sales_logs_controller.rb index 46c12024f..9cba285ee 100644 --- a/app/controllers/sales_logs_controller.rb +++ b/app/controllers/sales_logs_controller.rb @@ -109,7 +109,7 @@ class SalesLogsController < LogsController downloader = BulkUpload::Downloader.new(bulk_upload:) if Rails.env.development? - send_file downloader.file_path, filename: bulk_upload.filename, type: "text/csv" + send_file downloader.path, filename: bulk_upload.filename, type: "text/csv" else presigned_url = downloader.presigned_url redirect_to presigned_url diff --git a/app/services/bulk_upload/downloader.rb b/app/services/bulk_upload/downloader.rb index a76324fc0..5a2c92193 100644 --- a/app/services/bulk_upload/downloader.rb +++ b/app/services/bulk_upload/downloader.rb @@ -1,7 +1,7 @@ class BulkUpload::Downloader attr_reader :bulk_upload - delegate :path, to: :file, prefix: true + delegate :path, to: :file def initialize(bulk_upload:) @bulk_upload = bulk_upload diff --git a/spec/features/organisation_spec.rb b/spec/features/organisation_spec.rb index 3d65cda87..5189130d6 100644 --- a/spec/features/organisation_spec.rb +++ b/spec/features/organisation_spec.rb @@ -136,7 +136,7 @@ RSpec.describe "User Features" do end it "shows a create button for that organisation" do - expect(page).to have_button("Create a new lettings log for this organisation") + expect(page).to have_button("Create a new lettings log") end it "shows a upload lettings logs in bulk link" do @@ -145,7 +145,7 @@ RSpec.describe "User Features" do context "when creating a log for that organisation" do it "pre-fills the value for owning organisation for that log" do - click_button("Create a new lettings log for this organisation") + click_button("Create a new lettings log") click_link("Set up this lettings log") expect(page).to have_content(org_name) end @@ -231,7 +231,7 @@ RSpec.describe "User Features" do end it "shows a create button for that organisation" do - expect(page).to have_button("Create a new sales log for this organisation") + expect(page).to have_button("Create a new sales log") end it "shows a upload sales logs in bulk link" do @@ -240,7 +240,7 @@ RSpec.describe "User Features" do context "when creating a log for that organisation" do it "pre-fills the value for owning organisation for that log" do - click_button("Create a new sales log for this organisation") + click_button("Create a new sales log") click_link("Set up this sales log") expect(page).to have_content(org_name) end