DEV: Allow fab! without block (#24314)

The most common thing that we do with fab! is: fab!(:thing) { Fabricate(:thing) } This commit adds a shorthand for this which is just simply: fab!(:thing) i.e. If you omit the block, then, by default, you'll get a `Fabricate`d object using the fabricator of the same name.
2025-02-25 18:55:32 -06:00 · 2023-11-09 16:47:59 -06:00
parent d91456fd53
commit 6e161d3e75
471 changed files with 1277 additions and 1273 deletions
--- a/plugins/chat/spec/integration/auto_channel_user_removal_spec.rb
+++ b/plugins/chat/spec/integration/auto_channel_user_removal_spec.rb
@@ -99,7 +99,7 @@ describe "Automatic user removal from channels" do

  context "when a user is removed from a group" do
    context "when the user is no longer in any chat_allowed_groups" do
-      fab!(:group) { Fabricate(:group) }
+      fab!(:group)

      before do
        group.add(user_1)
--- a/plugins/chat/spec/integration/custom_api_key_scopes_spec.rb
+++ b/plugins/chat/spec/integration/custom_api_key_scopes_spec.rb
@@ -8,7 +8,7 @@ describe "API keys scoped to chat#create_message" do
    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
  end

-  fab!(:admin) { Fabricate(:admin) }
+  fab!(:admin)
  fab!(:chat_channel) { Fabricate(:category_channel) }
  fab!(:chat_channel_2) { Fabricate(:category_channel) }

--- a/plugins/chat/spec/integration/outgoing_web_hooks_spec.rb
+++ b/plugins/chat/spec/integration/outgoing_web_hooks_spec.rb
@@ -99,7 +99,7 @@ RSpec.describe "Outgoing chat webhooks" do
    end

    context "for a category channel" do
-      fab!(:category) { Fabricate(:category) }
+      fab!(:category)
      fab!(:chat_channel) { Fabricate(:category_channel, chatable: category) }
      fab!(:chat_message) { Fabricate(:chat_message, chat_channel: chat_channel, user: user1) }

--- a/plugins/chat/spec/integration/post_chat_quote_spec.rb
+++ b/plugins/chat/spec/integration/post_chat_quote_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true

 describe "chat bbcode quoting in posts" do
-  fab!(:post) { Fabricate(:post) }
+  fab!(:post)

  before { SiteSetting.chat_enabled = true }

--- a/plugins/chat/spec/integration/thread_replies_count_cache_accuracy_spec.rb
+++ b/plugins/chat/spec/integration/thread_replies_count_cache_accuracy_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe "Chat::Thread replies_count cache accuracy" do
  include ActiveSupport::Testing::TimeHelpers

-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)
  fab!(:thread) { Fabricate(:chat_thread) }

  let(:guardian) { user.guardian }
--- a/plugins/chat/spec/jobs/regular/chat/channel_archive_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/channel_archive_spec.rb
@@ -5,7 +5,7 @@ require "rails_helper"
 describe Jobs::Chat::ChannelArchive do
  fab!(:chat_channel) { Fabricate(:category_channel) }
  fab!(:user) { Fabricate(:user, admin: true) }
