From 0c8924761c03db85d6e60b3e580acbc7348b51b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Meny?= Date: Wed, 3 Aug 2022 13:00:28 +0100 Subject: [PATCH] Removes invalid user creation --- app/models/form/setup/questions/created_by_id.rb | 5 ++--- spec/models/form/setup/questions/created_by_id_spec.rb | 6 ------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/models/form/setup/questions/created_by_id.rb b/app/models/form/setup/questions/created_by_id.rb index f32163a0f..eee7d9485 100644 --- a/app/models/form/setup/questions/created_by_id.rb +++ b/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" } return answer_opts unless ActiveRecord::Base.connected? - User.select(:id, :name, :email).each_with_object(answer_opts) do |user, hsh| - hsh[user.id] = user.name if user.name.present? - hsh[user.id] = user.email if user.name.blank? + User.select(:id, :name).each_with_object(answer_opts) do |user, hsh| + hsh[user.id] = user.name hsh end end diff --git a/spec/models/form/setup/questions/created_by_id_spec.rb b/spec/models/form/setup/questions/created_by_id_spec.rb index 04b6a1635..9b20a02ae 100644 --- a/spec/models/form/setup/questions/created_by_id_spec.rb +++ b/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(:user_1) { FactoryBot.create(:user, name: "first 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 { "" => "Select an option", user_1.id => user_1.name, user_2.id => user_2.name, - user_3.id => user_3.email, } end