From e3ed7434c0a22c275906041d718b95e48d687579 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 19 Jul 2022 15:10:04 +0100 Subject: [PATCH] update method name --- app/models/form/question.rb | 2 +- app/models/form/setup/questions/scheme_id.rb | 2 +- app/views/form/_select_question.html.erb | 2 +- .../form/setup/questions/owning_organisation_id_spec.rb | 8 ++++---- spec/models/form/setup/questions/scheme_id_spec.rb | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/models/form/question.rb b/app/models/form/question.rb index 45148f635..de05f46a4 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -228,7 +228,7 @@ class Form::Question resource.hint end - def answer_selected(case_log, answer) + def answer_selected?(case_log, answer) case_log[id].to_s == answer.id.to_s end diff --git a/app/models/form/setup/questions/scheme_id.rb b/app/models/form/setup/questions/scheme_id.rb index 49fb332d5..fe811f28a 100644 --- a/app/models/form/setup/questions/scheme_id.rb +++ b/app/models/form/setup/questions/scheme_id.rb @@ -32,7 +32,7 @@ class Form::Setup::Questions::SchemeId < ::Form::Question !supported_housing_selected?(case_log) end - def answer_selected(case_log, answer) + def answer_selected?(case_log, answer) case_log[id] == answer.name || case_log[id] == answer.resource end diff --git a/app/views/form/_select_question.html.erb b/app/views/form/_select_question.html.erb index 627c22b35..ef63153d7 100644 --- a/app/views/form/_select_question.html.erb +++ b/app/views/form/_select_question.html.erb @@ -12,7 +12,7 @@ data-synonyms="<%= question.answer_option_synonyms(answer.resource) %>" data-append="<%= question.answer_option_append(answer.resource) %>" data-hint="<%= question.answer_option_hint(answer.resource) %>" - <%= question.answer_selected(@case_log, answer) ? "selected" : "" %> + <%= question.answer_selected?(@case_log, answer) ? "selected" : "" %> <%= answer.id == "" ? "disabled" : "" %>><%= answer.name || answer.resource %> <% end %> <% end %> diff --git a/spec/models/form/setup/questions/owning_organisation_id_spec.rb b/spec/models/form/setup/questions/owning_organisation_id_spec.rb index f81f00e0e..c9734e7a1 100644 --- a/spec/models/form/setup/questions/owning_organisation_id_spec.rb +++ b/spec/models/form/setup/questions/owning_organisation_id_spec.rb @@ -73,9 +73,9 @@ RSpec.describe Form::Setup::Questions::OwningOrganisationId, type: :model do answers = question.displayed_answer_options(case_log).map { |key, value| OpenStruct.new(id: key, name: nil, resource: value) } answers.each do |answer| if answer.resource == "Select an option" - expect(question.answer_selected(case_log, answer)).to eq(true) + expect(question.answer_selected?(case_log, answer)).to eq(true) else - expect(question.answer_selected(case_log, answer)).to eq(false) + expect(question.answer_selected?(case_log, answer)).to eq(false) end end end @@ -87,9 +87,9 @@ RSpec.describe Form::Setup::Questions::OwningOrganisationId, type: :model do answers = question.displayed_answer_options(case_log).map { |key, value| OpenStruct.new(id: key, name: value.respond_to?(:service_name) ? value.service_name : nil, resource: value) } answers.each do |answer| if answer.id == organisation_1.id - expect(question.answer_selected(case_log, answer)).to eq(true) + expect(question.answer_selected?(case_log, answer)).to eq(true) else - expect(question.answer_selected(case_log, answer)).to eq(false) + expect(question.answer_selected?(case_log, answer)).to eq(false) end end end diff --git a/spec/models/form/setup/questions/scheme_id_spec.rb b/spec/models/form/setup/questions/scheme_id_spec.rb index 5eac864c5..b855161e7 100644 --- a/spec/models/form/setup/questions/scheme_id_spec.rb +++ b/spec/models/form/setup/questions/scheme_id_spec.rb @@ -73,9 +73,9 @@ RSpec.describe Form::Setup::Questions::SchemeId, type: :model do answers = question.displayed_answer_options(case_log).map { |key, value| OpenStruct.new(id: key, name: value.respond_to?(:service_name) ? value.service_name : nil, resource: value) } answers.each do |answer| if answer.resource == "Select an option" - expect(question.answer_selected(case_log, answer)).to eq(true) + expect(question.answer_selected?(case_log, answer)).to eq(true) else - expect(question.answer_selected(case_log, answer)).to eq(false) + expect(question.answer_selected?(case_log, answer)).to eq(false) end end end @@ -87,9 +87,9 @@ RSpec.describe Form::Setup::Questions::SchemeId, type: :model do answers = question.displayed_answer_options(case_log).map { |key, value| OpenStruct.new(id: key, name: value.respond_to?(:service_name) ? value.service_name : nil, resource: value) } answers.each do |answer| if answer.id == scheme.id - expect(question.answer_selected(case_log, answer)).to eq(true) + expect(question.answer_selected?(case_log, answer)).to eq(true) else - expect(question.answer_selected(case_log, answer)).to eq(false) + expect(question.answer_selected?(case_log, answer)).to eq(false) end end end