feat: update tests

spec/factories/scheme.rb

@@ -8,6 +8,7 @@ FactoryBot.define do
     arrangement_type { "D" }
     intended_stay { %w[M P S V X].sample }
     primary_client_group { %w[O H M L A G F B D E I S N R Q P X].sample }
+    has_other_client_group { 1 }
     secondary_client_group { %w[O H M L A G F B D E I S N R Q P X].sample }
     owning_organisation { FactoryBot.create(:organisation) }
     confirmed { true }
@@ -19,6 +20,7 @@ FactoryBot.define do
       scheme_type { 7 }
       intended_stay { "M" }
       primary_client_group { "G" }
+      has_other_client_group { 1 }
       secondary_client_group { "M" }
     end
 

spec/features/schemes_spec.rb

@@ -149,20 +149,44 @@ RSpec.describe "Schemes scheme Features" do
         context "when I click to see individual scheme" do
           let(:scheme) { schemes.first }
 
-          before do
-            click_link(scheme.service_name)
+          context "when there is a secondary client group" do
+            before do
+              click_link(scheme.service_name)
+            end
+            it "shows me details about the selected scheme" do
+              expect(page).to have_content(schemes.first.id_to_display)
+              expect(page).to have_content(schemes.first.service_name)
+              expect(page).to have_content(schemes.first.sensitive)
+              expect(page).to have_content(schemes.first.scheme_type)
+              expect(page).to have_content(schemes.first.registered_under_care_act)
+              expect(page).to have_content(schemes.first.primary_client_group)
+              expect(page).to have_content(schemes.first.has_other_client_group)
+              expect(page).to have_content(schemes.first.secondary_client_group)
+              expect(page).to have_content(schemes.first.support_type)
+              expect(page).to have_content(schemes.first.intended_stay)
+            end
           end
 
-          it "shows me details about the selected scheme" do
-            expect(page).to have_content(schemes.first.id_to_display)
-            expect(page).to have_content(schemes.first.service_name)
-            expect(page).to have_content(schemes.first.sensitive)
-            expect(page).to have_content(schemes.first.scheme_type)
-            expect(page).to have_content(schemes.first.registered_under_care_act)
-            expect(page).to have_content(schemes.first.primary_client_group)
-            expect(page).to have_content(schemes.first.secondary_client_group)
-            expect(page).to have_content(schemes.first.support_type)
-            expect(page).to have_content(schemes.first.intended_stay)
+          context "when there is no secondary client group" do
+            before do
+              scheme.has_other_client_group = "No"
+              scheme.secondary_client_group = nil
+              scheme.save!
+              click_link(scheme.service_name)
+            end
+
+            it "shows me details about the selected scheme" do
+              expect(page).to have_content(schemes.first.id_to_display)
+              expect(page).to have_content(schemes.first.service_name)
+              expect(page).to have_content(schemes.first.sensitive)
+              expect(page).to have_content(schemes.first.scheme_type)
+              expect(page).to have_content(schemes.first.registered_under_care_act)
+              expect(page).to have_content(schemes.first.primary_client_group)
+              expect(page).to have_content(schemes.first.has_other_client_group)
+              expect(page).not_to have_content("Secondary client group")
+              expect(page).to have_content(schemes.first.support_type)
+              expect(page).to have_content(schemes.first.intended_stay)
+            end
           end
 
           context "when I click to go back" do
@@ -685,23 +709,50 @@ RSpec.describe "Schemes scheme Features" do
 
           before do
             FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), location: deactivated_location)
-            click_link(scheme.service_name)
           end
 
-          it "shows me details about the selected scheme" do
-            expect(page).to have_content(schemes.first.id_to_display)
-            expect(page).to have_content(schemes.first.service_name)
-            expect(page).to have_content(schemes.first.sensitive)
-            expect(page).to have_content(schemes.first.scheme_type)
-            expect(page).to have_content(schemes.first.registered_under_care_act)
-            expect(page).to have_content(schemes.first.primary_client_group)
-            expect(page).to have_content(schemes.first.secondary_client_group)
-            expect(page).to have_content(schemes.first.support_type)
-            expect(page).to have_content(schemes.first.intended_stay)
+          context "when there is a secondary client group" do
+            before do
+              click_link(scheme.service_name)
+            end
+            it "shows me details about the selected scheme" do
+              expect(page).to have_content(schemes.first.id_to_display)
+              expect(page).to have_content(schemes.first.service_name)
+              expect(page).to have_content(schemes.first.sensitive)
+              expect(page).to have_content(schemes.first.scheme_type)
+              expect(page).to have_content(schemes.first.registered_under_care_act)
+              expect(page).to have_content(schemes.first.primary_client_group)
+              expect(page).to have_content(schemes.first.has_other_client_group)
+              expect(page).to have_content(schemes.first.secondary_client_group)
+              expect(page).to have_content(schemes.first.support_type)
+              expect(page).to have_content(schemes.first.intended_stay)
+            end
           end
 
