Merge remote-tracking branch 'origin/main' into WRSAT-443-add-pdf-attachment-to-email

anisharamnani · anisharamnani · commit b981cf7a9abc · 2026-04-03T14:57:42.000-04:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -207,7 +207,7 @@ GEM
       rake (~> 13.3)
     googleapis-common-protos-types (1.22.0)
       google-protobuf (~> 4.26)
-    grover (1.2.9)
+    grover (1.2.10)
       nokogiri (~> 1)
     hexapdf (1.6.0)
       cmdparse (~> 3.0, >= 3.0.3)
@@ -862,7 +862,7 @@ CHECKSUMS
   google-protobuf (4.34.0-x86_64-linux-gnu) sha256=bbb333fbe79c16f35a2e2154cf29f3ce26f60390dba286b339861206d5435ef9
   google-protobuf (4.34.0-x86_64-linux-musl) sha256=0b75858a388b17e73aa4176df2e722762dbc92551b7075fdc562d33c1c6de0b0
   googleapis-common-protos-types (1.22.0) sha256=f97492b77bd6da0018c860d5004f512fe7cd165554d7019a8f4df6a56fbfc4c7
-  grover (1.2.9) sha256=d4cd3e9f697cc073166a6d2c6163101a4ffa5c4b829d72613ed9148da1ec339b
+  grover (1.2.10) sha256=989b21d1a0048e3793b9939b392152fb309c7a107911ad04c10e422de4e1479b
   hexapdf (1.6.0) sha256=78e32fc5a088a347bcb2cad4ab327cbdd0a0c5e1e77963b52460eef78d402582
   highline (3.1.2) sha256=67cbd34d19f6ef11a7ee1d82ffab5d36dfd5b3be861f450fc1716c7125f4bb4a
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
diff --git a/app/assets/images/warning-sign.svg b/app/assets/images/warning-sign.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="85" height="85" viewBox="0 0 85 85" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M45.143 70.4327C54.9529 69.7649 64.9666 66.8655 70.6824 59.6514C76.6519 52.1171 77.0432 42.4795 74.1531 33.8181C71.1256 24.7452 65.3273 15.6794 55.1061 12.9718C45.2108 10.3507 35.4261 16.0078 26.7164 21.2525C18.5399 26.1762 10.3203 32.1119 9.01895 40.7244C7.71403 49.3601 13.3086 57.2458 20.3968 63.075C27.0752 68.5674 35.9277 71.0601 45.143 70.4327Z" fill="#00A88F"/>
+  <path d="M48.8284 53.684H46.9111V69.981H48.8284V53.684Z" fill="white" stroke="#121111" stroke-width="2.4391" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M66.9552 36.0801L50.3964 52.6389C49.0027 54.0326 46.7351 54.0326 45.3414 52.6389L28.7826 36.0801C27.3889 34.6864 27.3889 32.4188 28.7826 31.0251L45.3414 14.4663C46.7351 13.0726 49.0027 13.0726 50.3964 14.4663L66.9552 31.0251C68.3489 32.4188 68.3489 34.6786 66.9552 36.0801Z" fill="#FFC240" stroke="#121111" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M46.5155 42.6614C46.1386 42.3432 45.9502 41.9613 45.9502 41.5079C45.9502 41.0783 46.1386 40.6964 46.5155 40.3861C46.8923 40.0759 47.3352 39.9088 47.8533 39.9088C48.3904 39.9088 48.8425 40.0679 49.2194 40.3861C49.5963 40.7043 49.7848 41.0783 49.7848 41.5079C49.7848 41.9613 49.5963 42.3432 49.2194 42.6614C48.8425 42.9796 48.3904 43.1388 47.8533 43.1388C47.3352 43.1388 46.8923 42.9796 46.5155 42.6614ZM47.0808 37.5778C46.883 37.4346 46.7793 37.2437 46.7604 37.005L46.1857 28.055V25.374C46.1857 24.9762 46.3459 24.642 46.6662 24.3716C46.9866 24.1011 47.3823 23.9658 47.8533 23.9658C48.3244 23.9658 48.7107 24.1011 49.0216 24.3716C49.3325 24.642 49.4832 24.9762 49.4832 25.374V28.0629L48.9085 37.013C48.8897 37.2516 48.7861 37.4346 48.6071 37.5858C48.4281 37.729 48.1737 37.8006 47.8533 37.8006C47.533 37.7926 47.2693 37.721 47.0808 37.5778Z" fill="#121111" stroke="#121111" stroke-width="1.5494" stroke-miterlimit="10"/>
+</svg>
diff --git a/app/assets/images/work-warning.svg b/app/assets/images/work-warning.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="85" height="85" viewBox="0 0 85 85" fill="none">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M45.143 70.4327C54.9529 69.7649 64.9666 66.8655 70.6824 59.6514C76.6519 52.1171 77.0432 42.4795 74.1531 33.8181C71.1256 24.7452 65.3273 15.6794 55.1061 12.9718C45.2108 10.3507 35.4261 16.0078 26.7164 21.2525C18.5399 26.1762 10.3203 32.1119 9.01895 40.7244C7.71403 49.3601 13.3086 57.2458 20.3968 63.075C27.0752 68.5674 35.9277 71.0601 45.143 70.4327Z" fill="#00A88F"/>
+  <rect x="20.5742" y="29.6006" width="52.4737" height="30.8484" rx="2.5" fill="#80DDFF" stroke="#121111" stroke-width="3"/>
+  <path d="M36.9385 28.1007V23.5789C36.9385 21.922 38.2816 20.5789 39.9385 20.5789H54.6236C56.2804 20.5789 57.6236 21.922 57.6236 23.5789V28.1007" stroke="#121111" stroke-width="3"/>
+  <line x1="29.9775" y1="29.981" x2="29.9775" y2="60.0684" stroke="black" stroke-width="3"/>
+  <line x1="64.7656" y1="30.9214" x2="64.7656" y2="61.0088" stroke="black" stroke-width="3"/>
+  <circle cx="65.316" cy="55.0001" r="13.7105" fill="white" stroke="black" stroke-width="3"/>
+  <path d="M64.4979 56.1956C64.2831 56.0844 64.1706 55.9362 64.1501 55.751L63.5264 48.8051V46.7244C63.5264 46.4157 63.7002 46.1564 64.0479 45.9465C64.3956 45.7366 64.825 45.6316 65.3363 45.6316C65.8476 45.6316 66.2668 45.7366 66.6043 45.9465C66.9417 46.1564 67.1053 46.4157 67.1053 46.7244V48.8113L66.4816 55.7572C66.4611 55.9424 66.3487 56.0844 66.1544 56.2017C65.9601 56.3129 65.684 56.3684 65.3363 56.3684C64.9886 56.3623 64.7024 56.3067 64.4979 56.1956Z" fill="#121111"/>
+  <path d="M63.5264 59.035C63.5264 59.5375 63.7022 59.9606 64.0539 60.3132C64.4057 60.6658 64.819 60.8421 65.3026 60.8421C65.8039 60.8421 66.2259 60.6658 66.5776 60.3132C66.9294 59.9606 67.1053 59.5375 67.1053 59.035C67.1053 58.559 66.9294 58.1447 66.5776 57.7921C66.2259 57.4395 65.8039 57.2632 65.3026 57.2632C64.819 57.2632 64.4057 57.4483 64.0539 57.7921C63.7022 58.1359 63.5264 58.559 63.5264 59.035Z" fill="#121111"/>
+</svg>
diff --git a/app/controllers/basic_info_case_number_controller.rb b/app/controllers/basic_info_case_number_controller.rb
@@ -1,4 +1,4 @@
-class BasicInfoCaseNumberController < QuestionController
+class BasicInfoCaseNumberController < ExemptionAwareQuestionController
   include BasicInfoConcern
 
   def self.attributes_edited
