diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 5a625a1ef05..8c9c2d09ec2 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -10,6 +10,7 @@ confirmed_at { Time.zone.now } confirmation_token { nil } confirmation_sent_at { 5.minutes.ago } + registered_at { Time.zone.now } end created_at { Time.zone.now } @@ -179,8 +180,8 @@ trait :fully_registered do with_phone - after :create do |user| - user.create_registration_log(registered_at: Time.zone.now) + after :create do |user, evaluator| + user.create_registration_log(registered_at: evaluator.registered_at) end end diff --git a/spec/services/reporting/account_reuse_report_spec.rb b/spec/services/reporting/account_reuse_report_spec.rb index 1aec438fdb0..7c399430e44 100644 --- a/spec/services/reporting/account_reuse_report_spec.rb +++ b/spec/services/reporting/account_reuse_report_spec.rb @@ -21,14 +21,6 @@ let(:sp_c) { 'c' } let(:sp_d) { 'd' } - def create_identity(user_id:, created_at:, provider:, verified_at:) - ServiceProviderIdentity.create( - user_id: user_id, service_provider: provider, - created_at: created_at, - last_ial2_authenticated_at: in_query, verified_at: verified_at - ) - end - before do create( :service_provider, @@ -136,10 +128,11 @@ def create_identity(user_id:, created_at:, provider:, verified_at:) users_to_query.each do |user| user[:sp].each_with_index do |sp, i| - create_identity( + ServiceProviderIdentity.create( user_id: user[:id], + service_provider: sp, created_at: user[:created_timestamp], - provider: sp, + last_ial2_authenticated_at: in_query, verified_at: user[:sp_timestamp][i], ) end @@ -148,10 +141,20 @@ def create_identity(user_id:, created_at:, provider:, verified_at:) # Create active profiles for total_proofed_identities # These 13 profiles will yield 10 active profiles in the results (1..10).each do |_| - create(:profile, :active, activated_at: in_query) + create( + :profile, + :active, + activated_at: in_query, + user: create(:user, :fully_registered, registered_at: in_query), + ) end (1..3).each do |_| - create(:profile, :active, activated_at: out_of_query) + create( + :profile, + :active, + activated_at: out_of_query, + user: create(:user, :fully_registered, registered_at: in_query), + ) end end