Skip to content

A platform for community discussion. Free, open, simple.

DEV: Use admin created_at for onboarding logic (#40478)

Penar Musarajd401d99fcd5a
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 57f33707033..0d23d2a757b 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -172,7 +172,7 @@ class CurrentUserSerializer < BasicUserSerializer
def include_show_site_owner_onboarding?
SiteSetting.enable_site_owner_onboarding && object.admin? &&
User.where(admin: true).human_users.minimum(:id) == object.id &&
- Topic.minimum(:created_at)&.after?(SiteSetting.site_owner_onboarding_max_days.days.ago)
+ object.created_at.after?(SiteSetting.site_owner_onboarding_max_days.days.ago)
end
def show_site_owner_onboarding
diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rb
index d3cf4f06259..6e2bb7e4157 100644
--- a/spec/serializers/current_user_serializer_spec.rb
+++ b/spec/serializers/current_user_serializer_spec.rb
@@ -454,7 +454,8 @@ RSpec.describe CurrentUserSerializer do
it "is not included when the site is older than the max days setting" do
SiteSetting.site_owner_onboarding_max_days = 5
- Topic.update_all(created_at: 6.days.ago)
+ admin.created_at = 6.days.ago
+ admin.save!
payload = admin_serializer.as_json
expect(payload).not_to have_key(:show_site_owner_onboarding)
end
diff --git a/spec/system/admin_onboarding_banner_spec.rb b/spec/system/admin_onboarding_banner_spec.rb
index 7cf6256f24a..aeb3ac460c4 100644
--- a/spec/system/admin_onboarding_banner_spec.rb
+++ b/spec/system/admin_onboarding_banner_spec.rb
@@ -2,8 +2,6 @@
describe "Admin Onboarding Banner" do
fab!(:admin)
- # ensures there is at least one topic, otherwise the topic recent date check doesn't pass
- fab!(:topic)
let(:banner) { PageObjects::Components::AdminOnboardingBanner.new }
let(:predefined_topics_modal) { PageObjects::Modals::AdminOnboardingPredefinedTopics.new }