diff --git a/app/controllers/basic_info_details_controller.rb b/app/controllers/basic_info_details_controller.rb
@@ -1,4 +1,4 @@
-class BasicInfoDetailsController < QuestionController
+class BasicInfoDetailsController < ExemptionAwareQuestionController
   include BasicInfoConcern
   include DateHelper
 
diff --git a/app/controllers/basic_info_email_controller.rb b/app/controllers/basic_info_email_controller.rb
@@ -1,4 +1,4 @@
-class BasicInfoEmailController < QuestionController
+class BasicInfoEmailController < ExemptionAwareQuestionController
   include BasicInfoConcern
 
   before_action :set_from_download_form
diff --git a/app/controllers/basic_info_email_nudge_controller.rb b/app/controllers/basic_info_email_nudge_controller.rb
@@ -1,7 +1,7 @@
-class BasicInfoEmailNudgeController < QuestionController
+class BasicInfoEmailNudgeController < ExemptionAwareQuestionController
   include BasicInfoConcern
 
   def self.show?(screener)
-    screener.email.blank?
+    screener.email.blank? && super
   end
 end
diff --git a/app/controllers/basic_info_milestone_controller.rb b/app/controllers/basic_info_milestone_controller.rb
@@ -1,3 +1,3 @@
-class BasicInfoMilestoneController < QuestionController
+class BasicInfoMilestoneController < ExemptionAwareQuestionController
   include BasicInfoConcern
 end