-  fab!(:category) { Fabricate(:category) }
+  fab!(:category)
  fab!(:chat_archive) do
    Chat::ChannelArchive.create!(
      chat_channel: chat_channel,
--- a/plugins/chat/spec/jobs/regular/chat/channel_delete_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/channel_delete_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true

 describe Jobs::Chat::ChannelDelete do
-  fab!(:chat_channel) { Fabricate(:chat_channel) }
+  fab!(:chat_channel)
  fab!(:user1) { Fabricate(:user) }
  fab!(:user2) { Fabricate(:user) }
  fab!(:user3) { Fabricate(:user) }
--- a/plugins/chat/spec/jobs/regular/chat/notify_watching_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/notify_watching_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Jobs::Chat::NotifyWatching do
  fab!(:user1) { Fabricate(:user) }
  fab!(:user2) { Fabricate(:user) }
  fab!(:user3) { Fabricate(:user) }
-  fab!(:group) { Fabricate(:group) }
+  fab!(:group)
  let(:except_user_ids) { [] }

  before do
--- a/plugins/chat/spec/jobs/regular/chat/send_message_notifications_spec.rb
+++ b/plugins/chat/spec/jobs/regular/chat/send_message_notifications_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Jobs::Chat::SendMessageNotifications do
    end

    context "when there's a message" do
-      fab!(:chat_message) { Fabricate(:chat_message) }
+      fab!(:chat_message)

      it "does nothing when the reason is invalid" do
        Chat::Notifier.expects(:notify_new).never
--- a/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb
+++ b/plugins/chat/spec/lib/chat/channel_archive_service_spec.rb
@@ -8,7 +8,7 @@ describe Chat::ChannelArchiveService do

  fab!(:channel) { Fabricate(:category_channel) }
  fab!(:user) { Fabricate(:user, admin: true) }
-  fab!(:category) { Fabricate(:category) }
+  fab!(:category)

  let(:topic_params) { { topic_title: "This will be a new topic", category_id: category.id } }

@@ -304,7 +304,7 @@ describe Chat::ChannelArchiveService do
    end

    context "when archiving to an existing topic" do
-      fab!(:topic) { Fabricate(:topic) }
+      fab!(:topic)
      let(:topic_params) { { topic_id: topic.id } }

      before { 3.times { Fabricate(:post, topic: topic) } }
--- a/plugins/chat/spec/lib/chat/channel_fetcher_spec.rb
+++ b/plugins/chat/spec/lib/chat/channel_fetcher_spec.rb
@@ -149,7 +149,7 @@ describe Chat::ChannelFetcher do
      end

      context "when restricted category" do
-        fab!(:group) { Fabricate(:group) }
+        fab!(:group)
        fab!(:group_user) { Fabricate(:group_user, group: group, user: user1) }

        it "does not include the category channel for member of group with readonly access" do
--- a/plugins/chat/spec/lib/chat/channel_hashtag_data_source_spec.rb
+++ b/plugins/chat/spec/lib/chat/channel_hashtag_data_source_spec.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true

 RSpec.describe Chat::ChannelHashtagDataSource do
-  fab!(:user) { Fabricate(:user) }
-  fab!(:category) { Fabricate(:category) }
-  fab!(:group) { Fabricate(:group) }
+  fab!(:user)
+  fab!(:category)
+  fab!(:group)
  fab!(:private_category) { Fabricate(:private_category, group: group) }
  fab!(:channel1) do
    Fabricate(
--- a/plugins/chat/spec/lib/chat/channel_membership_manager_spec.rb
+++ b/plugins/chat/spec/lib/chat/channel_membership_manager_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true

 RSpec.describe Chat::ChannelMembershipManager do
-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)
  fab!(:channel1) { Fabricate(:category_channel) }
  fab!(:channel2) { Fabricate(:category_channel) }

--- a/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
+++ b/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
@@ -91,7 +91,7 @@ RSpec.describe Chat::GuardianExtensions do
      end

      context "for category channel" do
-        fab!(:group) { Fabricate(:group) }
+        fab!(:group)
        fab!(:group_user) { Fabricate(:group_user, group: group, user: user) }

        it "returns true if the user can join the category" do
@@ -207,7 +207,7 @@ RSpec.describe Chat::GuardianExtensions do
          end

          context "when user can't post in chatable" do
-            fab!(:group) { Fabricate(:group) }
+            fab!(:group)
            fab!(:channel) { Fabricate(:private_category_channel, group: group) }

            before do
--- a/plugins/chat/spec/lib/chat/onebox_handler_spec.rb
+++ b/plugins/chat/spec/lib/chat/onebox_handler_spec.rb
@@ -6,7 +6,7 @@ describe Chat::OneboxHandler do
  fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
  fab!(:private_channel) { Fabricate(:category_channel, chatable: private_category) }
  fab!(:public_channel) { Fabricate(:category_channel) }
-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)
  fab!(:user_2) { Fabricate(:user, active: false) }
  fab!(:user_3) { Fabricate(:user, staged: true) }
  fab!(:user_4) { Fabricate(:user, suspended_till: 3.weeks.from_now) }
--- a/plugins/chat/spec/lib/chat/parsed_mentions_spec.rb
+++ b/plugins/chat/spec/lib/chat/parsed_mentions_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Chat::ParsedMentions do
  fab!(:channel_member_2) { Fabricate(:user) }
  fab!(:channel_member_3) { Fabricate(:user) }
  fab!(:not_a_channel_member) { Fabricate(:user) }
