Merge branch 'main' into WRSAT-484

Author: cram-cfa

.github/workflows/deploy.yaml

@@ -117,7 +117,7 @@ jobs:
           workflow: ${{ steps.dispatch.outputs.run_id }}
       - name: Fail unless the workflow succeeded
         if: ${{ steps.waiter.outputs.conclusion != 'success' }}
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             core.setFailed('Deployment workflow completed with stats: ${{ steps.waiter.outputs.conclusion }}')

Gemfile

@@ -56,7 +56,7 @@ gem "opentelemetry-sdk", "~> 1.11"
 gem "ostruct"
 gem "pg-aws_rds_iam", "~> 0.8"
 gem "phonelib"
-gem "rails_semantic_logger", "~> 4.19"
+gem "rails_semantic_logger", "~> 4.20"
 gem "request_store", "~> 1.7"
 gem "valid_email2"
 

Gemfile.lock

@@ -267,7 +267,7 @@ GEM
     minitest (6.0.3)
       drb (~> 2.0)
       prism (~> 1.5)
-    mixpanel-ruby (3.0.0)
+    mixpanel-ruby (3.1.0)
       base64
       json-logic-rb (~> 0.1.5)
       mutex_m
@@ -550,7 +550,7 @@ GEM
     rails-i18n (8.1.0)
       i18n (>= 0.7, < 2)
       railties (>= 8.0.0, < 9)
-    rails_semantic_logger (4.19.0)
+    rails_semantic_logger (4.20.0)
       rack
       railties (>= 5.1)
       semantic_logger (~> 4.16)
@@ -650,13 +650,13 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     securerandom (0.4.1)
-    selenium-webdriver (4.42.0)
+    selenium-webdriver (4.43.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
-    semantic_logger (4.17.0)
+    semantic_logger (4.18.0)
       concurrent-ruby (~> 1.0)
     solid_cable (3.0.12)
       actioncable (>= 7.2)
@@ -774,7 +774,7 @@ DEPENDENCIES
   puma (>= 5.0)
   rails (~> 8.1.3)
   rails-controller-testing
-  rails_semantic_logger (~> 4.19)
+  rails_semantic_logger (~> 4.20)
   request_store (~> 1.7)
   rspec-rails
   rubocop-rails-omakase
@@ -886,7 +886,7 @@ CHECKSUMS
   method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5
   mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef
   minitest (6.0.3) sha256=88ac8a1de36c00692420e7cb3cc11a0773bbcb126aee1c249f320160a7d11411
-  mixpanel-ruby (3.0.0) sha256=a636ab4bed9e13a7bc7551ae1bf7490569102534b64986a6faf15b8ed9ce4995
+  mixpanel-ruby (3.1.0) sha256=8e6b343efa1642b758911257eb607d7f159672ade26efa62fc1d7eceb77c4a44
   msgpack (1.8.0) sha256=e64ce0212000d016809f5048b48eb3a65ffb169db22238fb4b72472fecb2d732
   mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751
   net-imap (0.6.3) sha256=9bab75f876596d09ee7bf911a291da478e0cd6badc54dfb82874855ccc82f2ad
@@ -991,7 +991,7 @@ CHECKSUMS
   rails-dom-testing (2.3.0) sha256=8acc7953a7b911ca44588bf08737bc16719f431a1cc3091a292bca7317925c1d
   rails-html-sanitizer (1.7.0) sha256=28b145cceaf9cc214a9874feaa183c3acba036c9592b19886e0e45efc62b1e89
   rails-i18n (8.1.0) sha256=52d5fd6c0abef28d84223cc05647f6ae0fd552637a1ede92deee9545755b6cf3
-  rails_semantic_logger (4.19.0) sha256=e75e562c68a32abb6a8615940afd7d40c082cff786b8d7b50ff1f7462eff3c16
+  rails_semantic_logger (4.20.0) sha256=140831362a263607b193a4f6641ccc3da6f7315649a5678318e0150f1d59d9df
   railties (8.1.3) sha256=913eb0e0cb520aac687ffd74916bd726d48fa21f47833c6292576ef6a286de22
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
@@ -1026,8 +1026,8 @@ CHECKSUMS
   sass-embedded (1.97.1-x86_64-linux-musl) sha256=c383026b7a70d52b0ef4be73c45cc1399fc65f95e851b0fc9265c8d89f151556
   sass-listen (4.0.0) sha256=ae9dcb76dd3e234329e5ba6e213f48e532c5a3e7b0b4d8a87f13aaca0cc18377
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
-  selenium-webdriver (4.42.0) sha256=0eb7e1d0f983b06cdc5f4ec6e7fa4941889ef687957c531e5445234e5b9adc77
-  semantic_logger (4.17.0) sha256=c54b60d8596abe2e22bd4f20648d4f6c46e4287fba357779c7932335c8d130e9
+  selenium-webdriver (4.43.0) sha256=a634377b964b701c6ac0a009ce3a08fa34ec1e1e7fe9a6d57e3088d14529a65c
+  semantic_logger (4.18.0) sha256=b00e4480b63d844628ce383e80d564626fe2fdb525ecf378dbc4df7828dead8b
   solid_cable (3.0.12) sha256=a168a54731a455d5627af48d8441ea3b554b8c1f6e6cd6074109de493e6b0460
   solid_cache (1.0.10) sha256=bc05a2fb3ac78a6f43cbb5946679cf9db67dd30d22939ededc385cb93e120d41
   solid_queue (1.4.0) sha256=e6a18d196f0b27cb6e3c77c5b31258b05fb634f8ed64fb1866ed164047216c2a

lib/pdf_filler/packet_pdf.rb

@@ -21,7 +21,8 @@ def hash_for_fillable_pdf
         # is_volunteering: @screener.volunteering?,
         operating_a_homeschool: @nc_screener.teaches_homeschool_yes?,
         phone_number: @screener.phone_number,
-        preventing_work_write_in: @screener.preventing_work_write_in,
+        preventing_work_write_in: @screener.preventing_work_additional_info,
+        preventing_work_other_write_in: @screener.preventing_work_write_in,
         receiving_benefits_disability_medicaid: @screener.receiving_benefits_disability_medicaid_yes?,
         receiving_benefits_disability_pension: @screener.receiving_benefits_disability_pension_yes?,
         receiving_benefits_insurance_payments: @screener.receiving_benefits_insurance_payments_yes?,

spec/lib/pdf_filler/packet_pdf_spec.rb

@@ -57,6 +57,7 @@
         screener.confirmation_code = "ABQ39L"
         nc_screener.homeschool_name = "Small Fry"
         screener.preventing_work_write_in = "Back pain"
+        screener.preventing_work_additional_info = "I am carrying the weight of the world on my back."
         screener.receiving_benefits_write_in = "Other disability"
         screener.ssn_last_four = "1111"
         # screener.volunteering_org_name = "Muffins for Mums"
@@ -70,7 +71,8 @@
         expect(result[:email]).to eq("nigella@example.com")
         expect(result[:homeschool_name]).to eq("Small Fry")
         expect(result[:phone_number]).to eq("(919) 555-1234")
-        expect(result[:preventing_work_write_in]).to eq("Back pain")
+        expect(result[:preventing_work_other_write_in]).to eq("Back pain")
+        expect(result[:preventing_work_write_in]).to eq("I am carrying the weight of the world on my back.")
         expect(result[:receiving_benefits_write_in]).to eq("Other disability")
         expect(result[:ssn_last_4]).to eq("1111")
         # expect(result[:volunteering_org_name]).to eq("Muffins for Mums")