diff --git a/app/controllers/basic_info_ssn_controller.rb b/app/controllers/basic_info_ssn_controller.rb
@@ -1,8 +1,8 @@
-class BasicInfoSsnController < QuestionController
+class BasicInfoSsnController < ExemptionAwareQuestionController
   include BasicInfoConcern
 
   def self.show?(screener)
-    screener.case_number.blank?
+    screener.case_number.blank? && super
   end
 
   def self.attributes_edited
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
diff --git a/app/controllers/concerns/basic_info_concern.rb b/app/controllers/concerns/basic_info_concern.rb
@@ -8,14 +8,4 @@ def progress_bar_step
   def section_name
     I18n.t("general.basic_information")
   end
-
-  included do
-    singleton_class.prepend(ClassMethodsOverride)
-  end
-
-  module ClassMethodsOverride
-    def show?(screener)
-      !!(screener&.exempt_from_work_rules? && super)
-    end
-  end
 end
diff --git a/app/controllers/download_form_controller.rb b/app/controllers/download_form_controller.rb
@@ -1,14 +1,10 @@
-class DownloadFormController < QuestionController
+class DownloadFormController < ExemptionAwareQuestionController
   def show_progress_bar
     false
   end
 
   before_action :email_pdf
 
-  def show?(screener)
-    !!(screener&.exempt_from_work_rules? && super)
-  end
-
   def email_pdf
     return if current_screener.email.blank?
     outgoing_email = OutgoingEmail.create(screener: current_screener)
diff --git a/app/controllers/exemption_aware_question_controller.rb b/app/controllers/exemption_aware_question_controller.rb
@@ -0,0 +1,5 @@
+class ExemptionAwareQuestionController < QuestionController
+  def self.show?(screener)
+    screener&.exempt_from_work_rules?
+  end
+end
diff --git a/app/controllers/navigation/screener_navigation.rb b/app/controllers/navigation/screener_navigation.rb
@@ -28,6 +28,7 @@ class ScreenerNavigation < ControllerNavigation::ControllerNavigation
       ControllerNavigation::NavigationStep.new(BasicInfoEmailNudgeController),
       ControllerNavigation::NavigationStep.new(BasicInfoCaseNumberController),
       ControllerNavigation::NavigationStep.new(BasicInfoSsnController),
+      ControllerNavigation::NavigationStep.new(WorkRulesApplyUnmetController),
       ControllerNavigation::NavigationStep.new(DownloadFormController),
       ControllerNavigation::NavigationStep.new(NewResponseController)
     ].freeze
