From e26e117b43bb6527f0c9ef484784353cb6bd84a2 Mon Sep 17 00:00:00 2001 From: John Maxwell Date: Fri, 17 Feb 2023 14:07:56 -0500 Subject: [PATCH 1/2] Removed use of Faker email creation in user factory primary email We suspect that using Faker email, rather than explicitly setting sequential emails, was occasionally creating collisions and leading to flaky test failures. [skip changelog] --- spec/factories/users.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 9c0598db224..cfabbe8269a 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -6,12 +6,14 @@ transient do with { {} } - email { Faker::Internet.safe_email } + sequence(:email) { |n| "user#{n}@example.com" } confirmed_at { Time.zone.now } confirmation_token { nil } confirmation_sent_at { 5.minutes.ago } end + + accepted_terms_at { Time.zone.now if email } after(:build) do |user, evaluator| From cf7f61cf15919543aa88df6c95b45948f2a2c119 Mon Sep 17 00:00:00 2001 From: John Maxwell Date: Tue, 21 Feb 2023 13:00:36 -0500 Subject: [PATCH 2/2] Lint nits --- spec/factories/users.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/factories/users.rb b/spec/factories/users.rb index cfabbe8269a..138500dcdb8 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -12,8 +12,6 @@ confirmation_sent_at { 5.minutes.ago } end - - accepted_terms_at { Time.zone.now if email } after(:build) do |user, evaluator|