Ruby 3: KwArgs fix for CareGiversAssistanceClaimSpec (#11929)

department-of-veterans-affairs · Mar 2, 2023 · 720f5c7 · 720f5c7
1 parent a2db775
commit 720f5c7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/app/models/saved_claim/caregivers_assistance_claim.rb b/app/models/saved_claim/caregivers_assistance_claim.rb
@@ -24,7 +24,7 @@ def process_attachments!
   def to_pdf(filename = nil, **fill_options)
     # We never save the claim, so we don't have an id to provide for the filename.
     # Instead we'll create a filename with this format "10-10cg_{uuid}"
-    PdfFill::Filler.fill_form(self, filename || guid, fill_options)
+    PdfFill::Filler.fill_form(self, filename || guid, **fill_options)
   end
 
   # SavedClaims require regional_office to be defined, CaregiversAssistanceClaim has no purpose for it.

diff --git a/spec/models/saved_claim/caregivers_assistance_claim_spec.rb b/spec/models/saved_claim/caregivers_assistance_claim_spec.rb
@@ -21,18 +21,31 @@
     end
 
     it 'calls PdfFill::Filler#fill_form' do
-      expect(PdfFill::Filler).to receive(:fill_form).with(claim, claim.guid, {}).once.and_return(:expected_file_paths)
+      if RUBY_VERSION =~ /2.7/
+        expect(PdfFill::Filler).to receive(:fill_form).with(claim, claim.guid, {}).once.and_return(:expected_file_paths)
+      else
+        expect(PdfFill::Filler).to receive(:fill_form).with(claim, claim.guid).once.and_return(:expected_file_paths)
+      end
       expect(claim.to_pdf).to eq(:expected_file_paths)
     end
 
     it 'passes arguments to PdfFill::Filler#fill_form' do
-      expect(PdfFill::Filler).to receive(
-        :fill_form
-      ).with(
-        claim,
-        'my_other_filename',
-        {}
-      ).once.and_return(:expected_file_paths)
+      if RUBY_VERSION =~ /2.7/
+        expect(PdfFill::Filler).to receive(
+          :fill_form
+        ).with(
+          claim,
+          'my_other_filename',
+          {}
+        ).once.and_return(:expected_file_paths)
+      else
+        expect(PdfFill::Filler).to receive(
+          :fill_form
+        ).with(
+          claim,
+          'my_other_filename'
+        ).once.and_return(:expected_file_paths)
+      end
 
       # Calling with only filename
       claim.to_pdf('my_other_filename')