diff --git a/app/controllers/work_rules_apply_unmet_controller.rb b/app/controllers/work_rules_apply_unmet_controller.rb
@@ -0,0 +1,9 @@
+class WorkRulesApplyUnmetController < QuestionController
+  def show_progress_bar
+    false
+  end
+
+  def self.show?(screener)
+    !screener&.exempt_from_work_rules?
+  end
+end
diff --git a/app/views/download_form/edit.html.erb b/app/views/download_form/edit.html.erb
@@ -11,7 +11,7 @@
 
 <% unless has_email %>
   <div>
-    <%= link_to("/download-form", class: "button button--primary spacing-below-0") do %>
+    <%= link_to(generate_pdf_path, class: "button button--primary spacing-below-0") do %>
       <i class="button__icon--left icon-get_app"></i>
       <%= t("views.download_form.edit.download_form") %>
     <% end %>
diff --git a/app/views/work_rules_apply_unmet/edit.html.erb b/app/views/work_rules_apply_unmet/edit.html.erb
@@ -0,0 +1,19 @@
+<% content_for :question_title, t("views.work_rules_apply_unmet.edit.title") %>
+
+<h1 class="h2"><%= content_for(:question_title) %></h1>
+<p><%= t("views.work_rules_apply_unmet.edit.title_help_text") %></p>
+
+<div class="notice white">
+  <%= image_tag "warning-sign.svg", class: "illustration left-justified" %>
+  <h2><%= t("views.work_rules_apply_unmet.edit.instructions_title") %></h2>
+  <p><%= t("views.work_rules_apply_unmet.edit.instructions_html") %></p>
+</div>
+<div class="notice white">
+  <%= image_tag "work-warning.svg", class: "illustration left-justified" %>
+  <h2><%= t("views.work_rules_apply_unmet.edit.unexpected_problems_title") %></h2>
+  <p><%= t("views.work_rules_apply_unmet.edit.unexpected_problems_html") %></p>
+</div>
+
+<div class="spacing-above-60">
+  <%= render "shared/continue_button" %>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -362,3 +362,19 @@ en:
         title_help_text_html: |
           <p>We didn’t find an exemption for you, so you may need to follow SNAP work rules.</p>
           <p>Based on what you shared, you may already meet the requirements to get SNAP.</p>
+    work_rules_apply_unmet:
+      edit:
+        instructions_html: |
+          <p>You can keep your benefits if you tell your agency that you are doing <strong>at least one</strong> of the following things:</p>
+          <ul class='list--bulleted'>
+            <li>Working, volunteering, or doing job training for a total of <strong>at least 20 hours a week, OR</strong></li>
+            <li>Earning <strong>at least $217.50 a week.</strong></li>
+          </ul>
+          <p>You can <strong>only get SNAP</strong> for 3 months until Dec. 31, 2027, when you are not doing one of those things.</p>
+          <p><strong>If you lose SNAP</strong> and then start doing one of those things, you can reapply for benefits. You can also <strong>reapply for SNAP</strong> if your situation changes so that the work rules don’t apply to you.</p>
+          <p><strong>If you start doing one of those things and you weren’t before,</strong> send proof to your SNAP agency.</p>
+        instructions_title: Avoid a time limit on your SNAP benefits
+        title: You may need to follow the SNAP work rules
+        title_help_text: If something changes about your situation and you cannot work at least 20 hours a week, every week, please tell your SNAP agency.
+        unexpected_problems_html: Unexpected problems happen, like a family emergency or your car breaking down. If you have a "good cause" reason why you could not work 20 hours a week in a month, please let your SNAP agency know. If you have any documents you have that can help prove what happened, that can help them understand your situation.
+        unexpected_problems_title: If you miss your hours in a month but you had a good reason, report it to your SNAP agency
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -361,3 +361,19 @@ es:
         title_help_text_html: |
           <p>No hemos encontrado una exención para usted, por lo que es posible que deba cumplir con las reglas de trabajo de SNAP.</p>
           <p>Según sus respuestas, es posible que ya esté cumpliendo con estas reglas y que pueda recibir los beneficios de SNAP.</p>
