diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 2754b0445..ff2a962c4 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -396,14 +396,14 @@ class CaseLog < ApplicationRecord def plural_gender_for_person(person_num) gender = public_send("sex#{person_num}".to_sym) return unless gender - if gender == "M" || gender == "X" - return "men and non-binary people" + + if %w[M X].include?(gender) + "men and non-binary people" elsif gender == "F" - return "women" + "women" end end - private PIO = Postcodes::IO.new diff --git a/spec/helpers/interruption_screen_helper_spec.rb b/spec/helpers/interruption_screen_helper_spec.rb index d46416c80..fb1882666 100644 --- a/spec/helpers/interruption_screen_helper_spec.rb +++ b/spec/helpers/interruption_screen_helper_spec.rb @@ -105,7 +105,7 @@ RSpec.describe InterruptionScreenHelper do .to eq(I18n.t("test.title_text.no_argument")) end end - + context "when title text has arguments" do it "returns the correct title text" do title_text = { @@ -121,6 +121,6 @@ RSpec.describe InterruptionScreenHelper do expect(display_title_text(title_text, case_log)) .to eq(I18n.t("test.title_text.one_argument", ecstat1: case_log.form.get_question("ecstat1", case_log).answer_label(case_log).downcase)) end - end + end end end