Browse Source

Guard against missing DB connection

pull/674/head
baarkerlounger 3 years ago
parent
commit
780b1f4e99
  1. 2
      app/models/form/setup/questions/created_by_id.rb
  2. 2
      app/models/form/setup/questions/owning_organisation_id.rb
  3. 2
      spec/models/form_handler_spec.rb

2
app/models/form/setup/questions/created_by_id.rb

@ -12,6 +12,8 @@ class Form::Setup::Questions::CreatedById < ::Form::Question
def answer_options_values
answer_opts = { "" => "Select an option" }
return answer_opts unless ActiveRecord::Base.connected?
User.all.each_with_object(answer_opts) do |user, hsh|
hsh[user.id] = user.name
hsh

2
app/models/form/setup/questions/owning_organisation_id.rb

@ -12,6 +12,8 @@ class Form::Setup::Questions::OwningOrganisationId < ::Form::Question
def answer_options_values
answer_opts = { "" => "Select an option" }
return answer_opts unless ActiveRecord::Base.connected?
Organisation.all.each_with_object(answer_opts) do |organisation, hsh|
hsh[organisation.id] = organisation.name
hsh

2
spec/models/form_handler_spec.rb

@ -17,7 +17,7 @@ RSpec.describe FormHandler do
form_handler = described_class.instance
form = form_handler.get_form(test_form_name)
expect(form).to be_a(Form)
expect(form.pages.count).to eq(43)
expect(form.pages.count).to eq(42)
end
end

Loading…
Cancel
Save