+    work_rules_apply_unmet:
+      edit:
+        instructions_html: |
+          <p>Usted puede mantener sus beneficios de SNAP si su oficina sabe que usted está haciendo <strong>al menos una</strong> de las siguientes cosas:</p>
+          <ul class='list--bulleted'>
+            <li>Trabajar, hacer voluntariado o participar en capacitación laboral por un total de <strong>al menos 20 horas a la semana, o</strong></li>
+            <li>Ganar <strong>$217.50 a la semana.</strong></li>
+          </ul>
+          <p>Puede <strong>recibir los beneficios de SNAP</strong> por solo 3 meses, hasta el 31 de diciembre de 2027, si no cumple con una de esas actividades.</p>
+          <p>Si pierde <strong>sus beneficios de SNAP</strong> y luego comienza a cumplir con uno de estos requisitos, puede volver a solicitarlos. También puede volver a solicitar <strong>sus beneficios de SNAP</strong> si su situación cambia y las reglas de trabajo ya no se aplican en su caso.</p>
+          <p><strong>Si comienza a hacer alguna de estas actividades y antes no las realizaba,</strong> envíe sus comprobantes a su oficina de SNAP.</p>
+        instructions_title: Evite perder sus beneficios de SNAP y manténgalos por más tiempo
+        title: Es posible que tenga que cumplir con las reglas de trabajo de SNAP.
+        title_help_text: Si cambia algo en su situación y ya no puede trabajar al menos 20 horas a la semana, todas las semanas, por favor informe a su oficina de SNAP.
+        unexpected_problems_html: Sabemos que pueden ocurrir imprevistos, como una emergencia familiar o una falla en su carro. Si usted tiene una “razón válida” por la que no pudo trabajar 20 horas a la semana durante un mes, por favor infórmelo a su oficina de SNAP. Si tiene algún documento que ayude a comprobar lo ocurrido, puede enviarlo para que su oficina de SNAP pueda entender mejor su situación.
+        unexpected_problems_title: Si no cumple con sus horas de trabajo en un mes, pero tiene una razón válida, infórmelo a su oficina de SNAP.
diff --git a/spec/controllers/basic_info_case_number_controller_spec.rb b/spec/controllers/basic_info_case_number_controller_spec.rb
@@ -12,4 +12,8 @@
       expect(screener.reload.case_number).to eq "ABC-123"
     end
   end
+
+  describe ".show?" do
+    it_behaves_like "show? with work rules exemption only"
+  end
 end
diff --git a/spec/controllers/basic_info_details_controller_spec.rb b/spec/controllers/basic_info_details_controller_spec.rb
@@ -51,4 +51,8 @@
       expect(assigns(:model).errors[:birth_date]).to include(I18n.t("validations.date_missing_or_invalid"))
     end
   end
+
+  describe ".show?" do
+    it_behaves_like "show? with work rules exemption only"
+  end
 end
diff --git a/spec/controllers/basic_info_email_controller_spec.rb b/spec/controllers/basic_info_email_controller_spec.rb
@@ -83,4 +83,8 @@
 
     expect(screener.reload.confirmation_code).to be_present
   end
+
+  describe ".show?" do
+    it_behaves_like "show? with work rules exemption only"
+  end
 end
diff --git a/spec/controllers/basic_info_email_nudge_controller_spec.rb b/spec/controllers/basic_info_email_nudge_controller_spec.rb
@@ -16,4 +16,8 @@
       end
     end
   end
+
+  describe ".show?" do
+    it_behaves_like "show? with work rules exemption only"
+  end
 end