+          context "when there is no secondary client group" do
+            before do
+              scheme.has_other_client_group = "No"
+              scheme.secondary_client_group = nil
+              scheme.save!
+              click_link(scheme.service_name)
+            end
+
+            it "shows me details about the selected scheme" do
+              expect(page).to have_content(schemes.first.id_to_display)
+              expect(page).to have_content(schemes.first.service_name)
+              expect(page).to have_content(schemes.first.sensitive)
+              expect(page).to have_content(schemes.first.scheme_type)
+              expect(page).to have_content(schemes.first.registered_under_care_act)
+              expect(page).to have_content(schemes.first.primary_client_group)
+              expect(page).to have_content(schemes.first.has_other_client_group)
+              expect(page).not_to have_content("Secondary client group")
+              expect(page).to have_content(schemes.first.support_type)
+              expect(page).to have_content(schemes.first.intended_stay)
+            end
+          end
           context "when I click to change scheme name" do
             before do
+              click_link(scheme.service_name)
               click_link("Change", href: "/schemes/#{scheme.id}/edit-name", match: :first)
             end
 
@@ -734,6 +785,7 @@ RSpec.describe "Schemes scheme Features" do
 
           context "when I click to see locations" do
             before do
+              click_link(scheme.service_name)
               click_link "Locations"
             end
 

spec/fixtures/files/lettings_logs_download.csv

@@ -1,2 +1,2 @@
 id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,needstype,renewal,startdate,rent_type_detail,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,hhmemb,relat2,age2,sex2,retirement_value_check,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,is_previous_la_inferred,prevloc_label,prevloc,illness_type_1,illness_type_2,is_la_inferred,la_label,la,postcode_known,postcode_full,previous_la_known,wchair,preg_occ,cbl,earnings,incfreq,net_income_value_check,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,first_time_property_let_as_social_housing,unitletas,builtype,voiddate,renttype,lettype,totchild,totelder,totadult,net_income_known,nocharge,is_carehome,household_charge,referral,tshortfall,chcharge,ppcodenk,age1_known,age2_known,age3_known,age4_known,age5_known,age6_known,age7_known,age8_known,ethnic_group,letting_allocation_unknown,details_known_2,details_known_3,details_known_4,details_known_5,details_known_6,details_known_7,details_known_8,has_benefits,wrent,wscharge,wpschrge,wsupchrg,wtcharge,wtshortfall,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,rent_value_check,old_form_id,lar,irproduct,old_id,joint,tshortfall_known,sheltered,pregnancy_value_check,hhtype,new_old,vacdays,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,unresolved,updated_by_id,uprn,uprn_known,uprn_confirmed,address_line1,address_line2,town_or_city,county,carehome_charges_value_check,status_cache,discarded_at,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
