Further test updates for deposit derivation change

spec/models/form/lettings/questions/address_line1_for_address_matcher_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe Form::Lettings::Questions::AddressLine1ForAddressMatcher, type: :
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/address_line1_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::AddressLine1, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/address_line2_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::AddressLine2, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/age1_known_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::Age1Known, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/age_known_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Questions::AgeKnown, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/age_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Form::Lettings::Questions::Age, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "when child" do

spec/models/form/lettings/questions/beds_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Beds, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct min" do

spec/models/form/lettings/questions/care_home_charges_value_check_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Form::Lettings::Questions::CareHomeChargesValueCheck, type: :mode
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/county_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Form::Lettings::Questions::County, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/created_by_id_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Form::Lettings::Questions::CreatedById, type: :model do
   end
 
   it "is marked as derived" do
-    expect(question.derived?).to be true
+    expect(question.derived?(nil)).to be true
   end
 
   def expected_option_for_users(users)

spec/models/form/lettings/questions/declaration_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/details_known_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Questions::DetailsKnown, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/ethnic_white_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::EthnicWhite, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do

spec/models/form/lettings/questions/gender_identity1_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Form::Lettings::Questions::GenderIdentity1, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/hb_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Hb, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/homeless_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Form::Lettings::Questions::Homeless, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/housingneeds_other_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::HousingneedsOther, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do

spec/models/form/lettings/questions/irproduct_other_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe Form::Lettings::Questions::IrproductOther, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end

spec/models/form/lettings/questions/is_carehome_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::IsCarehome, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do

spec/models/form/lettings/questions/joint_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe Form::Lettings::Questions::Joint, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with collection year on or after 2024" do

spec/models/form/lettings/questions/layear_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Layear, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do

spec/models/form/lettings/questions/letting_allocation_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::LettingAllocation, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do

spec/models/form/lettings/questions/managing_organisation_spec.rb

@@ -231,7 +231,7 @@ RSpec.describe Form::Lettings::Questions::ManagingOrganisation, type: :model do
   end
 
   it "is marked as derived" do
-    expect(question.derived?).to be true
+    expect(question.derived?(nil)).to be true
   end
 
   describe "#hidden_in_check_answers?" do

spec/models/form/lettings/questions/multiple_partners_value_check_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::MultiplePartnersValueCheck, type: :mod
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/nationality_spec.rb

@@ -43,6 +43,6 @@ RSpec.describe Form::Lettings::Questions::Nationality, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end

spec/models/form/lettings/questions/no_address_found_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Form::Lettings::Questions::NoAddressFound, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/offered_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe Form::Lettings::Questions::Offered, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do

spec/models/form/lettings/questions/partner_under16_value_check_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::PartnerUnder16ValueCheck, type: :model
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/person_gender_identity_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::PersonGenderIdentity, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with form year before 2024" do

spec/models/form/lettings/questions/person_relationship_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Questions::PersonRelationship, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/person_working_situation_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Lettings::Questions::PersonWorkingSituation, type: :model d
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/postcode_for_address_matcher_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe Form::Lettings::Questions::PostcodeForAddressMatcher, type: :mode
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/postcode_for_full_address_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Form::Lettings::Questions::PostcodeForFullAddress, type: :model d
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/ppcodenk_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::Ppcodenk, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/previous_la_known_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::PreviousLaKnown, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/previous_let_type_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Form::Lettings::Questions::PreviousLetType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer options" do

spec/models/form/lettings/questions/previous_tenure_renewal_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Form::Lettings::Questions::PreviousTenureRenewal, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/previous_tenure_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Form::Lettings::Questions::PreviousTenure, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/property_reference_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe Form::Lettings::Questions::PropertyReference, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "returns false for answer_selected" do

spec/models/form/lettings/questions/reasonpref_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::Reasonpref, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/renewal_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe Form::Lettings::Questions::Renewal, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with collection year on or after 2024" do

spec/models/form/lettings/questions/rent_type_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe Form::Lettings::Questions::RentType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the guidance partial" do

spec/models/form/lettings/questions/rsnvac_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Lettings::Questions::Rsnvac, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2023/24 form" do

spec/models/form/lettings/questions/scheme_id_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe Form::Lettings::Questions::SchemeId, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct inferred_answers" do

spec/models/form/lettings/questions/sheltered_spec.rb