diff --git a/spec/controllers/basic_info_ssn_controller_spec.rb b/spec/controllers/basic_info_ssn_controller_spec.rb
@@ -12,4 +12,8 @@
       expect(screener.reload.ssn_last_four).to eq "4567"
     end
   end
+
+  describe ".show?" do
+    it_behaves_like "show? with work rules exemption only"
+  end
 end
diff --git a/spec/controllers/concerns/basic_info_concern_spec.rb b/spec/controllers/concerns/basic_info_concern_spec.rb
diff --git a/spec/controllers/download_form_controller_spec.rb b/spec/controllers/download_form_controller_spec.rb
@@ -22,24 +22,6 @@
   end
 
   describe ".show?" do
-    controller(DownloadFormController) do
-      def super_show_result
-        true
-      end
-
-      def show?(screener)
-        !!(screener&.exempt_from_work_rules? && super_show_result)
-      end
-    end
-
-    subject { controller.show?(screener) }
-
-    def set_super_result(value)
-      allow(controller).to receive(:super_show_result).and_return(value)
-    end
-
-    let(:screener) { instance_double("Screener") }
-
-    it_behaves_like "show? with work rules exemption"
+    it_behaves_like "show? with work rules exemption only"
   end
 end
diff --git a/spec/controllers/exemption_aware_question_controller_spec.rb b/spec/controllers/exemption_aware_question_controller_spec.rb
@@ -0,0 +1,32 @@
+require "rails_helper"
+
+RSpec.describe ExemptionAwareQuestionController, type: :controller do
+  # Minimal subclass so Rails can instantiate the controller
+  controller(ExemptionAwareQuestionController) do
+    def index
+      head :ok
+    end
+  end
+
+  let(:screener) { create(:screener) }
+
+  describe ".show?" do
+    subject { controller.class.show?(screener) }
+
+    context "when screener is exempt from work rules" do
+      before { screener.update!(preventing_work_place_to_sleep: "yes") }
+
+      it "returns true if parent allows showing" do
+        expect(described_class.show?(screener)).to eq(true)
+      end
+    end
+
+    context "when screener is not exempt from work rules" do
+      before { screener.update!(preventing_work_place_to_sleep: "no") }
+
+      it "returns false" do
+        expect(described_class.show?(screener)).to eq(false)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/work_rules_apply_unmet_controller_spec.rb b/spec/controllers/work_rules_apply_unmet_controller_spec.rb
@@ -0,0 +1,27 @@
+require "rails_helper"
+
+RSpec.describe WorkRulesApplyUnmetController, type: :controller do
+  describe ".show?" do
+    subject(:result) { described_class.show?(screener) }
+
+    context "when screener is not exempt" do
+      let(:screener) do
+        instance_double("Screener", exempt_from_work_rules?: false)
+      end
+
+      it "returns true" do
+        expect(result).to be true
+      end
+    end
+
+    context "when screener is exempt" do
+      let(:screener) do
+        instance_double("Screener", exempt_from_work_rules?: true)
+      end
+
+      it "returns false" do
+        expect(result).to be false
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/show_with_exemption.rb b/spec/support/shared_examples/show_with_exemption.rb
diff --git a/spec/support/shared_examples/show_with_exemption_only.rb b/spec/support/shared_examples/show_with_exemption_only.rb

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class BasicInfoCaseNumberController < QuestionController`
	`1`	`+class BasicInfoCaseNumberController < ExemptionAwareQuestionController`
`2`	`2`	`include BasicInfoConcern`
`3`	`3`
`4`	`4`	`def self.attributes_edited`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class BasicInfoDetailsController < QuestionController`
	`1`	`+class BasicInfoDetailsController < ExemptionAwareQuestionController`
`2`	`2`	`include BasicInfoConcern`
`3`	`3`	`include DateHelper`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class BasicInfoEmailController < QuestionController`
	`1`	`+class BasicInfoEmailController < ExemptionAwareQuestionController`
`2`	`2`	`include BasicInfoConcern`
`3`	`3`
`4`	`4`	`before_action :set_from_download_form`