Browse Source

Removes invalid user creation

pull/787/head
Stéphane Meny 3 years ago
parent
commit
0c8924761c
No known key found for this signature in database
GPG Key ID: 9D0AFEA988527923
  1. 5
      app/models/form/setup/questions/created_by_id.rb
  2. 6
      spec/models/form/setup/questions/created_by_id_spec.rb

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

@ -13,9 +13,8 @@ class Form::Setup::Questions::CreatedById < ::Form::Question
answer_opts = { "" => "Select an option" } answer_opts = { "" => "Select an option" }
return answer_opts unless ActiveRecord::Base.connected? return answer_opts unless ActiveRecord::Base.connected?
User.select(:id, :name, :email).each_with_object(answer_opts) do |user, hsh| User.select(:id, :name).each_with_object(answer_opts) do |user, hsh|
hsh[user.id] = user.name if user.name.present? hsh[user.id] = user.name
hsh[user.id] = user.email if user.name.blank?
hsh hsh
end end
end end

6
spec/models/form/setup/questions/created_by_id_spec.rb

@ -10,17 +10,11 @@ RSpec.describe Form::Setup::Questions::CreatedById, type: :model do
let(:form) { instance_double(Form) } let(:form) { instance_double(Form) }
let(:user_1) { FactoryBot.create(:user, name: "first user") } let(:user_1) { FactoryBot.create(:user, name: "first user") }
let(:user_2) { FactoryBot.create(:user, name: "second user") } let(:user_2) { FactoryBot.create(:user, name: "second user") }
let(:user_3) do
user = FactoryBot.build(:user, name: nil, email: "madeupmail@example.com")
user.save!(validate: false)
user
end
let!(:expected_answer_options) do let!(:expected_answer_options) do
{ {
"" => "Select an option", "" => "Select an option",
user_1.id => user_1.name, user_1.id => user_1.name,
user_2.id => user_2.name, user_2.id => user_2.name,
user_3.id => user_3.email,
} }
end end

Loading…
Cancel
Save