Fix tests

app/controllers/form_controller.rb

@@ -15,7 +15,7 @@ class FormController < ApplicationController
       else
         redirect_path = "case_log_#{@page.id}_path"
         mandatory_questions_with_no_response.map do |question|
-          @case_log.errors.add question.id.to_sym, I18n.t("validations.not_answered", question: question.display_label.downcase)
+          @case_log.errors.add question.id.to_sym, question.unanswered_error_message
         end
         session[:errors] = @case_log.errors.to_json
         Rails.logger.info "User triggered validation(s) on: #{@case_log.errors.map(&:attribute).join(', ')}"
@@ -128,12 +128,13 @@ private
 
   def mandatory_questions_with_no_response(responses_for_page)
     @page.questions.select do |question|
-       question_is_required?(question) && question_missing_response?(responses_for_page, question)
+      question_is_required?(question) && question_missing_response?(responses_for_page, question)
     end
   end
 
   def question_is_required?(question)
     CaseLog::OPTIONAL_FIELDS.exclude?(question.id) &&
+      @page.questions.map(&:result_field).exclude?(question.id) &&
       @page.subsection.applicable_questions(@case_log).map(&:id).include?(question.id)
   end
 

app/models/case_log.rb

@@ -8,7 +8,6 @@ class CaseLogValidator < ActiveModel::Validator
   include Validations::TenancyValidations
   include Validations::DateValidations
   include Validations::LocalAuthorityValidations
-  include Validations::SubmissionValidations
 
   def validate(record)
     validation_methods = public_methods.select { |method| method.starts_with?("validate_") }

app/models/form/question.rb

@@ -177,6 +177,12 @@ class Form::Question
     check_answer_label || header || id.humanize
   end
 
+  def unanswered_error_message
+    return I18n.t("validations.declaration.missing") if id == "declaration"
+
+    I18n.t("validations.not_answered", question: display_label.downcase)
+  end
+
 private
 
   def selected_answer_option_is_derived?(case_log)

app/models/validations/submission_validations.rb

@@ -1,10 +0,0 @@
-module Validations::SubmissionValidations
-  # Validations methods need to be called 'validate_<page_name>' to run on model save
-  # or 'validate_' to run on submit as well
-
-  def validate_declaration(record)
-    if record.declaration&.zero?
-      record.errors.add :declaration, I18n.t("validations.declaration.missing")
-    end
-  end
-end

spec/features/form/page_routing_spec.rb

@@ -43,6 +43,7 @@ RSpec.describe "Form Page Routing" do
     choose("case-log-preg-occ-2-field", allow_label_click: true)
     click_button("Save and continue")
     expect(page).to have_current_path("/logs/#{id}/conditional-question-no-page")
+    choose("case-log-cbl-0-field", allow_label_click: true)
     click_button("Save and continue")
     expect(page).to have_current_path("/logs/#{id}/conditional-question/check-answers")
   end

spec/features/form/progressive_total_field_spec.rb

@@ -33,6 +33,7 @@ RSpec.describe "Accessible Automcomplete" do
 
   it "total displays despite error message", js: true do
     visit("/logs/#{case_log.id}/rent")
+    choose("case-log-period-1-field", allow_label_click: true)
     fill_in("case-log-brent-field", with: 500)
     fill_in("case-log-scharge-field", with: 50)
     fill_in("case-log-pscharge-field", with: 50)