From 958f68e3876c156dca0feb20acac8e7c1c0ea8a2 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Fri, 23 Jan 2026 13:32:41 +0000 Subject: [PATCH] CLDC-4115: Ensure question uses default label logic --- spec/helpers/check_answers_helper_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/helpers/check_answers_helper_spec.rb b/spec/helpers/check_answers_helper_spec.rb index a7d18295a..ac68c07d3 100644 --- a/spec/helpers/check_answers_helper_spec.rb +++ b/spec/helpers/check_answers_helper_spec.rb @@ -41,7 +41,8 @@ RSpec.describe CheckAnswersHelper do describe "#get_answer_label" do context "when unanswered and bulk upload" do - let(:question) { log.form.questions.reject { |q| log.optional_fields.include?(q.id) }.sample } + # make sure to not include questions that override the answer label + let(:question) { log.form.questions.reject { |q| log.optional_fields.include?(q.id) || q.answer_label(log, current_user).present? }.sample } let(:bulk_upload) { create(:bulk_upload) } let(:log) { create(:sales_log, creation_method: "bulk upload", bulk_upload:) }