-  fab!(:chat_channel) { Fabricate(:chat_channel) }
+  fab!(:chat_channel)

  before do
    chat_channel.add(channel_member_1)
--- a/plugins/chat/spec/lib/chat/review_queue_spec.rb
+++ b/plugins/chat/spec/lib/chat/review_queue_spec.rb
@@ -9,7 +9,7 @@ describe Chat::ReviewQueue do
  fab!(:flagger) { Fabricate(:user) }
  fab!(:chat_channel) { Fabricate(:category_channel) }
  fab!(:message) { Fabricate(:chat_message, user: message_poster, chat_channel: chat_channel) }
-  fab!(:admin) { Fabricate(:admin) }
+  fab!(:admin)

  let(:guardian) { Guardian.new(flagger) }
  let(:admin_guardian) { Guardian.new(admin) }
--- a/plugins/chat/spec/models/chat/message_spec.rb
+++ b/plugins/chat/spec/models/chat/message_spec.rb
@@ -496,11 +496,11 @@ describe Chat::Message do
  end

  describe "#rebake!" do
-    fab!(:chat_message) { Fabricate(:chat_message) }
+    fab!(:chat_message)

    describe "hashtags" do
-      fab!(:category) { Fabricate(:category) }
-      fab!(:group) { Fabricate(:group) }
+      fab!(:category)
+      fab!(:group)
      fab!(:secure_category) { Fabricate(:private_category, group: group) }

      before do
--- a/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb
+++ b/plugins/chat/spec/models/chat/reviewable_chat_message_spec.rb
@@ -3,9 +3,9 @@
 require "rails_helper"

 RSpec.describe Chat::ReviewableMessage, type: :model do
-  fab!(:moderator) { Fabricate(:moderator) }
-  fab!(:user) { Fabricate(:user) }
-  fab!(:chat_channel) { Fabricate(:chat_channel) }
+  fab!(:moderator)
+  fab!(:user)
+  fab!(:chat_channel)
  fab!(:chat_message) { Fabricate(:chat_message, chat_channel: chat_channel, user: user) }
  fab!(:reviewable) do
    Fabricate(:chat_reviewable_message, target: chat_message, created_by: moderator)
--- a/plugins/chat/spec/plugin_spec.rb
+++ b/plugins/chat/spec/plugin_spec.rb
@@ -12,7 +12,7 @@ describe Chat do

  describe "register_upload_unused" do
    fab!(:chat_channel) { Fabricate(:chat_channel, chatable: Fabricate(:category)) }
-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)
    fab!(:upload) { Fabricate(:upload, user: user, created_at: 1.month.ago) }
    fab!(:unused_upload) { Fabricate(:upload, user: user, created_at: 1.month.ago) }

@@ -37,7 +37,7 @@ describe Chat do

  describe "register_upload_in_use" do
    fab!(:chat_channel) { Fabricate(:chat_channel, chatable: Fabricate(:category)) }
-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)
    fab!(:message_upload) { Fabricate(:upload, user: user, created_at: 1.month.ago) }
    fab!(:draft_upload) { Fabricate(:upload, user: user, created_at: 1.month.ago) }
    fab!(:unused_upload) { Fabricate(:upload, user: user, created_at: 1.month.ago) }
@@ -75,7 +75,7 @@ describe Chat do
    let!(:user) { Fabricate(:user) }
    let!(:guardian) { Guardian.new(user) }
    let(:serializer) { UserCardSerializer.new(target_user, scope: guardian) }
-    fab!(:group) { Fabricate(:group) }
+    fab!(:group)

    context "when chat enabled" do
      before { SiteSetting.chat_enabled = true }
@@ -127,7 +127,7 @@ describe Chat do

  describe "chat oneboxes" do
    fab!(:chat_channel) { Fabricate(:category_channel) }
-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)

    fab!(:chat_message) do
      Fabricate(:chat_message, chat_channel: chat_channel, user: user, message: "Hello world!")
@@ -184,7 +184,7 @@ describe Chat do
    end

    describe "when a user is created" do
-      fab!(:category) { Fabricate(:category) }
+      fab!(:category)
      let(:user) { Fabricate(:user, last_seen_at: nil, first_seen_at: nil) }

      it "queues a job to auto-join the user the first time they log in" do
@@ -210,7 +210,7 @@ describe Chat do
    end

    describe "when category permissions change" do
