From e01b70838b250e17c0c89617f0ca34b1d67274c5 Mon Sep 17 00:00:00 2001 From: Ted Date: Tue, 17 May 2022 14:34:41 +0100 Subject: [PATCH] Improved tests, replaced rescue block with Sentry --- app/services/exports/case_log_export_service.rb | 2 -- spec/services/exports/case_log_export_service_spec.rb | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/services/exports/case_log_export_service.rb b/app/services/exports/case_log_export_service.rb index cd880a442..e8aca786e 100644 --- a/app/services/exports/case_log_export_service.rb +++ b/app/services/exports/case_log_export_service.rb @@ -12,8 +12,6 @@ module Exports write_master_manifest(export) write_export_data(case_logs) export.save! - rescue StandardError => e - @logger.error "#{e.class}: #{e.message}. Caller: #{e.backtrace.first}" end def is_omitted_field?(field_name) diff --git a/spec/services/exports/case_log_export_service_spec.rb b/spec/services/exports/case_log_export_service_spec.rb index 63b4725d2..3f4007c70 100644 --- a/spec/services/exports/case_log_export_service_spec.rb +++ b/spec/services/exports/case_log_export_service_spec.rb @@ -46,7 +46,7 @@ RSpec.describe Exports::CaseLogExportService do end context "and case logs are available for export" do - let!(:time_now) { Time.zone.now } + let(:time_now) { Time.zone.now } before do Timecop.freeze(time_now) @@ -83,14 +83,14 @@ RSpec.describe Exports::CaseLogExportService do export = LogsExport.new(started_at: start_time, daily_run_number: 1) export.save! params = { from: start_time, to: time_now } - allow(CaseLog).to receive(:where).with("updated_at >= :from and updated_at <= :to", params).and_return([]) + allow(CaseLog).to receive(:where).with("updated_at >= :from and updated_at <= :to", params).once.and_return([]) export_service.export_case_logs end context "when this is the first export" do it "gets the logs for the timeframe up until the current time" do params = { to: time_now } - allow(CaseLog).to receive(:where).with("updated_at <= :to", params).and_return([]) + allow(CaseLog).to receive(:where).with("updated_at <= :to", params).once.and_return([]) export_service.export_case_logs end end @@ -113,7 +113,7 @@ RSpec.describe Exports::CaseLogExportService do export = LogsExport.new allow(LogsExport).to receive(:new).and_return(export) expect(export).not_to receive(:save!) - export_service.export_case_logs + expect { export_service.export_case_logs }.to raise_error(StandardError) end end end