DEV: Don't remove trust level group memberships from system user

discourse · Jan 26, 2024 · 22b21a9 · 22b21a9
1 parent 667b62c
commit 22b21a9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb
@@ -13,7 +13,7 @@ def filter_allowed_tags(opts = {})
   let(:tag_with_colon) { Fabricate(:tag, name: "with:colon") }
 
   fab!(:user)
-  fab!(:admin)
+  fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }
 
   before do
     SiteSetting.tagging_enabled = true

diff --git a/spec/lib/new_post_manager_spec.rb b/spec/lib/new_post_manager_spec.rb
@@ -411,8 +411,6 @@ def build_manager_with(raw)
       SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
       SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
 
-      Group.user_trust_level_change!(Discourse.system_user.id, Discourse.system_user.trust_level)
-
       manager =
         NewPostManager.new(
           topic.user,

diff --git a/spec/lib/topic_creator_spec.rb b/spec/lib/topic_creator_spec.rb
@@ -134,8 +134,6 @@
           )
         end
 
-        before { Discourse.system_user.change_trust_level!(TrustLevel[4]) }
-
         it "adds watched words as tags" do
           topic =
             TopicCreator.create(

diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb
@@ -186,7 +186,7 @@ def watching
   end
 
   describe "integration" do
-    fab!(:user)
+    fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
     fab!(:watched_tag) { Fabricate(:tag) }
     let(:muted_tag) { Fabricate(:tag) }
     fab!(:tracked_tag) { Fabricate(:tag) }
@@ -311,7 +311,7 @@ def watching
       end
 
       it "correctly handles staff tags" do
-        staff = Fabricate(:admin)
+        staff = Fabricate(:admin, refresh_auto_groups: true)
         topic = create_post.topic
 
         create_staff_only_tags(["foo"])

diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe TopicTrackingState do
-  fab!(:user)
+  fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
   fab!(:whisperers_group) { Fabricate(:group) }
   fab!(:private_message_post)
   let(:private_message_topic) { private_message_post.topic }