-      fab!(:category) { Fabricate(:category) }
+      fab!(:category)

      let(:chatters_group_permission) do
        { chatters_group.name => CategoryGroup.permission_types[:full] }
@@ -261,7 +261,7 @@ describe Chat do
      SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
    end

-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)

    let(:serializer) { CurrentUserSerializer.new(user, scope: Guardian.new(user)) }

@@ -330,7 +330,7 @@ describe Chat do
      SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
    end

-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)
    let(:serializer) { CurrentUserSerializer.new(user, scope: Guardian.new(user)) }

    context "when no channels exist" do
@@ -370,7 +370,7 @@ describe Chat do
  end

  describe "Deleting posts while deleting a user" do
-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)

    it "queues a job to also delete chat messages" do
      deletion_opts = { delete_posts: true }
--- a/plugins/chat/spec/policies/chat/channel/message_creation_policy_spec.rb
+++ b/plugins/chat/spec/policies/chat/channel/message_creation_policy_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe Chat::Channel::MessageCreationPolicy do
  subject(:policy) { described_class.new(context) }

-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)

  let(:guardian) { user.guardian }
  let(:context) { Service::Base::Context.build(channel: channel, guardian: guardian) }
--- a/plugins/chat/spec/queries/chat/channel_memberships_query_spec.rb
+++ b/plugins/chat/spec/queries/chat/channel_memberships_query_spec.rb
@@ -295,7 +295,7 @@ describe Chat::ChannelMembershipsQuery do

  context "when user is inactive" do
    fab!(:channel_1) { Fabricate(:category_channel) }