-{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,Supported housing,,2 October 2021,London Affordable Rent,,,,,,,,,,,,,,,,,,,,No,,,,,No,Westminster,E09000033,,SE1 1TE,,No,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,,,,,,,,,not_started,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}
+{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,Supported housing,,2 October 2021,London Affordable Rent,,,,,,,,,,,,,,,,,,,,No,,,,,No,Westminster,E09000033,,SE1 1TE,,No,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,,,,,,,,,not_started,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,{scheme_primary_client_group},{scheme_has_other_client_group},{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}

spec/fixtures/files/lettings_logs_download_codes_only.csv

@@ -1,2 +1,2 @@
 id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,needstype,renewal,startdate,rent_type_detail,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,hhmemb,relat2,age2,sex2,retirement_value_check,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,is_previous_la_inferred,prevloc_label,prevloc,illness_type_1,illness_type_2,is_la_inferred,la_label,la,postcode_known,postcode_full,previous_la_known,wchair,preg_occ,cbl,earnings,incfreq,net_income_value_check,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,first_time_property_let_as_social_housing,unitletas,builtype,voiddate,renttype,lettype,totchild,totelder,totadult,net_income_known,nocharge,is_carehome,household_charge,referral,tshortfall,chcharge,ppcodenk,age1_known,age2_known,age3_known,age4_known,age5_known,age6_known,age7_known,age8_known,ethnic_group,letting_allocation_unknown,details_known_2,details_known_3,details_known_4,details_known_5,details_known_6,details_known_7,details_known_8,has_benefits,wrent,wscharge,wpschrge,wsupchrg,wtcharge,wtshortfall,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,rent_value_check,old_form_id,lar,irproduct,old_id,joint,tshortfall_known,sheltered,pregnancy_value_check,hhtype,new_old,vacdays,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,unresolved,updated_by_id,uprn,uprn_known,uprn_confirmed,address_line1,address_line2,town_or_city,county,carehome_charges_value_check,status_cache,discarded_at,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
-{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,false,DLUHC,DLUHC,2021,2,,2 October 2021,2,,,,,,,,,,,,,,,,,,,,false,,,,,false,Westminster,E09000033,,SE1 1TE,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,,,,,,,,,not_started,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},0,1,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,6,A,Westminster,{location_startdate}
+{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,false,DLUHC,DLUHC,2021,2,,2 October 2021,2,,,,,,,,,,,,,,,,,,,,false,,,,,false,Westminster,E09000033,,SE1 1TE,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,9,1,,,,,,,,,,,,,,,,not_started,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},0,1,DLUHC,{scheme_primary_client_group},{scheme_has_other_client_group},{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,6,A,Westminster,{location_startdate}

spec/fixtures/files/lettings_logs_download_non_support.csv

@@ -1,2 +1,2 @@
 id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,renewal,startdate,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,relat2,age2,sex2,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,prevloc_label,illness_type_1,illness_type_2,la_label,postcode_full,wchair,preg_occ,cbl,earnings,incfreq,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,unitletas,builtype,voiddate,lettype,nocharge,household_charge,referral,tshortfall,chcharge,ppcodenk,ethnic_group,has_benefits,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,lar,irproduct,joint,sheltered,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,uprn,uprn_known,address_line1,address_line2,town_or_city,county,carehome_charges_value_check,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
-{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,,2 October 2021,,,,,,,,,,,,,,,,,,,,,Westminster,SE1 1TE,No,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,0,,,,,,,0,0,,,,,,,,,,,,,,,,,,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}
+{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,,2 October 2021,,,,,,,,,,,,,,,,,,,,,Westminster,SE1 1TE,No,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,0,,,,,,,0,0,,,,,,,,,,,,,,,,,,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,{scheme_primary_client_group},{scheme_has_other_client_group},{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}

spec/models/lettings_log_spec.rb

@@ -2896,6 +2896,7 @@ RSpec.describe LettingsLog do
         expected_content.sub!(/\{scheme_service_name\}/, scheme["service_name"].to_s)
         expected_content.sub!(/\{scheme_sensitive\}/, scheme["sensitive"].to_s)
         expected_content.sub!(/\{scheme_primary_client_group\}/, scheme["primary_client_group"].to_s)
+        expected_content.sub!(/\{scheme_has_other_client_group\}/, scheme.has_other_client_group.to_s)
         expected_content.sub!(/\{scheme_secondary_client_group\}/, scheme["secondary_client_group"].to_s)
         expected_content.sub!(/\{scheme_support_type\}/, scheme["support_type"].to_s)
         expected_content.sub!(/\{scheme_intended_stay\}/, scheme["intended_stay"].to_s)
@@ -2940,6 +2941,7 @@ RSpec.describe LettingsLog do
         expected_content.sub!(/\{scheme_service_name\}/, scheme.service_name.to_s)
         expected_content.sub!(/\{scheme_sensitive\}/, scheme.sensitive_before_type_cast.to_s)
         expected_content.sub!(/\{scheme_primary_client_group\}/, scheme.primary_client_group_before_type_cast.to_s)
+        expected_content.sub!(/\{scheme_has_other_client_group\}/, scheme.has_other_client_group_before_type_cast.to_s)
         expected_content.sub!(/\{scheme_secondary_client_group\}/, scheme.secondary_client_group_before_type_cast.to_s)
         expected_content.sub!(/\{scheme_support_type\}/, scheme.support_type_before_type_cast.to_s)
         expected_content.sub!(/\{scheme_intended_stay\}/, scheme.intended_stay_before_type_cast.to_s)