@@ -69,6 +69,6 @@ RSpec.describe Form::Lettings::Questions::Sheltered, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end

spec/models/form/lettings/questions/stock_owner_spec.rb

@@ -250,7 +250,7 @@ RSpec.describe Form::Lettings::Questions::StockOwner, type: :model do
   end
 
   it "is marked as derived" do
-    expect(question.derived?).to be true
+    expect(question.derived?(nil)).to be true
   end
 
   describe "#hidden_in_check_answers?" do

spec/models/form/lettings/questions/tenancy_length_spec.rb

@@ -39,6 +39,6 @@ RSpec.describe Form::Lettings::Questions::TenancyLength, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end

spec/models/form/lettings/questions/tenancy_other_spec.rb

@@ -30,6 +30,6 @@ RSpec.describe Form::Lettings::Questions::TenancyOther, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end

spec/models/form/lettings/questions/tenancy_start_date_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe Form::Lettings::Questions::TenancyStartDate, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end

spec/models/form/lettings/questions/tenancy_type_spec.rb

@@ -114,6 +114,6 @@ RSpec.describe Form::Lettings::Questions::TenancyType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end

spec/models/form/lettings/questions/tenant_code_spec.rb

@@ -36,6 +36,6 @@ RSpec.describe Form::Lettings::Questions::TenantCode, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 end

spec/models/form/lettings/questions/town_or_city_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Form::Lettings::Questions::TownOrCity, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/uprn_confirmation_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::UprnConfirmation, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/uprn_known_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::UprnKnown, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/lettings/questions/uprn_selection_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe Form::Lettings::Questions::UprnSelection, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/lettings/questions/uprn_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::Uprn, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct question_number" do

spec/models/form/lettings/questions/waityear_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Form::Lettings::Questions::Waityear, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct check_answer_label" do

spec/models/form/lettings/questions/wheelchair_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe Form::Lettings::Questions::Wheelchair, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   context "with 2024 form" do

spec/models/form/sales/questions/address_line1_for_address_matcher_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe Form::Sales::Questions::AddressLine1ForAddressMatcher, type: :mod
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/armed_forces_spouse_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::ArmedForcesSpouse, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/buyer1_income_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Buyer1Income, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundWhite, type: :model
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do

spec/models/form/sales/questions/buyer2_living_in_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Form::Sales::Questions::Buyer2LivingIn, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do

spec/models/form/sales/questions/fromprop_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Fromprop, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/household_wheelchair_check_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::HouseholdWheelchairCheck, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/household_wheelchair_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::HouseholdWheelchair, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/sales/questions/monthly_charges_value_check_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::MonthlyChargesValueCheck, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/mortgage_lender_other_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::MortgageLenderOther, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/multiple_partners_value_check_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::MultiplePartnersValueCheck, type: :model
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/no_address_found_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Form::Sales::Questions::NoAddressFound, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/outright_ownership_type_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Form::Sales::Questions::OutrightOwnershipType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/sales/questions/partner_under16_value_check_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::PartnerUnder16ValueCheck, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Form::Sales::Questions::PersonRelationshipToBuyer1, type: :model
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has expected check answers card number" do

spec/models/form/sales/questions/person_working_situation_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Form::Sales::Questions::PersonWorkingSituation, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/sales/questions/postcode_for_address_matcher_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe Form::Sales::Questions::PostcodeForAddressMatcher, type: :model d
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/previous_tenure_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::PreviousTenure, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/prevshared_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Prevshared, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/sales/questions/privacy_notice_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Form::Sales::Questions::PrivacyNotice, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/property_building_type_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::PropertyBuildingType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do

spec/models/form/sales/questions/property_unit_type_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::PropertyUnitType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/sales/questions/sale_date_check_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::SaleDateCheck, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/savings_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Savings, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/shared_ownership_type_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Questions::SharedOwnershipType, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint_text" do

spec/models/form/sales/questions/staircase_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Staircase, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct answer_options" do

spec/models/form/sales/questions/uprn_selection_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe Form::Sales::Questions::UprnSelection, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do

spec/models/form/sales/questions/value_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Form::Sales::Questions::Value, type: :model do
   end
 
   it "is not marked as derived" do
-    expect(question.derived?).to be false
+    expect(question.derived?(nil)).to be false
   end
 
   it "has the correct hint" do