-    fab!(:inactive_user) { Fabricate(:inactive_user) }
+    fab!(:inactive_user)

    before do
      Chat::UserChatChannelMembership.create(
--- a/plugins/chat/spec/requests/admin/export_controller_spec.rb
+++ b/plugins/chat/spec/requests/admin/export_controller_spec.rb
@@ -4,9 +4,9 @@ require "rails_helper"

 RSpec.describe Chat::ChatController do
  describe "#export_messages" do
-    fab!(:user) { Fabricate(:user) }
-    fab!(:moderator) { Fabricate(:moderator) }
-    fab!(:admin) { Fabricate(:admin) }
+    fab!(:user)
+    fab!(:moderator)
+    fab!(:admin)

    it "enqueues the export job and logs into staff actions" do
      sign_in(admin)
--- a/plugins/chat/spec/requests/chat/admin/incoming_webhooks_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/admin/incoming_webhooks_controller_spec.rb
@@ -3,8 +3,8 @@
 require "rails_helper"

 RSpec.describe Chat::Admin::IncomingWebhooksController do
-  fab!(:admin) { Fabricate(:admin) }
-  fab!(:user) { Fabricate(:user) }
+  fab!(:admin)
+  fab!(:user)
  fab!(:chat_channel1) { Fabricate(:category_channel) }
  fab!(:chat_channel2) { Fabricate(:category_channel) }

--- a/plugins/chat/spec/requests/chat/api/category_chatables_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/category_chatables_controller_spec.rb
@@ -4,11 +4,11 @@ require "rails_helper"

 describe Chat::Api::CategoryChatablesController do
  describe "#access_by_category" do
-    fab!(:group) { Fabricate(:group) }
+    fab!(:group)
    fab!(:private_category) { Fabricate(:private_category, group: group) }

    context "when signed in as an admin" do
-      fab!(:admin) { Fabricate(:admin) }
+      fab!(:admin)

      before { sign_in(admin) }

@@ -90,7 +90,7 @@ describe Chat::Api::CategoryChatablesController do
    end

    context "when signed in as a regular user" do
-      fab!(:user) { Fabricate(:user) }
+      fab!(:user)

      before { sign_in(user) }

--- a/plugins/chat/spec/requests/chat/api/channels_archives_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_archives_controller_spec.rb
@@ -3,9 +3,9 @@
 require "rails_helper"

 RSpec.describe Chat::Api::ChannelsArchivesController do
-  fab!(:user) { Fabricate(:user) }
-  fab!(:admin) { Fabricate(:admin) }
-  fab!(:category) { Fabricate(:category) }
+  fab!(:user)
+  fab!(:admin)
+  fab!(:category)
  fab!(:channel) { Fabricate(:category_channel, chatable: category) }

  let(:new_topic_params) do
--- a/plugins/chat/spec/requests/chat/api/channels_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_controller_spec.rb
@@ -230,8 +230,8 @@ RSpec.describe Chat::Api::ChannelsController do
  end

  describe "#create" do
-    fab!(:admin) { Fabricate(:admin) }
-    fab!(:category) { Fabricate(:category) }
+    fab!(:admin)
+    fab!(:category)

    let(:params) do
      {
--- a/plugins/chat/spec/requests/chat/api/hints_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/hints_controller_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Chat::Api::HintsController do
    end

    context "for logged in users" do
-      fab!(:user) { Fabricate(:user) }
+      fab!(:user)
      fab!(:mentionable_group) do
        Fabricate(:group, mentionable_level: Group::ALIAS_LEVELS[:everyone])
      end
--- a/plugins/chat/spec/requests/chat/api/messages_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/messages_controller_spec.rb
@@ -2,7 +2,7 @@

 RSpec.describe Chat::Api::ChannelMessagesController do
  fab!(:current_user) { Fabricate(:user) }
-  fab!(:admin) { Fabricate(:admin) }
+  fab!(:admin)

  before do
    SiteSetting.chat_enabled = true
@@ -68,7 +68,7 @@ RSpec.describe Chat::Api::ChannelMessagesController do

    describe "for category" do
      fab!(:user_2) { Fabricate(:user) }
-      fab!(:chat_channel) { Fabricate(:chat_channel) }
+      fab!(:chat_channel)
      fab!(:message) { Fabricate(:chat_message, chat_channel: chat_channel, user: current_user) }
      fab!(:user_2_message) { Fabricate(:chat_message, chat_channel: chat_channel, user: user_2) }

@@ -178,11 +178,11 @@ RSpec.describe Chat::Api::ChannelMessagesController do
      end
    end

-    fab!(:admin) { Fabricate(:admin) }
+    fab!(:admin)
    fab!(:another_user) { Fabricate(:user) }

    describe "for category" do
-      fab!(:category) { Fabricate(:category) }
+      fab!(:category)
      fab!(:chat_channel) { Fabricate(:category_channel, chatable: category) }

      it_behaves_like "chat_message_restoration"
@@ -199,8 +199,8 @@ RSpec.describe Chat::Api::ChannelMessagesController do
  end

  describe "#create" do
-    fab!(:user) { Fabricate(:user) }
-    fab!(:category) { Fabricate(:category) }
+    fab!(:user)
+    fab!(:category)

    let(:message) { "This is a message" }

--- a/plugins/chat/spec/requests/chat/api/reads_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/reads_controller_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Chat::Api::ReadsController do

  describe "#read" do
    describe "marking a single message read" do
-      fab!(:chat_channel) { Fabricate(:chat_channel) }
+      fab!(:chat_channel)
      fab!(:other_user) { Fabricate(:user) }
      fab!(:message_1) { Fabricate(:chat_message, chat_channel: chat_channel, user: other_user) }
      fab!(:message_2) { Fabricate(:chat_message, chat_channel: chat_channel, user: other_user) }
--- a/plugins/chat/spec/requests/chat/api/summaries_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/summaries_controller_spec.rb
@@ -2,7 +2,7 @@

 RSpec.describe Chat::Api::SummariesController do
  fab!(:current_user) { Fabricate(:user) }
-  fab!(:group) { Fabricate(:group) }
+  fab!(:group)
  let(:plugin) { Plugin::Instance.new }

  before do
--- a/plugins/chat/spec/requests/chat_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat_controller_spec.rb
@@ -3,13 +3,13 @@
 require "rails_helper"

 RSpec.describe Chat::ChatController do
-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)
  fab!(:other_user) { Fabricate(:user) }
-  fab!(:admin) { Fabricate(:admin) }
-  fab!(:category) { Fabricate(:category) }
+  fab!(:admin)
+  fab!(:category)
  fab!(:chat_channel) { Fabricate(:category_channel, chatable: category) }
  fab!(:dm_chat_channel) { Fabricate(:direct_message_channel, users: [user, other_user, admin]) }
-  fab!(:tag) { Fabricate(:tag) }
+  fab!(:tag)

  MESSAGE_COUNT = 70
  MESSAGE_COUNT.times do |n|
--- a/plugins/chat/spec/requests/core_ext/categories_controller_spec.rb
+++ b/plugins/chat/spec/requests/core_ext/categories_controller_spec.rb
@@ -4,9 +4,9 @@ RSpec.describe CategoriesController do
  describe "#destroy" do
    subject(:destroy_category) { delete "/categories/#{category.slug}.json" }

-    fab!(:admin) { Fabricate(:admin) }
+    fab!(:admin)
    fab!(:category) { Fabricate(:category, user: admin) }
-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)

    context "when user is staff" do
      before { sign_in(admin) }
