diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb index ea6afa01923..74b5d403e99 100644 --- a/lib/admin_user_index_query.rb +++ b/lib/admin_user_index_query.rb @@ -84,7 +84,7 @@ class AdminUserIndexQuery .human_users .joins(:user_profile, :user_stat) .where("users.created_at <= ?", 1.day.ago) - .where("LENGTH(COALESCE(user_profiles.bio_raw, '')) > 0") + .where("LENGTH(COALESCE(user_profiles.bio_raw, user_profiles.website, '')) > 0") .where("user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1") end diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb index 5471bcd059d..8060066f881 100644 --- a/spec/components/admin_user_index_query_spec.rb +++ b/spec/components/admin_user_index_query_spec.rb @@ -92,14 +92,23 @@ describe AdminUserIndexQuery do end describe 'with a suspected user' do - fab!(:user) { Fabricate(:active_user, created_at: 1.day.ago) } fab!(:bot) { Fabricate(:active_user, id: -10, created_at: 1.day.ago) } + fab!(:regular_user) { Fabricate(:user, created_at: 1.day.ago) } + fab!(:user_with_bio) { Fabricate(:active_user, created_at: 1.day.ago) } + fab!(:user_with_website) { Fabricate(:user, created_at: 1.day.ago) } + + before do + user_with_website.user_profile.website = 'https://example.com' + user_with_website.user_profile.save! + end it 'finds the suspected user' do bot - user + regular_user + user_with_bio + user_with_website query = AdminUserIndexQuery.new(query: 'suspect') - expect(query.find_users).to eq([user]) + expect(query.find_users).to contain_exactly(user_with_bio, user_with_website) end end