From f56dafbc4a6252d62331c898ae2399b2ffb9695c Mon Sep 17 00:00:00 2001 From: RachalCassity Date: Wed, 17 Apr 2024 15:50:42 -0500 Subject: [PATCH 1/2] Preventing future merge conflict --- modules/simple_forms_api/spec/requests/v1/uploads_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/simple_forms_api/spec/requests/v1/uploads_spec.rb b/modules/simple_forms_api/spec/requests/v1/uploads_spec.rb index b68a647fd8b..535e42dcd59 100644 --- a/modules/simple_forms_api/spec/requests/v1/uploads_spec.rb +++ b/modules/simple_forms_api/spec/requests/v1/uploads_spec.rb @@ -238,7 +238,6 @@ context 'going to Lighthouse Benefits Claims API' do before do allow(Common::VirusScan).to receive(:scan).and_return(true) - allow_any_instance_of(Common::VirusScan).to receive(:scan).and_return(true) VCR.insert_cassette('lighthouse/benefits_claims/intent_to_file/404_response') VCR.insert_cassette('lighthouse/benefits_claims/intent_to_file/200_response_pension') VCR.insert_cassette('lighthouse/benefits_claims/intent_to_file/200_response_survivor') From 48c03027ed81d866d6ef72a51fcdb83c11bcf841 Mon Sep 17 00:00:00 2001 From: Rebecca Tolmach <10993987+rmtolmach@users.noreply.github.com> Date: Wed, 17 Apr 2024 17:07:18 -0400 Subject: [PATCH 2/2] trigger ci