--- a/plugins/chat/spec/requests/core_ext/email_controller_spec.rb
+++ b/plugins/chat/spec/requests/core_ext/email_controller_spec.rb
@@ -4,7 +4,7 @@ require "rails_helper"

 describe EmailController do
  describe "unsubscribing from chat email settings" do
-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)

    it "updates an user chat summary frequency" do
      SiteSetting.chat_enabled = true
--- a/plugins/chat/spec/requests/direct_messages_controller_spec.rb
+++ b/plugins/chat/spec/requests/direct_messages_controller_spec.rb
@@ -3,7 +3,7 @@
 require "rails_helper"

 RSpec.describe Chat::DirectMessagesController do
-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)
  fab!(:user1) { Fabricate(:user) }
  fab!(:user2) { Fabricate(:user) }
  fab!(:user3) { Fabricate(:user) }
--- a/plugins/chat/spec/serializer/chat/channel_serializer_spec.rb
+++ b/plugins/chat/spec/serializer/chat/channel_serializer_spec.rb
@@ -5,9 +5,9 @@ require "rails_helper"
 describe Chat::ChannelSerializer do
  subject(:serializer) { described_class.new(chat_channel, scope: guardian, root: nil) }

-  fab!(:user) { Fabricate(:user) }
-  fab!(:admin) { Fabricate(:admin) }
-  fab!(:chat_channel) { Fabricate(:chat_channel) }
+  fab!(:user)
+  fab!(:admin)
+  fab!(:chat_channel)

  let(:guardian_user) { user }
  let(:guardian) { Guardian.new(guardian_user) }
@@ -52,7 +52,7 @@ describe Chat::ChannelSerializer do

  describe "#meta" do
    context "for category channels" do
-      fab!(:chat_channel) { Fabricate(:chat_channel) }
+      fab!(:chat_channel)

      it "has the required message_bus_last_ids keys and calls MessageBus" do
        MessageBus.expects(:last_id).with(Chat::Publisher.root_message_bus_channel(chat_channel.id))
--- a/plugins/chat/spec/serializer/chat/chat_message_user_serializer_spec.rb
+++ b/plugins/chat/spec/serializer/chat/chat_message_user_serializer_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe Chat::MessageUserSerializer do
  end

  context "when user has a primary group" do
-    fab!(:group) { Fabricate(:group) }
+    fab!(:group)

    before { params[:primary_group_id] = group.id }

--- a/plugins/chat/spec/serializer/chat/in_reply_to_serializer_spec.rb
+++ b/plugins/chat/spec/serializer/chat/in_reply_to_serializer_spec.rb
@@ -5,7 +5,7 @@ require "rails_helper"
 RSpec.describe Chat::InReplyToSerializer do
  subject(:serializer) { described_class.new(message, scope: guardian, root: nil) }

-  fab!(:chat_channel) { Fabricate(:chat_channel) }
+  fab!(:chat_channel)
  let(:guardian) { Guardian.new(Fabricate(:user)) }

  describe "#user" do
--- a/plugins/chat/spec/services/actions/publish_and_follow_direct_message_channel_spec.rb
+++ b/plugins/chat/spec/services/actions/publish_and_follow_direct_message_channel_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe Chat::Action::PublishAndFollowDirectMessageChannel do
  subject(:action) { described_class.call(channel_membership: membership) }

-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)

  let(:membership) { user.user_chat_channel_memberships.last }

--- a/plugins/chat/spec/services/chat/create_category_channel_spec.rb
+++ b/plugins/chat/spec/services/chat/create_category_channel_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Chat::CreateCategoryChannel do
    subject(:result) { described_class.call(params) }

    fab!(:current_user) { Fabricate(:admin) }
-    fab!(:category) { Fabricate(:category) }
+    fab!(:category)
    let(:category_id) { category.id }

    let(:guardian) { Guardian.new(current_user) }
