From c7e3d27624b05b9f316822439ea39efb0edfe699 Mon Sep 17 00:00:00 2001
From: Ted Johansson <ted@discourse.org>
Date: Mon, 15 Jan 2024 20:59:08 +0800
Subject: [PATCH] DEV: Convert min_trust_level_to_tag_topics to groups (#25258)
We're changing the implementation of trust levels to use groups. Part of this is to have site settings that reference trust levels use groups instead. It converts the min_trust_level_to_tag_topics site setting to tag_topic_allowed_groups.
---
config/locales/server.en.yml | 2 ++
config/site_settings.yml | 8 +++++
...wed_groups_based_on_deprecated_settings.rb | 27 ++++++++++++++++
lib/guardian/tag_guardian.rb | 3 +-
lib/site_settings/deprecated_settings.rb | 2 ++
.../lib/chat/channel_archive_service_spec.rb | 2 +-
spec/integration/category_tag_spec.rb | 10 +++---
spec/jobs/export_user_archive_spec.rb | 2 +-
spec/lib/discourse_tagging_spec.rb | 4 +--
spec/lib/guardian_spec.rb | 14 ++++++--
spec/lib/new_post_manager_spec.rb | 4 +--
spec/lib/post_creator_spec.rb | 6 ++--
spec/lib/post_revisor_spec.rb | 14 ++++----
spec/lib/search_spec.rb | 4 +--
spec/lib/topic_creator_spec.rb | 6 ++--
spec/lib/topics_bulk_action_spec.rb | 6 ++--
spec/models/post_mover_spec.rb | 1 +
spec/models/reviewable_queued_post_spec.rb | 2 +-
spec/models/tag_spec.rb | 2 +-
spec/models/tag_user_spec.rb | 2 +-
spec/models/topic_embed_spec.rb | 2 +-
spec/requests/posts_controller_spec.rb | 2 +-
spec/services/post_alerter_spec.rb | 32 ++++++++++++++++---
23 files changed, 115 insertions(+), 42 deletions(-)
create mode 100644 db/migrate/20240112073149_fill_tag_topic_allowed_groups_based_on_deprecated_settings.rb
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index fefa2ef709c..fbfde93c253 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2442,6 +2442,7 @@ en:
tag_style: "Visual style for tag badges."
pm_tags_allowed_for_groups: "Allow members of included group(s) to tag any personal message"
min_trust_level_to_tag_topics: "Minimum trust level required to tag topics"
+ tag_topic_allowed_groups: "Groups that are allowed to tag topics."
suppress_overlapping_tags_in_list: "If tags match exact words in topic titles, don't show the tag"
remove_muted_tags_from_latest: "Don't show topics tagged only with muted tags in the latest topic list."
force_lowercase_tags: "Force all new tags to be entirely lowercase."
@@ -2584,6 +2585,7 @@ en:
create_tag_allowed_groups: "min_trust_to_create_tag"
send_email_messages_allowed_groups: "min_trust_to_send_email_messages"
skip_review_media_groups: "review_media_unless_trust_level"
+ tag_topic_allowed_groups: "min_trust_level_to_tag_topics"
placeholder:
discourse_connect_provider_secrets:
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 756714078e7..9defd8b322e 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -3031,6 +3031,14 @@ tags:
default: "0"
enum: "TrustLevelAndStaffSetting"
client: true
+ hidden: true
+ tag_topic_allowed_groups:
+ default: "10"
+ type: group_list
+ allow_any: false
+ refresh: true
+ client: true
+ validator: "AtLeastOneGroupValidator"
max_tag_search_results:
client: true
default: 5
diff --git a/db/migrate/20240112073149_fill_tag_topic_allowed_groups_based_on_deprecated_settings.rb b/db/migrate/20240112073149_fill_tag_topic_allowed_groups_based_on_deprecated_settings.rb
new file mode 100644
index 00000000000..15b75b85e9a
--- /dev/null
+++ b/db/migrate/20240112073149_fill_tag_topic_allowed_groups_based_on_deprecated_settings.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class FillTagTopicAllowedGroupsBasedOnDeprecatedSettings < ActiveRecord::Migration[7.0]
+ def up
+ configured_trust_level =
+ DB.query_single(
+ "SELECT value FROM site_settings WHERE name = 'min_trust_level_to_tag_topics' LIMIT 1",
+ ).first
+
+ # Default for old setting is TL0, we only need to do anything if it's been changed in the DB.
+ if configured_trust_level.present?
+ # Matches Group::AUTO_GROUPS to the trust levels.
+ corresponding_group = "1#{configured_trust_level}"
+
+ # Data_type 20 is group_list.
+ DB.exec(
+ "INSERT INTO site_settings(name, value, data_type, created_at, updated_at)
+ VALUES('min_trust_level_to_tag_topics', :setting, '20', NOW(), NOW())",
+ setting: corresponding_group,
+ )
+ end
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/lib/guardian/tag_guardian.rb b/lib/guardian/tag_guardian.rb
index 66fa58a14c1..e5ec0a93967 100644
--- a/lib/guardian/tag_guardian.rb
+++ b/lib/guardian/tag_guardian.rb
@@ -15,8 +15,7 @@ module TagGuardian
end
def can_tag_topics?
- SiteSetting.tagging_enabled &&
- @user.has_trust_level_or_staff?(SiteSetting.min_trust_level_to_tag_topics)
+ SiteSetting.tagging_enabled && @user.in_any_groups?(SiteSetting.tag_topic_allowed_groups_map)
end
def can_tag_pms?
diff --git a/lib/site_settings/deprecated_settings.rb b/lib/site_settings/deprecated_settings.rb
index 98f76cb3e6b..2bf71ab577f 100644
--- a/lib/site_settings/deprecated_settings.rb
+++ b/lib/site_settings/deprecated_settings.rb
@@ -37,6 +37,7 @@ module SiteSettings::DeprecatedSettings
["min_trust_to_create_tag", "create_tag_allowed_groups", false, "3.3"],
["min_trust_to_send_email_messages", "send_email_messages_allowed_groups", false, "3.3"],
["review_media_unless_trust_level", "skip_review_media_groups", false, "3.3"],
+ ["min_trust_level_to_tag_topics", "tag_topic_allowed_groups", false, "3.3"],
]
OVERRIDE_TL_GROUP_SETTINGS = %w[
@@ -58,6 +59,7 @@ module SiteSettings::DeprecatedSettings
min_trust_to_create_tag
min_trust_to_send_email_messages
review_media_unless_trust_level
+ min_trust_level_to_tag_topics
]
def group_to_tl(old_setting, new_setting)
diff --git a/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb b/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb
index 67af1ba07dc..26ad7576e21 100644
--- a/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb
+++ b/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb
@@ -7,7 +7,7 @@ describe Chat::ChannelArchiveService do
end
fab!(:channel) { Fabricate(:category_channel) }
- fab!(:user) { Fabricate(:user, admin: true) }
+ fab!(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }
fab!(:category)
let(:topic_params) { { topic_title: "This will be a new topic", category_id: category.id } }
diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb
index ebfd67253b5..14e3ce60e1d 100644
--- a/spec/integration/category_tag_spec.rb
+++ b/spec/integration/category_tag_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe "category tag restrictions" do
before do
SiteSetting.tagging_enabled = true
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
context "with tags restricted to one category" do
@@ -770,7 +770,7 @@ RSpec.describe "tag topic counts per category" do
before do
SiteSetting.tagging_enabled = true
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
it "counts when a topic is created with tags" do
@@ -782,8 +782,10 @@ RSpec.describe "tag topic counts per category" do
end
it "counts when tag is added to an existing topic" do
- topic = Fabricate(:topic, category: category)
- post = Fabricate(:post, user: topic.user, topic: topic)
+ user = Fabricate(:user, refresh_auto_groups: true)
+ topic = Fabricate(:topic, user: user, category: category)
+ post = Fabricate(:post, user: user, topic: topic)
+
expect(CategoryTagStat.where(category: category).count).to eq(0)
expect {
PostRevisor.new(post).revise!(topic.user, raw: post.raw, tags: [tag1.name, tag2.name])
diff --git a/spec/jobs/export_user_archive_spec.rb b/spec/jobs/export_user_archive_spec.rb
index db8c236089e..04f5fb776df 100644
--- a/spec/jobs/export_user_archive_spec.rb
+++ b/spec/jobs/export_user_archive_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Jobs::ExportUserArchive do
end
let(:component) { raise "component not set" }
- fab!(:admin)
+ fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }
fab!(:category) { Fabricate(:category_with_definition, name: "User Archive Category") }
fab!(:subcategory) { Fabricate(:category_with_definition, parent_category_id: category.id) }
fab!(:topic) { Fabricate(:topic, category: category) }
diff --git a/spec/lib/discourse_tagging_spec.rb b/spec/lib/discourse_tagging_spec.rb
index 36859c69b32..2484ab2a70c 100644
--- a/spec/lib/discourse_tagging_spec.rb
+++ b/spec/lib/discourse_tagging_spec.rb
@@ -7,7 +7,7 @@ require "discourse_tagging"
RSpec.describe DiscourseTagging do
fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }
- fab!(:user)
+ fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:admin_guardian) { Guardian.new(admin) }
let(:guardian) { Guardian.new(user) }
@@ -18,7 +18,7 @@ RSpec.describe DiscourseTagging do
before do
SiteSetting.tagging_enabled = true
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
describe "visible_tags" do
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index c28bf6b0e3d..39f9edbbcd9 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -3708,7 +3708,7 @@ RSpec.describe Guardian do
context "when tagging is enabled" do
before do
SiteSetting.tagging_enabled = true
- SiteSetting.min_trust_level_to_tag_topics = 1
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_1]
end
context "when minimum trust level to create tags is 3" do
@@ -3739,11 +3739,19 @@ RSpec.describe Guardian do
describe "can_tag_topics" do
it "returns false if trust level is too low" do
- expect(Guardian.new(Fabricate(:user, trust_level: 0)).can_tag_topics?).to be_falsey
+ expect(
+ Guardian.new(
+ Fabricate(:user, trust_level: 0, refresh_auto_groups: true),
+ ).can_tag_topics?,
+ ).to be_falsey
end
it "returns true if trust level is high enough" do
- expect(Guardian.new(Fabricate(:user, trust_level: 1)).can_tag_topics?).to be_truthy
+ expect(
+ Guardian.new(
+ Fabricate(:user, trust_level: 1, refresh_auto_groups: true),
+ ).can_tag_topics?,
+ ).to be_truthy
end
it "returns true for staff" do
diff --git a/spec/lib/new_post_manager_spec.rb b/spec/lib/new_post_manager_spec.rb
index 90193990b4e..0fa253cc52a 100644
--- a/spec/lib/new_post_manager_spec.rb
+++ b/spec/lib/new_post_manager_spec.rb
@@ -4,7 +4,7 @@ require "new_post_manager"
RSpec.describe NewPostManager do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
- fab!(:topic)
+ fab!(:topic) { Fabricate(:topic, user: user) }
describe "default action" do
it "creates the post by default" do
@@ -415,7 +415,7 @@ RSpec.describe NewPostManager do
it "calls custom enqueuing handlers" do
SiteSetting.tagging_enabled = true
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
manager =
NewPostManager.new(
diff --git a/spec/lib/post_creator_spec.rb b/spec/lib/post_creator_spec.rb
index ebe840a625c..9b32a00ea05 100644
--- a/spec/lib/post_creator_spec.rb
+++ b/spec/lib/post_creator_spec.rb
@@ -556,7 +556,7 @@ RSpec.describe PostCreator do
context "when can create tags" do
before do
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
it "can create all tags if none exist" do
@@ -577,7 +577,7 @@ RSpec.describe PostCreator do
context "when cannot create tags" do
before do
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_4]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
it "only uses existing tags" do
@@ -590,7 +590,7 @@ RSpec.describe PostCreator do
context "when automatically tagging first posts" do
before do
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
Fabricate(:tag, name: "greetings")
Fabricate(:tag, name: "hey")
Fabricate(:tag, name: "about-art")
diff --git a/spec/lib/post_revisor_spec.rb b/spec/lib/post_revisor_spec.rb
index 52e66d7da4f..ffff3bcfdc7 100644
--- a/spec/lib/post_revisor_spec.rb
+++ b/spec/lib/post_revisor_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe PostRevisor do
fab!(:newuser) { Fabricate(:newuser, last_seen_at: Date.today) }
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:coding_horror)
- fab!(:admin)
+ fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }
fab!(:moderator)
let(:post_args) { { user: newuser, topic: topic } }
@@ -101,7 +101,7 @@ RSpec.describe PostRevisor do
it "does not revise category if incorrect amount of tags" do
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
new_category = Fabricate(:category, minimum_required_tags: 1)
@@ -123,7 +123,7 @@ RSpec.describe PostRevisor do
it "returns an error if the topic does not have minimum amount of tags that the new category requires" do
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
old_category = Fabricate(:category, minimum_required_tags: 0)
new_category = Fabricate(:category, minimum_required_tags: 1)
@@ -137,7 +137,7 @@ RSpec.describe PostRevisor do
it "returns an error if the topic has tags not allowed in the new category" do
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
tag1 = Fabricate(:tag)
tag2 = Fabricate(:tag)
@@ -165,7 +165,7 @@ RSpec.describe PostRevisor do
it "returns an error if the topic is missing tags required from a tag group in the new category" do
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
tag1 = Fabricate(:tag)
tag_group = Fabricate(:tag_group, tags: [tag1])
@@ -1233,7 +1233,7 @@ RSpec.describe PostRevisor do
context "when can create tags" do
before do
SiteSetting.create_tag_allowed_groups = "1|3|#{Group::AUTO_GROUPS[:trust_level_0]}"
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = "1|3|#{Group::AUTO_GROUPS[:trust_level_0]}"
end
it "can create all tags if none exist" do
@@ -1491,7 +1491,7 @@ RSpec.describe PostRevisor do
context "when cannot create tags" do
before do
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_4]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
it "only uses existing tags" do
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index c56d05f0f15..f8b1b907bc4 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe Search do
- fab!(:admin)
+ fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }
fab!(:topic)
before do
@@ -1378,7 +1378,7 @@ RSpec.describe Search do
SiteSetting.tagging_enabled = true
DiscourseTagging.tag_topic_by_names(
post.topic,
- Guardian.new(Fabricate.build(:admin)),
+ Guardian.new(Fabricate(:admin, refresh_auto_groups: true)),
[tag.name, uppercase_tag.name],
)
post.topic.save
diff --git a/spec/lib/topic_creator_spec.rb b/spec/lib/topic_creator_spec.rb
index 102cc8c3737..30d8ef7e901 100644
--- a/spec/lib/topic_creator_spec.rb
+++ b/spec/lib/topic_creator_spec.rb
@@ -108,7 +108,7 @@ RSpec.describe TopicCreator do
before do
SiteSetting.tagging_enabled = true
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
context "with regular tags" do
@@ -136,6 +136,8 @@ RSpec.describe TopicCreator do
)
end
+ before { Discourse.system_user.change_trust_level!(TrustLevel[4]) }
+
it "adds watched words as tags" do
topic =
TopicCreator.create(
@@ -216,7 +218,7 @@ RSpec.describe TopicCreator do
end
it "lets new user create a topic if they don't have sufficient trust level to tag topics" do
- SiteSetting.min_trust_level_to_tag_topics = 1
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_1]
new_user = Fabricate(:newuser, refresh_auto_groups: true)
topic =
TopicCreator.create(
diff --git a/spec/lib/topics_bulk_action_spec.rb b/spec/lib/topics_bulk_action_spec.rb
index a1cd6cb9ae6..f580d7d71a0 100644
--- a/spec/lib/topics_bulk_action_spec.rb
+++ b/spec/lib/topics_bulk_action_spec.rb
@@ -419,7 +419,7 @@ RSpec.describe TopicsBulkAction do
before do
SiteSetting.tagging_enabled = true
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
topic.tags = [tag1, tag2]
Group.refresh_automatic_groups!
end
@@ -488,7 +488,7 @@ RSpec.describe TopicsBulkAction do
before do
SiteSetting.tagging_enabled = true
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
topic.tags = [tag1, tag2]
Group.refresh_automatic_groups!
end
@@ -559,7 +559,7 @@ RSpec.describe TopicsBulkAction do
before do
SiteSetting.tagging_enabled = true
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
topic.tags = [tag1, tag2]
Group.refresh_automatic_groups!
end
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index fca9f76d052..554dd283b0c 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -2225,6 +2225,7 @@ RSpec.describe PostMover do
it "can add tags to new message when staff group is included in pm_tags_allowed_for_groups" do
SiteSetting.pm_tags_allowed_for_groups = "1|2|3"
+ SiteSetting.tag_topic_allowed_groups = "1|2|3"
personal_message.move_posts(
admin,
[p2.id, p5.id],
diff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rb
index 76f249bd5ef..5f1183055a8 100644
--- a/spec/models/reviewable_queued_post_spec.rb
+++ b/spec/models/reviewable_queued_post_spec.rb
@@ -239,7 +239,7 @@ RSpec.describe ReviewableQueuedPost, type: :model do
before do
SiteSetting.tagging_enabled = true
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
context "when editing" do
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 9e074e82abe..d7b97e3475d 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Tag do
before do
SiteSetting.tagging_enabled = true
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
describe "Associations" do
diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb
index 8e8772b73b2..d476494b897 100644
--- a/spec/models/tag_user_spec.rb
+++ b/spec/models/tag_user_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe TagUser do
before do
SiteSetting.tagging_enabled = true
SiteSetting.create_tag_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
- SiteSetting.min_trust_level_to_tag_topics = 0
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
end
def regular
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 9e11d2b5865..7e23ee5fae4 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe TopicEmbed do
it { is_expected.to validate_presence_of :embed_url }
describe ".import" do
- fab!(:user)
+ fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:title) { "How to turn a fish from good to evil in 30 seconds" }
let(:url) { "http://eviltrout.com/123" }
let(:contents) do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 27f1a89dc0c..49b9328265c 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -1372,7 +1372,7 @@ RSpec.describe PostsController do
it "cannot create a post with a tag without tagging permission" do
SiteSetting.tagging_enabled = true
- SiteSetting.min_trust_level_to_tag_topics = 4
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_4]
tag = Fabricate(:tag)
post "/posts.json",
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 272b9b144b6..68615d1861d 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -2057,6 +2057,7 @@ RSpec.describe PostAlerter do
before do
SiteSetting.tagging_enabled = true
+ SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
Jobs.run_immediately!
TagUser.change(user.id, watched_tag.id, TagUser.notification_levels[:watching_first_post])
TopicUser.change(
@@ -2075,7 +2076,10 @@ RSpec.describe PostAlerter do
).to eq(0)
expect {
- PostRevisor.new(post).revise!(Fabricate(:user), tags: [other_tag.name, watched_tag.name])
+ PostRevisor.new(post).revise!(
+ Fabricate(:user, refresh_auto_groups: true),
+ tags: [other_tag.name, watched_tag.name],
+ )
}.to change { Notification.where(user_id: user.id).count }.by(1)
expect(
user
@@ -2085,7 +2089,10 @@ RSpec.describe PostAlerter do
).to eq(1)
expect {
- PostRevisor.new(post).revise!(Fabricate(:user), tags: [watched_tag.name, other_tag.name])
+ PostRevisor.new(post).revise!(
+ Fabricate(:user, refresh_auto_groups: true),
+ tags: [watched_tag.name, other_tag.name],
+ )
}.not_to change { Notification.count }
expect(
user
@@ -2149,11 +2156,26 @@ RSpec.describe PostAlerter do
end
it "only notifies staff watching added tag" do
- expect(PostRevisor.new(post).revise!(Fabricate(:admin), tags: [other_tag.name])).to be true
+ expect(
+ PostRevisor.new(post).revise!(
+ Fabricate(:admin, refresh_auto_groups: true),
+ tags: [other_tag.name],
+ ),
+ ).to be true
expect(Notification.where(user_id: staged.id).count).to eq(0)
- expect(PostRevisor.new(post).revise!(Fabricate(:admin), tags: [other_tag2.name])).to be true
+ expect(
+ PostRevisor.new(post).revise!(
+ Fabricate(:admin, refresh_auto_groups: true),
+ tags: [other_tag2.name],
+ ),
+ ).to be true
expect(Notification.where(user_id: admin.id).count).to eq(0)
- expect(PostRevisor.new(post).revise!(Fabricate(:admin), tags: [other_tag3.name])).to be true
+ expect(
+ PostRevisor.new(post).revise!(
+ Fabricate(:admin, refresh_auto_groups: true),
+ tags: [other_tag3.name],
+ ),
+ ).to be true
expect(Notification.where(user_id: admin.id).count).to eq(1)
end
end