Update more routing and tests

communitiesuk · Feb 24, 2025 · ea3c35d · ea3c35d
1 parent 3314ad0
commit ea3c35d
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 12 deletions.
diff --git a/app/models/form/lettings/pages/no_address_found.rb b/app/models/form/lettings/pages/no_address_found.rb
@@ -13,9 +13,12 @@ def initialize(id, hsh, subsection)
       "arguments" => [],
     }
     @depends_on = [
-      { "is_supported_housing?" => false, "uprn_known" => nil, "address_options_present?" => false, "is_new_build?" => false },
-      { "is_supported_housing?" => false, "uprn_known" => 0, "address_options_present?" => false, "is_new_build?" => false },
-      { "is_supported_housing?" => false, "uprn_confirmed" => 0, "address_options_present?" => false, "is_new_build?" => false },
+      { "is_supported_housing?" => false, "uprn_known" => nil, "address_options_present?" => false, "is_new_build?" => false, "form.start_year_2025_or_later?" => true },
+      { "is_supported_housing?" => false, "uprn_known" => 0, "address_options_present?" => false, "is_new_build?" => false, "form.start_year_2025_or_later?" => true },
+      { "is_supported_housing?" => false, "uprn_confirmed" => 0, "address_options_present?" => false, "is_new_build?" => false, "form.start_year_2025_or_later?" => true },
+      { "is_supported_housing?" => false, "uprn_known" => nil, "address_options_present?" => false, "form.start_year_2025_or_later?" => false },
+      { "is_supported_housing?" => false, "uprn_known" => 0, "address_options_present?" => false, "form.start_year_2025_or_later?" => false },
+      { "is_supported_housing?" => false, "uprn_confirmed" => 0, "address_options_present?" => false, "form.start_year_2025_or_later?" => false },
     ]
   end
 

diff --git a/app/models/form/lettings/pages/uprn.rb b/app/models/form/lettings/pages/uprn.rb
@@ -3,7 +3,6 @@ def initialize(id, hsh, subsection)
     super
     @id = "uprn"
     @copy_key = "lettings.property_information.uprn"
-    @depends_on = [{ "is_supported_housing?" => false, "is_new_build?" => false }]
   end
 
   def questions
@@ -30,4 +29,12 @@ def skip_href(log = nil)
       "address"
     end
   end
+
+  def routed_to?(log, _)
+    return false unless super
+    return false if log.is_supported_housing?
+    return false if log.is_new_build? && log.form.start_year_2025_or_later?
+
+    true
+  end
 end
diff --git a/spec/models/form/lettings/pages/no_address_found_spec.rb b/spec/models/form/lettings/pages/no_address_found_spec.rb
@@ -25,15 +25,30 @@
     expect(page.depends_on).to eq([{ "address_options_present?" => false,
                                      "is_supported_housing?" => false,
                                      "uprn_known" => nil,
-                                     "is_new_build?" => false },
+                                     "is_new_build?" => false,
+                                     "form.start_year_2025_or_later?" => true },
                                    { "address_options_present?" => false,
                                      "is_supported_housing?" => false,
                                      "uprn_known" => 0,
-                                     "is_new_build?" => false },
+                                     "is_new_build?" => false,
+                                     "form.start_year_2025_or_later?" => true },
                                    { "address_options_present?" => false,
                                      "is_supported_housing?" => false,
                                      "uprn_confirmed" => 0,
-                                     "is_new_build?" => false }])
+                                     "is_new_build?" => false,
+                                     "form.start_year_2025_or_later?" => true },
+                                   { "address_options_present?" => false,
+                                     "is_supported_housing?" => false,
+                                     "uprn_known" => nil,
+                                     "form.start_year_2025_or_later?" => false },
+                                   { "address_options_present?" => false,
+                                     "is_supported_housing?" => false,
+                                     "uprn_known" => 0,
+                                     "form.start_year_2025_or_later?" => false },
+                                   { "address_options_present?" => false,
+                                     "is_supported_housing?" => false,
+                                     "uprn_confirmed" => 0,
+                                     "form.start_year_2025_or_later?" => false }])
   end
 
   it "is interruption screen page" do

diff --git a/spec/models/form/lettings/pages/uprn_spec.rb b/spec/models/form/lettings/pages/uprn_spec.rb
@@ -29,10 +29,6 @@
     expect(page.description).to be_nil
   end
 
-  it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "is_supported_housing?" => false, "is_new_build?" => false }])
-  end
-
   describe "has correct skip_href" do
     context "when log is nil" do
       it "is nil" do

diff --git a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
@@ -179,7 +179,7 @@
 
             field_89: "2",
 
-            field_100: "5",
+            field_100: "6",
             field_101: "2",
             field_102: "31",
             field_104: "3",