--- a/plugins/chat/spec/services/chat/create_message_spec.rb
+++ b/plugins/chat/spec/services/chat/create_message_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Chat::CreateMessage do
  describe ".call" do
    subject(:result) { described_class.call(params) }

-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)
    fab!(:other_user) { Fabricate(:user) }
    fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
    fab!(:thread) { Fabricate(:chat_thread, channel: channel) }
--- a/plugins/chat/spec/services/chat/list_channel_messages_spec.rb
+++ b/plugins/chat/spec/services/chat/list_channel_messages_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe Chat::ListChannelMessages do
  subject(:result) { described_class.call(params) }

-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)
  fab!(:channel) { Fabricate(:chat_channel) }

  let(:guardian) { Guardian.new(user) }
--- a/plugins/chat/spec/services/chat/list_channel_thread_messages_spec.rb
+++ b/plugins/chat/spec/services/chat/list_channel_thread_messages_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe Chat::ListChannelThreadMessages do
  subject(:result) { described_class.call(params) }

-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)
  fab!(:thread) do
    Fabricate(:chat_thread, channel: Fabricate(:chat_channel, threading_enabled: true))
  end
--- a/plugins/chat/spec/services/chat/publisher_spec.rb
+++ b/plugins/chat/spec/services/chat/publisher_spec.rb
@@ -63,7 +63,7 @@ describe Chat::Publisher do
  describe ".publish_user_tracking_state!" do
    fab!(:channel) { Fabricate(:category_channel) }
    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel) }
-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)

    let(:data) do
      MessageBus
--- a/plugins/chat/spec/services/chat/update_message_spec.rb
+++ b/plugins/chat/spec/services/chat/update_message_spec.rb
@@ -652,7 +652,7 @@ RSpec.describe Chat::UpdateMessage do
    end

    describe "watched words" do
-      fab!(:watched_word) { Fabricate(:watched_word) }
+      fab!(:watched_word)

      it "errors when a blocked word is present" do
        chat_message = create_chat_message(user1, "something", public_chat_channel)
--- a/plugins/chat/spec/support/examples/channel_access_example.rb
+++ b/plugins/chat/spec/support/examples/channel_access_example.rb
@@ -25,7 +25,7 @@ RSpec.shared_examples "channel access example" do |verb, endpoint, params|
  context "when channel can’t be seen by current user" do
    fab!(:chatable) { Fabricate(:private_category, group: Fabricate(:group)) }
    fab!(:chat_channel) { Fabricate(:category_channel, chatable: chatable) }
-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)
    fab!(:membership) do
      Fabricate(:user_chat_channel_membership, user: user, chat_channel: chat_channel)
    end
--- a/plugins/chat/spec/support/examples/chat_channel_model.rb
+++ b/plugins/chat/spec/support/examples/chat_channel_model.rb
@@ -4,7 +4,7 @@ RSpec.shared_examples "a chat channel model" do
  fab!(:user1) { Fabricate(:user) }
  fab!(:user2) { Fabricate(:user) }
  fab!(:staff) { Fabricate(:user, admin: true) }
-  fab!(:group) { Fabricate(:group) }
+  fab!(:group)
  fab!(:private_category) { Fabricate(:private_category, group: group) }
  fab!(:private_category_channel) { Fabricate(:category_channel, chatable: private_category) }
  fab!(:direct_message_channel) { Fabricate(:direct_message_channel, users: [user1, user2]) }
--- a/plugins/chat/spec/system/admin/csv_exports_spec.rb
+++ b/plugins/chat/spec/system/admin/csv_exports_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true

 RSpec.describe "Chat CSV exports", type: :system do
-  fab!(:admin) { Fabricate(:admin) }
+  fab!(:admin)
  let(:csv_export_pm_page) { PageObjects::Pages::CSVExportPM.new }

  before do
--- a/plugins/chat/spec/system/anonymous_spec.rb
+++ b/plugins/chat/spec/system/anonymous_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true

 RSpec.describe "Anonymous", type: :system do
-  fab!(:topic) { Fabricate(:topic) }
+  fab!(:topic)

  before { chat_system_bootstrap }

--- a/plugins/chat/spec/system/chat_summarization_spec.rb
+++ b/plugins/chat/spec/system/chat_summarization_spec.rb
@@ -2,7 +2,7 @@

 RSpec.describe "Summarize a channel since your last visit", type: :system, js: true do
  fab!(:current_user) { Fabricate(:user) }
-  fab!(:group) { Fabricate(:group) }
+  fab!(:group)
  let(:plugin) { Plugin::Instance.new }

  fab!(:channel) { Fabricate(:chat_channel) }
--- a/plugins/chat/spec/system/hashtag_autocomplete_spec.rb
+++ b/plugins/chat/spec/system/hashtag_autocomplete_spec.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true

 describe "Using #hashtag autocompletion to search for and lookup channels", type: :system do
-  fab!(:user) { Fabricate(:user) }
+  fab!(:user)
  fab!(:channel1) { Fabricate(:chat_channel, name: "Music Lounge", slug: "music") }
  fab!(:channel2) { Fabricate(:chat_channel, name: "Random", slug: "random") }
  fab!(:category) { Fabricate(:category, name: "Raspberry", slug: "raspberry-beret") }
  fab!(:tag) { Fabricate(:tag, name: "razed") }
-  fab!(:topic) { Fabricate(:topic) }
+  fab!(:topic)
  fab!(:post) { Fabricate(:post, topic: topic) }
  fab!(:message1) { Fabricate(:chat_message, chat_channel: channel1) }
  let(:chat_page) { PageObjects::Pages::Chat.new }
@@ -128,7 +128,7 @@ describe "Using #hashtag autocompletion to search for and lookup channels", type
  end

  context "when a user cannot access the category for a cooked channel hashtag" do
-    fab!(:admin) { Fabricate(:admin) }
+    fab!(:admin)
    fab!(:manager_group) { Fabricate(:group, name: "Managers") }
    fab!(:private_category) do
      Fabricate(:private_category, name: "Management", slug: "management", group: manager_group)
--- a/plugins/chat/spec/system/navigation_spec.rb
+++ b/plugins/chat/spec/system/navigation_spec.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true

 RSpec.describe "Navigation", type: :system do
-  fab!(:category) { Fabricate(:category) }
-  fab!(:topic) { Fabricate(:topic) }
+  fab!(:category)
+  fab!(:topic)
  fab!(:post) { Fabricate(:post, topic: topic) }
  fab!(:current_user) { Fabricate(:admin) }
-  fab!(:category_channel) { Fabricate(:category_channel) }
+  fab!(:category_channel)
  fab!(:category_channel_2) { Fabricate(:category_channel) }
  fab!(:message) { Fabricate(:chat_message, chat_channel: category_channel) }
  let(:chat_page) { PageObjects::Pages::Chat.new }
--- a/plugins/chat/spec/system/sidebars_spec.rb
+++ b/plugins/chat/spec/system/sidebars_spec.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true

 RSpec.describe "Navigation", type: :system do
-  fab!(:category) { Fabricate(:category) }
-  fab!(:topic) { Fabricate(:topic) }
+  fab!(:category)
+  fab!(:topic)
  fab!(:post) { Fabricate(:post, topic: topic) }
  fab!(:user) { Fabricate(:admin) }
-  fab!(:category_channel) { Fabricate(:category_channel) }
+  fab!(:category_channel)
  fab!(:category_channel_2) { Fabricate(:category_channel) }
  let(:chat_page) { PageObjects::Pages::Chat.new }
  let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
--- a/plugins/chat/spec/system/transcript_spec.rb
+++ b/plugins/chat/spec/system/transcript_spec.rb
@@ -2,7 +2,7 @@

 RSpec.describe "Quoting chat message transcripts", type: :system do
  fab!(:current_user) { Fabricate(:user) }
-  fab!(:admin) { Fabricate(:admin) }
+  fab!(:admin)
  fab!(:chat_channel_1) { Fabricate(:chat_channel) }

  let(:cdp) { PageObjects::CDP.new }
--- a/plugins/chat/spec/system/visit_channel_spec.rb
+++ b/plugins/chat/spec/system/visit_channel_spec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true

 RSpec.describe "Visit channel", type: :system do
-  fab!(:category) { Fabricate(:category) }
-  fab!(:topic) { Fabricate(:topic) }
+  fab!(:category)
+  fab!(:topic)
  fab!(:post) { Fabricate(:post, topic: topic) }
  fab!(:current_user) { Fabricate(:user) }
  fab!(:category_channel_1) { Fabricate(:category_channel) }