Skip to content

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

DEV: Update rubocop (#38721)

Jarek Radosz38533d69e34a
diff --git a/.rubocop.yml b/.rubocop.yml
index f1e4cca7ad3..64372cac161 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,10 @@
inherit_gem:
rubocop-discourse: stree-compat.yml
+inherit_mode:
+ merge:
+ - Exclude
+
# Still work to do in ensuring we don't link old files
Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
Enabled: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 705cdea5869..26f30f05b11 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -285,6 +285,8 @@ GEM
net-smtp
matrix (0.4.3)
maxminddb (0.1.22)
+ mcp (0.8.0)
+ json-schema (>= 4.1)
memory_profiler (1.1.0)
message_bus (4.5.2)
rack (> 2, < 4)
@@ -557,42 +559,45 @@ GEM
rspec-core (>= 2.14)
rtlcss (0.2.1)
mini_racer (>= 0.6.3)
- rubocop (1.81.7)
+ rubocop (1.85.1)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
+ mcp (~> 0.6)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
- rubocop-ast (>= 1.47.1, < 2.0)
+ rubocop-ast (>= 1.49.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
- rubocop-ast (1.49.0)
+ rubocop-ast (1.49.1)
parser (>= 3.3.7.2)
prism (~> 1.7)
rubocop-capybara (2.22.1)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
- rubocop-discourse (3.13.3)
+ rubocop-discourse (3.16.0)
activesupport (>= 6.1)
lint_roller (>= 1.1.0)
- rubocop (>= 1.73.2)
rubocop-capybara (>= 2.22.0)
+ rubocop-discourse-base (>= 1.0.0)
rubocop-factory_bot (>= 2.27.0)
rubocop-rails (>= 2.30.3)
rubocop-rspec (>= 3.0.1)
rubocop-rspec_rails (>= 2.31.0)
+ rubocop-discourse-base (1.0.0)
+ rubocop (>= 1.80.0)
rubocop-factory_bot (2.28.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
- rubocop-rails (2.33.4)
+ rubocop-rails (2.34.3)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.44.0, < 2.0)
- rubocop-rspec (3.8.0)
+ rubocop-rspec (3.9.0)
lint_roller (~> 1.1)
rubocop (~> 1.81)
rubocop-rspec_rails (2.32.0)
@@ -1061,6 +1066,7 @@ CHECKSUMS
mail (2.9.0) sha256=6fa6673ecd71c60c2d996260f9ee3dd387d4673b8169b502134659ece6d34941
matrix (0.4.3) sha256=a0d5ab7ddcc1973ff690ab361b67f359acbb16958d1dc072b8b956a286564c5b
maxminddb (0.1.22) sha256=50933be438fbed9dceabef4163eab41884bd8830d171fdb8f739bee769c4907e
+ mcp (0.8.0) sha256=ae8bd146bb8e168852866fd26f805f52744f6326afb3211e073f78a95e0c34fb
memory_profiler (1.1.0) sha256=79a17df7980a140c83c469785905409d3027ca614c42c086089d128b805aa8f8
message_bus (4.5.2) sha256=f1381bce05d9560e5ea7dfa56e44dfdf0080bda0ac02f4011eb662bb7dd9e778
messageformat-wrapper (1.1.0) sha256=ecea879626e412d1bc841c457dacfcbb1a62cf88ca83573e4ea34bb371f160bc
@@ -1183,13 +1189,14 @@ CHECKSUMS
rss (0.3.2) sha256=3bd0446d32d832cda00ba07f4b179401f903b52ea1fdaac0f1f08de61a501efa
rswag-specs (2.17.0) sha256=a3b2bdf6df89f8741fe4a4ee47ceb1e77dc13e1c96bbe07352117d6e61afa9e3
rtlcss (0.2.1) sha256=213d5a00bf61267f93a7a516d699d77e1cc5f396743abb33c01e3f3243a7bf60
- rubocop (1.81.7) sha256=6fb5cc298c731691e2a414fe0041a13eb1beed7bab23aec131da1bcc527af094
- rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
+ rubocop (1.85.1) sha256=3dbcf9e961baa4c376eeeb2a03913dca5e3987033b04d38fa538aa1e7406cc77
+ rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
rubocop-capybara (2.22.1) sha256=ced88caef23efea53f46e098ff352f8fc1068c649606ca75cb74650970f51c0c
- rubocop-discourse (3.13.3) sha256=637395e37ac45f0c5ba4376d7648b5f1e3a8406697c38befb66a9729738a059f
+ rubocop-discourse (3.16.0) sha256=a5119262b62d727226c40661649dc937e80cb3e92b4b652fd44e04cd73930da0
+ rubocop-discourse-base (1.0.0) sha256=a4121f0f2a8e32c3259fee22106af9fd35372cbeac14b0c69673bdee79b472b7
rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb
- rubocop-rails (2.33.4) sha256=34ec8f6637706dc224483d949ccc88b3e41596a81a11a1ec0c7d74ecbea356b5
- rubocop-rspec (3.8.0) sha256=28440dccb3f223a9938ca1f946bd3438275b8c6c156dab909e2cb8bc424cab33
+ rubocop-rails (2.34.3) sha256=10d37989024865ecda8199f311f3faca990143fbac967de943f88aca11eb9ad2
+ rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100
ruby-lsp (0.26.8) sha256=fa607c342736c6ea791c945ae05025bc306ef9dd72c640b0b660478c5832f968
ruby-lsp-rails (0.4.8) sha256=f09d1f926d4063deeb2f3049311925c20dfe6c912371e3bcd04a265a865c44ae
diff --git a/app/controllers/admin/user_fields_controller.rb b/app/controllers/admin/user_fields_controller.rb
index 7b13d7216e2..2f712c884a1 100644
--- a/app/controllers/admin/user_fields_controller.rb
+++ b/app/controllers/admin/user_fields_controller.rb
@@ -60,7 +60,8 @@ class Admin::UserFieldsController < Admin::AdminController
def destroy
field = UserField.where(id: params.require(:id)).first
- field.destroy if field.present?
+ field.presence&.destroy
+
render json: success_json
end
diff --git a/app/jobs/regular/remove_banner.rb b/app/jobs/regular/remove_banner.rb
index 6ef278e6d5f..86e241eba73 100644
--- a/app/jobs/regular/remove_banner.rb
+++ b/app/jobs/regular/remove_banner.rb
@@ -8,7 +8,7 @@ module Jobs
return if topic_id.blank?
topic = Topic.find_by(id: topic_id)
- topic.remove_banner!(Discourse.system_user) if topic.present?
+ topic.presence&.remove_banner!(Discourse.system_user)
end
end
end
diff --git a/app/jobs/regular/unpin_topic.rb b/app/jobs/regular/unpin_topic.rb
index ebf093e82fa..f2e2f7370fe 100644
--- a/app/jobs/regular/unpin_topic.rb
+++ b/app/jobs/regular/unpin_topic.rb
@@ -8,7 +8,7 @@ module Jobs
return if topic_id.blank?
topic = Topic.find_by(id: topic_id)
- topic.update_pinned(false) if topic.present?
+ topic.presence&.update_pinned(false)
end
end
end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 7d4cf76e1e4..513dfd4cffe 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -279,7 +279,7 @@ class Notification < ActiveRecord::Base
end
def url
- topic.relative_url(post_number) if topic.present?
+ topic.presence&.relative_url(post_number)
end
def post
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 36e6ddf6551..012a29f28a3 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -1415,7 +1415,7 @@ class Topic < ActiveRecord::Base
# only one banner at the same time
previous_banner = Topic.where(archetype: Archetype.banner).first
- previous_banner.remove_banner!(user) if previous_banner.present?
+ previous_banner.presence&.remove_banner!(user)
UserProfile.where.not(dismissed_banner_key: nil).update_all(dismissed_banner_key: nil)
diff --git a/app/serializers/site_text_serializer.rb b/app/serializers/site_text_serializer.rb
index e02f1f1f166..aee87d07d5d 100644
--- a/app/serializers/site_text_serializer.rb
+++ b/app/serializers/site_text_serializer.rb
@@ -27,11 +27,11 @@ class SiteTextSerializer < ApplicationSerializer
end
def old_default
- override.original_translation if override.present?
+ override.presence&.original_translation
end
def new_default
- override.current_default if override.present?
+ override.presence&.current_default
end
def interpolation_keys
diff --git a/lib/encodings.rb b/lib/encodings.rb
index fcabaa89933..8e33f214d8b 100644
--- a/lib/encodings.rb
+++ b/lib/encodings.rb
@@ -26,7 +26,7 @@ module Encodings
end
def self.delete_bom!(string)
- string.sub!(/\A\xEF\xBB\xBF/, "") if string.present?
+ string.presence&.sub!(/\A\xEF\xBB\xBF/, "")
string
end
end
diff --git a/migrations/lib/uploader/site_settings.rb b/migrations/lib/uploader/site_settings.rb
index c5fd630795c..4fd614ec1fc 100644
--- a/migrations/lib/uploader/site_settings.rb
+++ b/migrations/lib/uploader/site_settings.rb
@@ -30,9 +30,7 @@ module Migrations
end
def configure_multisite
- # rubocop:disable Discourse/NoDirectMultisiteManipulation
Rails.configuration.multisite = true
- # rubocop:enable Discourse/NoDirectMultisiteManipulation
RailsMultisite::ConnectionManagement.class_eval do
def self.current_db_override=(value)
diff --git a/plugins/automation/spec/system/admin_plugins_list_spec.rb b/plugins/automation/spec/system/admin_plugins_list_spec.rb
index f8b48b0efb1..b00273c6dee 100644
--- a/plugins/automation/spec/system/admin_plugins_list_spec.rb
+++ b/plugins/automation/spec/system/admin_plugins_list_spec.rb
@@ -2,7 +2,7 @@
# NOTE: This spec covers core functionality, but it is much easier
# to test plugin related things inside an actual plugin.
-describe "Admin Plugins List", type: :system do
+describe "Admin Plugins List" do
fab!(:current_user, :admin)
let(:admin_plugins_list_page) { PageObjects::Pages::AdminPluginsList.new }
diff --git a/plugins/automation/spec/system/automation_edit_page_spec.rb b/plugins/automation/spec/system/automation_edit_page_spec.rb
index 09287b4010e..c87d4220282 100644
--- a/plugins/automation/spec/system/automation_edit_page_spec.rb
+++ b/plugins/automation/spec/system/automation_edit_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DiscourseAutomation | Edit page", type: :system do
+describe "DiscourseAutomation | Edit page" do
fab!(:admin)
fab!(:automation) { Fabricate(:automation, enabled: true) }
diff --git a/plugins/automation/spec/system/error_spec.rb b/plugins/automation/spec/system/error_spec.rb
index e79350788d5..147f4b4a25c 100644
--- a/plugins/automation/spec/system/error_spec.rb
+++ b/plugins/automation/spec/system/error_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DiscourseAutomation | error", type: :system do
+describe "DiscourseAutomation | error" do
fab!(:admin)
let(:new_automation_page) { PageObjects::Pages::NewAutomation.new }
diff --git a/plugins/automation/spec/system/new_automation_spec.rb b/plugins/automation/spec/system/new_automation_spec.rb
index fb1f313edb4..985eb312f56 100644
--- a/plugins/automation/spec/system/new_automation_spec.rb
+++ b/plugins/automation/spec/system/new_automation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DiscourseAutomation | New automation", type: :system do
+describe "DiscourseAutomation | New automation" do
fab!(:admin)
before do
diff --git a/plugins/automation/spec/system/smoke_test_spec.rb b/plugins/automation/spec/system/smoke_test_spec.rb
index 5b69b058678..d869626265c 100644
--- a/plugins/automation/spec/system/smoke_test_spec.rb
+++ b/plugins/automation/spec/system/smoke_test_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DiscourseAutomation | smoke test", type: :system do
+describe "DiscourseAutomation | smoke test" do
fab!(:admin)
fab!(:group) { Fabricate(:group, name: "test") }
fab!(:badge) { Fabricate(:badge, name: "badge") }
diff --git a/plugins/chat/lib/chat/message_mover.rb b/plugins/chat/lib/chat/message_mover.rb
index 5c74a300497..2b29cb533dd 100644
--- a/plugins/chat/lib/chat/message_mover.rb
+++ b/plugins/chat/lib/chat/message_mover.rb
@@ -284,7 +284,7 @@ module Chat
def delete_source_threads
@source_thread_ids.each do |thread_id|
thread = Chat::Thread.find_by(id: thread_id)
- thread.destroy if thread.present?
+ thread.presence&.destroy
end
end
diff --git a/plugins/chat/spec/system/about_page_site_acitivity_spec.rb b/plugins/chat/spec/system/about_page_site_acitivity_spec.rb
index f0ac4d3fd58..3f745e71c05 100644
--- a/plugins/chat/spec/system/about_page_site_acitivity_spec.rb
+++ b/plugins/chat/spec/system/about_page_site_acitivity_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Chat messages site activity in the about page", type: :system do
+describe "Chat messages site activity in the about page" do
let(:about_page) { PageObjects::Pages::About.new }
before do
diff --git a/plugins/chat/spec/system/admin/category_channel_list_spec.rb b/plugins/chat/spec/system/admin/category_channel_list_spec.rb
index 6e4a85f2e71..715f4091516 100644
--- a/plugins/chat/spec/system/admin/category_channel_list_spec.rb
+++ b/plugins/chat/spec/system/admin/category_channel_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin category channels list", type: :system do
+RSpec.describe "Admin category channels list" do
fab!(:current_user, :admin)
fab!(:category)
fab!(:channel_1) { Fabricate(:chat_channel, chatable: category, emoji: "goat") }
diff --git a/plugins/chat/spec/system/admin/csv_exports_spec.rb b/plugins/chat/spec/system/admin/csv_exports_spec.rb
index 87fc5c78df1..8e180598217 100644
--- a/plugins/chat/spec/system/admin/csv_exports_spec.rb
+++ b/plugins/chat/spec/system/admin/csv_exports_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin Chat CSV exports", type: :system do
+RSpec.describe "Admin Chat CSV exports" do
let(:dialog) { PageObjects::Components::Dialog.new }
let(:csv_export_pm_page) { PageObjects::Pages::CSVExportPM.new }
fab!(:current_user, :admin)
diff --git a/plugins/chat/spec/system/admin/incoming_webhooks_spec.rb b/plugins/chat/spec/system/admin/incoming_webhooks_spec.rb
index ef9e04ce7e2..f5308d0abbb 100644
--- a/plugins/chat/spec/system/admin/incoming_webhooks_spec.rb
+++ b/plugins/chat/spec/system/admin/incoming_webhooks_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Chat Incoming Webhooks", type: :system do
+describe "Admin Chat Incoming Webhooks" do
fab!(:current_user, :admin)
fab!(:chat_channel_1, :chat_channel)
diff --git a/plugins/chat/spec/system/admin_search_spec.rb b/plugins/chat/spec/system/admin_search_spec.rb
index 6627fc16d81..949d86da442 100644
--- a/plugins/chat/spec/system/admin_search_spec.rb
+++ b/plugins/chat/spec/system/admin_search_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Search Plugin Pages", type: :system do
+describe "Admin Search Plugin Pages" do
fab!(:current_user, :admin)
let(:search_modal) { PageObjects::Modals::AdminSearch.new }
let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
diff --git a/plugins/chat/spec/system/admin_sidebar_navigation_spec.rb b/plugins/chat/spec/system/admin_sidebar_navigation_spec.rb
index 8f38fb9298a..7068f78e323 100644
--- a/plugins/chat/spec/system/admin_sidebar_navigation_spec.rb
+++ b/plugins/chat/spec/system/admin_sidebar_navigation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Revamp | Sidebar Navigation | Plugin Links", type: :system do
+describe "Admin Revamp | Sidebar Navigation | Plugin Links" do
fab!(:admin)
let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
let(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/anonymous_spec.rb b/plugins/chat/spec/system/anonymous_spec.rb
index d0921ecf9c2..fa0606f28ee 100644
--- a/plugins/chat/spec/system/anonymous_spec.rb
+++ b/plugins/chat/spec/system/anonymous_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Anonymous", type: :system do
+RSpec.describe "Anonymous" do
fab!(:topic)
before { chat_system_bootstrap }
diff --git a/plugins/chat/spec/system/archive_channel_spec.rb b/plugins/chat/spec/system/archive_channel_spec.rb
index 0d680ff5303..1284865fcc8 100644
--- a/plugins/chat/spec/system/archive_channel_spec.rb
+++ b/plugins/chat/spec/system/archive_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Archive channel", type: :system do
+RSpec.describe "Archive channel" do
fab!(:channel_1, :chat_channel)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/archived_channel_settings_spec.rb b/plugins/chat/spec/system/archived_channel_settings_spec.rb
index b9f3dc71eff..c21e1159b24 100644
--- a/plugins/chat/spec/system/archived_channel_settings_spec.rb
+++ b/plugins/chat/spec/system/archived_channel_settings_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Archived channel settings", type: :system do
+RSpec.describe "Archived channel settings" do
fab!(:channel_1, :chat_channel)
fab!(:current_user, :admin)
diff --git a/plugins/chat/spec/system/bookmark_message_spec.rb b/plugins/chat/spec/system/bookmark_message_spec.rb
index a7870cdb486..e7fc75d3ee4 100644
--- a/plugins/chat/spec/system/bookmark_message_spec.rb
+++ b/plugins/chat/spec/system/bookmark_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Bookmark message", type: :system do
+RSpec.describe "Bookmark message" do
fab!(:current_user, :user)
let(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/browse_page_spec.rb b/plugins/chat/spec/system/browse_page_spec.rb
index 09c977ba619..61761680dcf 100644
--- a/plugins/chat/spec/system/browse_page_spec.rb
+++ b/plugins/chat/spec/system/browse_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Browse page", type: :system do
+RSpec.describe "Browse page" do
fab!(:current_user, :user)
let(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/channel_members_page_spec.rb b/plugins/chat/spec/system/channel_members_page_spec.rb
index 08533a53e7d..abbcae75a27 100644
--- a/plugins/chat/spec/system/channel_members_page_spec.rb
+++ b/plugins/chat/spec/system/channel_members_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Channel - Info - Members page", type: :system do
+RSpec.describe "Channel - Info - Members page" do
let(:chat_page) { PageObjects::Pages::Chat.new }
fab!(:current_user, :user)
diff --git a/plugins/chat/spec/system/channel_message_upload_spec.rb b/plugins/chat/spec/system/channel_message_upload_spec.rb
index 17512f36c7b..b891829aaf5 100644
--- a/plugins/chat/spec/system/channel_message_upload_spec.rb
+++ b/plugins/chat/spec/system/channel_message_upload_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Channel message selection", type: :system do
+RSpec.describe "Channel message selection" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
diff --git a/plugins/chat/spec/system/channel_notice_spec.rb b/plugins/chat/spec/system/channel_notice_spec.rb
index a289333a224..69ffda576ec 100644
--- a/plugins/chat/spec/system/channel_notice_spec.rb
+++ b/plugins/chat/spec/system/channel_notice_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Channel notice", type: :system do
+RSpec.describe "Channel notice" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
let(:drawer_page) { PageObjects::Pages::ChatDrawer.new }
diff --git a/plugins/chat/spec/system/channel_settings_page_spec.rb b/plugins/chat/spec/system/channel_settings_page_spec.rb
index 79f58eeb594..7d556fb2678 100644
--- a/plugins/chat/spec/system/channel_settings_page_spec.rb
+++ b/plugins/chat/spec/system/channel_settings_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Channel - Info - Settings page", type: :system do
+RSpec.describe "Channel - Info - Settings page" do
fab!(:current_user, :user)
fab!(:channel_1, :category_channel)
diff --git a/plugins/chat/spec/system/channel_thread_message_echoing_spec.rb b/plugins/chat/spec/system/channel_thread_message_echoing_spec.rb
index 209b33ceceb..9a248842de7 100644
--- a/plugins/chat/spec/system/channel_thread_message_echoing_spec.rb
+++ b/plugins/chat/spec/system/channel_thread_message_echoing_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Channel thread message echoing", type: :system do
+describe "Channel thread message echoing" do
fab!(:current_user, :user)
fab!(:other_user, :user)
diff --git a/plugins/chat/spec/system/chat/composer/channel_spec.rb b/plugins/chat/spec/system/chat/composer/channel_spec.rb
index be8504ccb67..1a94552dc62 100644
--- a/plugins/chat/spec/system/chat/composer/channel_spec.rb
+++ b/plugins/chat/spec/system/chat/composer/channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat | composer | channel", type: :system do
+RSpec.describe "Chat | composer | channel" do
fab!(:channel_1, :chat_channel)
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
fab!(:current_user, :admin)
diff --git a/plugins/chat/spec/system/chat/composer/shortcuts/channel_spec.rb b/plugins/chat/spec/system/chat/composer/shortcuts/channel_spec.rb
index fde51d1f513..89c347431de 100644
--- a/plugins/chat/spec/system/chat/composer/shortcuts/channel_spec.rb
+++ b/plugins/chat/spec/system/chat/composer/shortcuts/channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat | composer | shortcuts | channel", type: :system do
+RSpec.describe "Chat | composer | shortcuts | channel" do
fab!(:channel_1, :chat_channel)
fab!(:current_user, :admin)
diff --git a/plugins/chat/spec/system/chat/composer/shortcuts/thread_spec.rb b/plugins/chat/spec/system/chat/composer/shortcuts/thread_spec.rb
index 3f1d692d104..460137bb4d9 100644
--- a/plugins/chat/spec/system/chat/composer/shortcuts/thread_spec.rb
+++ b/plugins/chat/spec/system/chat/composer/shortcuts/thread_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat | composer | shortcuts | thread", type: :system do
+RSpec.describe "Chat | composer | shortcuts | thread" do
fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
fab!(:current_user, :admin)
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, use_service: true) }
diff --git a/plugins/chat/spec/system/chat/composer/thread_spec.rb b/plugins/chat/spec/system/chat/composer/thread_spec.rb
index 97e39e16957..2ed79aef3b7 100644
--- a/plugins/chat/spec/system/chat/composer/thread_spec.rb
+++ b/plugins/chat/spec/system/chat/composer/thread_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat | composer | thread", type: :system do
+RSpec.describe "Chat | composer | thread" do
fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
fab!(:current_user, :admin)
fab!(:message_1) do
diff --git a/plugins/chat/spec/system/chat_channel_search/drawer_spec.rb b/plugins/chat/spec/system/chat_channel_search/drawer_spec.rb
index de85749ac7e..687e41d8500 100644
--- a/plugins/chat/spec/system/chat_channel_search/drawer_spec.rb
+++ b/plugins/chat/spec/system/chat_channel_search/drawer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat channel search - drawer", type: :system do
+RSpec.describe "Chat channel search - drawer" do
before do
SearchIndexer.enable
SiteSetting.chat_search_enabled = true
diff --git a/plugins/chat/spec/system/chat_channel_search/full_page_spec.rb b/plugins/chat/spec/system/chat_channel_search/full_page_spec.rb
index 451abc51874..09408846e84 100644
--- a/plugins/chat/spec/system/chat_channel_search/full_page_spec.rb
+++ b/plugins/chat/spec/system/chat_channel_search/full_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat channel search - full page", type: :system do
+RSpec.describe "Chat channel search - full page" do
before do
SearchIndexer.enable
SiteSetting.chat_search_enabled = true
diff --git a/plugins/chat/spec/system/chat_channel_sidebar_context_menu_spec.rb b/plugins/chat/spec/system/chat_channel_sidebar_context_menu_spec.rb
index 5cf690b2b55..843f3122de9 100644
--- a/plugins/chat/spec/system/chat_channel_sidebar_context_menu_spec.rb
+++ b/plugins/chat/spec/system/chat_channel_sidebar_context_menu_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat channel sidebar context menu", type: :system do
+RSpec.describe "Chat channel sidebar context menu" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
diff --git a/plugins/chat/spec/system/chat_channel_spec.rb b/plugins/chat/spec/system/chat_channel_spec.rb
index 09faa1c4c27..a86945695b8 100644
--- a/plugins/chat/spec/system/chat_channel_spec.rb
+++ b/plugins/chat/spec/system/chat_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat channel", type: :system do
+RSpec.describe "Chat channel" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:message_1) { Fabricate(:chat_message, use_service: true, chat_channel: channel_1) }
diff --git a/plugins/chat/spec/system/chat_composer_draft_spec.rb b/plugins/chat/spec/system/chat_composer_draft_spec.rb
index c7ffc6dc448..36b033f7c17 100644
--- a/plugins/chat/spec/system/chat_composer_draft_spec.rb
+++ b/plugins/chat/spec/system/chat_composer_draft_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat composer draft", type: :system do
+RSpec.describe "Chat composer draft" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:message_1) do
diff --git a/plugins/chat/spec/system/chat_composer_spec.rb b/plugins/chat/spec/system/chat_composer_spec.rb
index d8f7dcaafdd..f853699a57b 100644
--- a/plugins/chat/spec/system/chat_composer_spec.rb
+++ b/plugins/chat/spec/system/chat_composer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat composer", type: :system do
+RSpec.describe "Chat composer" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:message_1) { Fabricate(:chat_message, user: current_user, chat_channel: channel_1) }
diff --git a/plugins/chat/spec/system/chat_footer_spec.rb b/plugins/chat/spec/system/chat_footer_spec.rb
index d820b93be80..cfa5d71c080 100644
--- a/plugins/chat/spec/system/chat_footer_spec.rb
+++ b/plugins/chat/spec/system/chat_footer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Mobile Chat footer", type: :system, mobile: true do
+RSpec.describe "Mobile Chat footer", mobile: true do
fab!(:current_user, :user)
fab!(:other_user, :user)
fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
diff --git a/plugins/chat/spec/system/chat_informative_blocks_spec.rb b/plugins/chat/spec/system/chat_informative_blocks_spec.rb
index 28c595b07b0..546cda849c9 100644
--- a/plugins/chat/spec/system/chat_informative_blocks_spec.rb
+++ b/plugins/chat/spec/system/chat_informative_blocks_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Informative blocks in chat messages", type: :system do
+RSpec.describe "Informative blocks in chat messages" do
fab!(:user)
fab!(:channel_1, :chat_channel)
diff --git a/plugins/chat/spec/system/chat_lazy_youtube_spec.rb b/plugins/chat/spec/system/chat_lazy_youtube_spec.rb
index a8c9dfd4444..90e625f476e 100644
--- a/plugins/chat/spec/system/chat_lazy_youtube_spec.rb
+++ b/plugins/chat/spec/system/chat_lazy_youtube_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat lazy YouTube videos", type: :system do
+RSpec.describe "Chat lazy YouTube videos" do
fab!(:current_user, :user)
fab!(:channel, :category_channel)
diff --git a/plugins/chat/spec/system/chat_message/channel_spec.rb b/plugins/chat/spec/system/chat_message/channel_spec.rb
index ad2bd2b0ccb..ab9664061a7 100644
--- a/plugins/chat/spec/system/chat_message/channel_spec.rb
+++ b/plugins/chat/spec/system/chat_message/channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat message - channel", type: :system do
+RSpec.describe "Chat message - channel" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, use_service: true) }
diff --git a/plugins/chat/spec/system/chat_message/thread_spec.rb b/plugins/chat/spec/system/chat_message/thread_spec.rb
index 035e55f6fe1..9c8e8651e01 100644
--- a/plugins/chat/spec/system/chat_message/thread_spec.rb
+++ b/plugins/chat/spec/system/chat_message/thread_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat message - thread", type: :system do
+RSpec.describe "Chat message - thread" do
fab!(:current_user, :user)
fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
fab!(:thread_original_message) { Fabricate(:chat_message_with_service, chat_channel: channel_1) }
diff --git a/plugins/chat/spec/system/chat_message_codeblock_spec.rb b/plugins/chat/spec/system/chat_message_codeblock_spec.rb
index 0aa631a9f7c..15d4334171b 100644
--- a/plugins/chat/spec/system/chat_message_codeblock_spec.rb
+++ b/plugins/chat/spec/system/chat_message_codeblock_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat message codeblock", type: :system do
+RSpec.describe "Chat message codeblock" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
diff --git a/plugins/chat/spec/system/chat_message_creator_spec.rb b/plugins/chat/spec/system/chat_message_creator_spec.rb
index 2a34d46d942..d0bf98d12f0 100644
--- a/plugins/chat/spec/system/chat_message_creator_spec.rb
+++ b/plugins/chat/spec/system/chat_message_creator_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat message creator", type: :system do
+RSpec.describe "Chat message creator" do
let(:chat_page) { PageObjects::Pages::Chat.new }
fab!(:current_user, :user)
diff --git a/plugins/chat/spec/system/chat_message_interaction_spec.rb b/plugins/chat/spec/system/chat_message_interaction_spec.rb
index 08296347ae4..d6d04225b90 100644
--- a/plugins/chat/spec/system/chat_message_interaction_spec.rb
+++ b/plugins/chat/spec/system/chat_message_interaction_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Interacting with a message", type: :system do
+RSpec.describe "Interacting with a message" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:message_1) do
diff --git a/plugins/chat/spec/system/chat_message_onebox_spec.rb b/plugins/chat/spec/system/chat_message_onebox_spec.rb
index 9bea4065855..5b58498dd6e 100644
--- a/plugins/chat/spec/system/chat_message_onebox_spec.rb
+++ b/plugins/chat/spec/system/chat_message_onebox_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat message onebox", type: :system do
+RSpec.describe "Chat message onebox" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
diff --git a/plugins/chat/spec/system/chat_new_message_spec.rb b/plugins/chat/spec/system/chat_new_message_spec.rb
index 8a16c381aa4..0d9a95edd91 100644
--- a/plugins/chat/spec/system/chat_new_message_spec.rb
+++ b/plugins/chat/spec/system/chat_new_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat New Message from params", type: :system do
+RSpec.describe "Chat New Message from params" do
fab!(:current_user, :user)
fab!(:user_1, :user)
fab!(:user_2, :user)
diff --git a/plugins/chat/spec/system/chat_search_spec.rb b/plugins/chat/spec/system/chat_search_spec.rb
index 2f95270db7e..38286ba031b 100644
--- a/plugins/chat/spec/system/chat_search_spec.rb
+++ b/plugins/chat/spec/system/chat_search_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat search", type: :system do
+RSpec.describe "Chat search" do
before do
SearchIndexer.enable
SiteSetting.chat_search_enabled = true
diff --git a/plugins/chat/spec/system/closed_channel_spec.rb b/plugins/chat/spec/system/closed_channel_spec.rb
index 094da72b33c..bb2f8bb5564 100644
--- a/plugins/chat/spec/system/closed_channel_spec.rb
+++ b/plugins/chat/spec/system/closed_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Closed channel", type: :system do
+RSpec.describe "Closed channel" do
fab!(:channel_1, :chat_channel)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/create_channel_spec.rb b/plugins/chat/spec/system/create_channel_spec.rb
index 7f020c000c1..cc92540246a 100644
--- a/plugins/chat/spec/system/create_channel_spec.rb
+++ b/plugins/chat/spec/system/create_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Create channel", type: :system do
+RSpec.describe "Create channel" do
fab!(:category_1, :category)
let(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/dates_separators_spec.rb b/plugins/chat/spec/system/dates_separators_spec.rb
index eab6dbffbef..3d204899fa6 100644
--- a/plugins/chat/spec/system/dates_separators_spec.rb
+++ b/plugins/chat/spec/system/dates_separators_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Dates separators", type: :system do
+RSpec.describe "Dates separators" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
diff --git a/plugins/chat/spec/system/deleted_channel_spec.rb b/plugins/chat/spec/system/deleted_channel_spec.rb
index 5cfb9f007f3..0431f925e68 100644
--- a/plugins/chat/spec/system/deleted_channel_spec.rb
+++ b/plugins/chat/spec/system/deleted_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Deleted channel", type: :system do
+RSpec.describe "Deleted channel" do
fab!(:channel_1, :chat_channel)
let(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/deleted_message_spec.rb b/plugins/chat/spec/system/deleted_message_spec.rb
index 302339eea8f..d14016ca378 100644
--- a/plugins/chat/spec/system/deleted_message_spec.rb
+++ b/plugins/chat/spec/system/deleted_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Deleted message", type: :system do
+RSpec.describe "Deleted message" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
let(:sidebar_component) { PageObjects::Components::NavigationMenu::Sidebar.new }
diff --git a/plugins/chat/spec/system/document_title_spec.rb b/plugins/chat/spec/system/document_title_spec.rb
index ada31b8f7c5..3bf28e58cae 100644
--- a/plugins/chat/spec/system/document_title_spec.rb
+++ b/plugins/chat/spec/system/document_title_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Document title", type: :system do
+RSpec.describe "Document title" do
fab!(:current_user, :user)
let(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/drawer/browse_spec.rb b/plugins/chat/spec/system/drawer/browse_spec.rb
index 915edde1c02..f630bf7df47 100644
--- a/plugins/chat/spec/system/drawer/browse_spec.rb
+++ b/plugins/chat/spec/system/drawer/browse_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Drawer - Browse", type: :system do
+RSpec.describe "Drawer - Browse" do
fab!(:current_user, :user)
let(:drawer_page) { PageObjects::Pages::ChatDrawer.new }
diff --git a/plugins/chat/spec/system/drawer/direct_messages_spec.rb b/plugins/chat/spec/system/drawer/direct_messages_spec.rb
index bd676cca0c7..2bbb24c633c 100644
--- a/plugins/chat/spec/system/drawer/direct_messages_spec.rb
+++ b/plugins/chat/spec/system/drawer/direct_messages_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Drawer - direct messages", type: :system do
+RSpec.describe "Drawer - direct messages" do
fab!(:current_user, :user)
let(:drawer_page) { PageObjects::Pages::ChatDrawer.new }
diff --git a/plugins/chat/spec/system/drawer/index_spec.rb b/plugins/chat/spec/system/drawer/index_spec.rb
index 845b26eeea4..088f03be5e5 100644
--- a/plugins/chat/spec/system/drawer/index_spec.rb
+++ b/plugins/chat/spec/system/drawer/index_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Drawer - index", type: :system do
+RSpec.describe "Drawer - index" do
fab!(:current_user, :user)
let(:drawer_page) { PageObjects::Pages::ChatDrawer.new }
diff --git a/plugins/chat/spec/system/drawer/starred_channels_spec.rb b/plugins/chat/spec/system/drawer/starred_channels_spec.rb
index 6fc9d5b5457..716a61c6f85 100644
--- a/plugins/chat/spec/system/drawer/starred_channels_spec.rb
+++ b/plugins/chat/spec/system/drawer/starred_channels_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Drawer - starred channels", type: :system do
+RSpec.describe "Drawer - starred channels" do
fab!(:current_user, :user)
fab!(:channel_1) { Fabricate(:category_channel, name: "Channel A") }
fab!(:channel_2) { Fabricate(:category_channel, name: "Channel B") }
diff --git a/plugins/chat/spec/system/drawer/threads_spec.rb b/plugins/chat/spec/system/drawer/threads_spec.rb
index 21a3ee3d1bc..2d794d79050 100644
--- a/plugins/chat/spec/system/drawer/threads_spec.rb
+++ b/plugins/chat/spec/system/drawer/threads_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Drawer - threads", type: :system do
+RSpec.describe "Drawer - threads" do
fab!(:current_user, :user)
fab!(:other_user, :user)
fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
diff --git a/plugins/chat/spec/system/drawer_spec.rb b/plugins/chat/spec/system/drawer_spec.rb
index 1bb8de695f8..6ec777246ca 100644
--- a/plugins/chat/spec/system/drawer_spec.rb
+++ b/plugins/chat/spec/system/drawer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Drawer", type: :system do
+RSpec.describe "Drawer" do
fab!(:current_user, :user)
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
diff --git a/plugins/chat/spec/system/edited_message_spec.rb b/plugins/chat/spec/system/edited_message_spec.rb
index 343ff6ebc4e..8985e584179 100644
--- a/plugins/chat/spec/system/edited_message_spec.rb
+++ b/plugins/chat/spec/system/edited_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Edited message", type: :system do
+RSpec.describe "Edited message" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
diff --git a/plugins/chat/spec/system/flag_message_spec.rb b/plugins/chat/spec/system/flag_message_spec.rb
index fb7aa8cc1db..4cc525dddd9 100644
--- a/plugins/chat/spec/system/flag_message_spec.rb
+++ b/plugins/chat/spec/system/flag_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Flag message", type: :system do
+RSpec.describe "Flag message" do
fab!(:current_user, :user)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/hashtag_autocomplete_spec.rb b/plugins/chat/spec/system/hashtag_autocomplete_spec.rb
index 01ebb2f4591..0a737d6d240 100644
--- a/plugins/chat/spec/system/hashtag_autocomplete_spec.rb
+++ b/plugins/chat/spec/system/hashtag_autocomplete_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Using #hashtag autocompletion to search for and lookup channels", type: :system do
+describe "Using #hashtag autocompletion to search for and lookup channels" do
fab!(:user)
fab!(:channel1) { Fabricate(:chat_channel, name: "Music Lounge", slug: "music") }
fab!(:channel2) { Fabricate(:chat_channel, name: "Random", slug: "random") }
diff --git a/plugins/chat/spec/system/invite_users_to_channel_spec.rb b/plugins/chat/spec/system/invite_users_to_channel_spec.rb
index cbadc69b9bf..aa48e5b0f08 100644
--- a/plugins/chat/spec/system/invite_users_to_channel_spec.rb
+++ b/plugins/chat/spec/system/invite_users_to_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Invite users to channel", type: :system do
+RSpec.describe "Invite users to channel" do
fab!(:user_1, :user)
fab!(:channel_1, :category_channel)
diff --git a/plugins/chat/spec/system/kick_user_from_channel_spec.rb b/plugins/chat/spec/system/kick_user_from_channel_spec.rb
index 7c094ecdf3e..60eb3964fa0 100644
--- a/plugins/chat/spec/system/kick_user_from_channel_spec.rb
+++ b/plugins/chat/spec/system/kick_user_from_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Kick user from chat channel", type: :system do
+describe "Kick user from chat channel" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:channel_2, :chat_channel)
diff --git a/plugins/chat/spec/system/last_visit_spec.rb b/plugins/chat/spec/system/last_visit_spec.rb
index 7358bc5919b..3727ddfbf9f 100644
--- a/plugins/chat/spec/system/last_visit_spec.rb
+++ b/plugins/chat/spec/system/last_visit_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Last visit", type: :system do
+RSpec.describe "Last visit" do
fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: false) }
fab!(:channel_2) { Fabricate(:chat_channel, threading_enabled: false) }
diff --git a/plugins/chat/spec/system/list_channels/drawer_spec.rb b/plugins/chat/spec/system/list_channels/drawer_spec.rb
index a804e556deb..6cb0579af78 100644
--- a/plugins/chat/spec/system/list_channels/drawer_spec.rb
+++ b/plugins/chat/spec/system/list_channels/drawer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "List channels | Drawer", type: :system do
+RSpec.describe "List channels | Drawer" do
fab!(:current_user, :user)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/list_channels/mobile_spec.rb b/plugins/chat/spec/system/list_channels/mobile_spec.rb
index 0aab0eee6ce..2acd2b627ef 100644
--- a/plugins/chat/spec/system/list_channels/mobile_spec.rb
+++ b/plugins/chat/spec/system/list_channels/mobile_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "List channels | mobile", type: :system, mobile: true do
+RSpec.describe "List channels | mobile", mobile: true do
fab!(:current_user, :user)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/list_channels/no_sidebar_spec.rb b/plugins/chat/spec/system/list_channels/no_sidebar_spec.rb
index cf63d94a1a2..dac33528f5e 100644
--- a/plugins/chat/spec/system/list_channels/no_sidebar_spec.rb
+++ b/plugins/chat/spec/system/list_channels/no_sidebar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "List channels | no sidebar", type: :system do
+RSpec.describe "List channels | no sidebar" do
fab!(:current_user, :user)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/list_channels/sidebar_spec.rb b/plugins/chat/spec/system/list_channels/sidebar_spec.rb
index 2c6a3738263..b31f051a6cf 100644
--- a/plugins/chat/spec/system/list_channels/sidebar_spec.rb
+++ b/plugins/chat/spec/system/list_channels/sidebar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "List channels | sidebar", type: :system do
+RSpec.describe "List channels | sidebar" do
fab!(:current_user, :user)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/mention_warnings_spec.rb b/plugins/chat/spec/system/mention_warnings_spec.rb
index eaeb04b24b1..f44dc168cdf 100644
--- a/plugins/chat/spec/system/mention_warnings_spec.rb
+++ b/plugins/chat/spec/system/mention_warnings_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Mentions warnings", type: :system do
+RSpec.describe "Mentions warnings" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:channel_2, :chat_channel)
diff --git a/plugins/chat/spec/system/message_errors_spec.rb b/plugins/chat/spec/system/message_errors_spec.rb
index 57e3dc8c3cb..42156e0480a 100644
--- a/plugins/chat/spec/system/message_errors_spec.rb
+++ b/plugins/chat/spec/system/message_errors_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Message errors", type: :system do
+RSpec.describe "Message errors" do
context "when message is too long" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:dialog_page) { PageObjects::Components::Dialog.new }
diff --git a/plugins/chat/spec/system/message_notifications_mobile_spec.rb b/plugins/chat/spec/system/message_notifications_mobile_spec.rb
index 619940e2c50..d27a52c9c30 100644
--- a/plugins/chat/spec/system/message_notifications_mobile_spec.rb
+++ b/plugins/chat/spec/system/message_notifications_mobile_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Message notifications - mobile", type: :system, mobile: true do
+RSpec.describe "Message notifications - mobile", mobile: true do
fab!(:current_user, :user)
let!(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/message_notifications_with_sidebar_spec.rb b/plugins/chat/spec/system/message_notifications_with_sidebar_spec.rb
index c94bb2f0245..2e8e549dfec 100644
--- a/plugins/chat/spec/system/message_notifications_with_sidebar_spec.rb
+++ b/plugins/chat/spec/system/message_notifications_with_sidebar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Message notifications - with sidebar", type: :system do
+RSpec.describe "Message notifications - with sidebar" do
fab!(:current_user, :user)
let!(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/message_thread_indicator_spec.rb b/plugins/chat/spec/system/message_thread_indicator_spec.rb
index 3a3bc064f31..0d9de38cb67 100644
--- a/plugins/chat/spec/system/message_thread_indicator_spec.rb
+++ b/plugins/chat/spec/system/message_thread_indicator_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Thread indicator for chat messages", type: :system do
+describe "Thread indicator for chat messages" do
fab!(:current_user, :user)
fab!(:other_user, :user)
diff --git a/plugins/chat/spec/system/message_user_info_spec.rb b/plugins/chat/spec/system/message_user_info_spec.rb
index 76c48503b9a..42b16aceab9 100644
--- a/plugins/chat/spec/system/message_user_info_spec.rb
+++ b/plugins/chat/spec/system/message_user_info_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Message user info", type: :system do
+RSpec.describe "Message user info" do
fab!(:current_user, :user)
fab!(:channel_1, :category_channel)
diff --git a/plugins/chat/spec/system/move_message_to_channel_spec.rb b/plugins/chat/spec/system/move_message_to_channel_spec.rb
index a0e521fb41d..c7c1c9f7d0d 100644
--- a/plugins/chat/spec/system/move_message_to_channel_spec.rb
+++ b/plugins/chat/spec/system/move_message_to_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Move message to channel", type: :system do
+RSpec.describe "Move message to channel" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
let(:thread_page) { PageObjects::Pages::ChatThread.new }
diff --git a/plugins/chat/spec/system/navigation_spec.rb b/plugins/chat/spec/system/navigation_spec.rb
index ad8c1d61fac..1ca6b406689 100644
--- a/plugins/chat/spec/system/navigation_spec.rb
+++ b/plugins/chat/spec/system/navigation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Navigation", type: :system do
+RSpec.describe "Navigation" do
fab!(:category)
fab!(:topic)
fab!(:post) { Fabricate(:post, topic: topic) }
diff --git a/plugins/chat/spec/system/pinned_messages_spec.rb b/plugins/chat/spec/system/pinned_messages_spec.rb
index 3a9cf112b22..fd39da8e6d8 100644
--- a/plugins/chat/spec/system/pinned_messages_spec.rb
+++ b/plugins/chat/spec/system/pinned_messages_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat pinned messages", type: :system do
+RSpec.describe "Chat pinned messages" do
fab!(:admin)
fab!(:channel, :chat_channel)
fab!(:message) { Fabricate(:chat_message, chat_channel: channel, message: "Important message") }
diff --git a/plugins/chat/spec/system/plugin_admin_interface_compatibility_spec.rb b/plugins/chat/spec/system/plugin_admin_interface_compatibility_spec.rb
index 2a23e409a29..4ef52fc51b3 100644
--- a/plugins/chat/spec/system/plugin_admin_interface_compatibility_spec.rb
+++ b/plugins/chat/spec/system/plugin_admin_interface_compatibility_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Plugin admin interface compatibility", type: :system do
+RSpec.describe "Plugin admin interface compatibility" do
fab!(:current_user, :admin)
before do
diff --git a/plugins/chat/spec/system/react_to_message_spec.rb b/plugins/chat/spec/system/react_to_message_spec.rb
index 3097cdcabd4..7bf40971d0e 100644
--- a/plugins/chat/spec/system/react_to_message_spec.rb
+++ b/plugins/chat/spec/system/react_to_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "React to message", type: :system do
+RSpec.describe "React to message" do
fab!(:current_user) { Fabricate(:user, group_ids: [Group::AUTO_GROUPS[:trust_level_1]]) }
fab!(:other_user) { Fabricate(:user, group_ids: [Group::AUTO_GROUPS[:trust_level_1]]) }
fab!(:category_channel_1, :category_channel)
diff --git a/plugins/chat/spec/system/read_only_spec.rb b/plugins/chat/spec/system/read_only_spec.rb
index bd909667778..3daea7e9c36 100644
--- a/plugins/chat/spec/system/read_only_spec.rb
+++ b/plugins/chat/spec/system/read_only_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Read only", type: :system do
+RSpec.describe "Read only" do
fab!(:channel_1, :chat_channel)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/reply_to_message/drawer_spec.rb b/plugins/chat/spec/system/reply_to_message/drawer_spec.rb
index 21f387164b4..1c34e17e93a 100644
--- a/plugins/chat/spec/system/reply_to_message/drawer_spec.rb
+++ b/plugins/chat/spec/system/reply_to_message/drawer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Reply to message - channel - drawer", type: :system do
+RSpec.describe "Reply to message - channel - drawer" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
let(:thread_page) { PageObjects::Pages::ChatThread.new }
diff --git a/plugins/chat/spec/system/reply_to_message/full_page_spec.rb b/plugins/chat/spec/system/reply_to_message/full_page_spec.rb
index fa8a2a37acc..2a33073e659 100644
--- a/plugins/chat/spec/system/reply_to_message/full_page_spec.rb
+++ b/plugins/chat/spec/system/reply_to_message/full_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Reply to message - channel - full page", type: :system do
+RSpec.describe "Reply to message - channel - full page" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
let(:thread_page) { PageObjects::Pages::ChatThread.new }
diff --git a/plugins/chat/spec/system/reply_to_message/mobile_spec.rb b/plugins/chat/spec/system/reply_to_message/mobile_spec.rb
index 0483624e508..f8f816713e4 100644
--- a/plugins/chat/spec/system/reply_to_message/mobile_spec.rb
+++ b/plugins/chat/spec/system/reply_to_message/mobile_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Reply to message - channel - mobile", type: :system, mobile: true do
+RSpec.describe "Reply to message - channel - mobile", mobile: true do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
let(:thread_page) { PageObjects::Pages::ChatThread.new }
diff --git a/plugins/chat/spec/system/reply_to_message/smoke_spec.rb b/plugins/chat/spec/system/reply_to_message/smoke_spec.rb
index a23f4f09929..79407e14369 100644
--- a/plugins/chat/spec/system/reply_to_message/smoke_spec.rb
+++ b/plugins/chat/spec/system/reply_to_message/smoke_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Reply to message - smoke", type: :system do
+RSpec.describe "Reply to message - smoke" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
let(:thread_page) { PageObjects::Pages::ChatThread.new }
diff --git a/plugins/chat/spec/system/restore_message_spec.rb b/plugins/chat/spec/system/restore_message_spec.rb
index eee5f025ae3..8f481b74da0 100644
--- a/plugins/chat/spec/system/restore_message_spec.rb
+++ b/plugins/chat/spec/system/restore_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Restore message", type: :system do
+RSpec.describe "Restore message" do
fab!(:admin_user, :admin)
fab!(:regular_user, :user)
fab!(:another_user, :user)
diff --git a/plugins/chat/spec/system/reviewables_spec.rb b/plugins/chat/spec/system/reviewables_spec.rb
index 5a658a339dc..1f134e493a6 100644
--- a/plugins/chat/spec/system/reviewables_spec.rb
+++ b/plugins/chat/spec/system/reviewables_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Reviewables", type: :system do
+describe "Reviewables" do
fab!(:current_user, :admin)
fab!(:channel_1, :chat_channel)
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
diff --git a/plugins/chat/spec/system/rich_editor_extension_transcript_spec.rb b/plugins/chat/spec/system/rich_editor_extension_transcript_spec.rb
index 896a0611d04..f5b8556652d 100644
--- a/plugins/chat/spec/system/rich_editor_extension_transcript_spec.rb
+++ b/plugins/chat/spec/system/rich_editor_extension_transcript_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "chat transcripts in rich editor", type: :system do
+describe "chat transcripts in rich editor" do
fab!(:current_user) do
Fabricate(
:user,
diff --git a/plugins/chat/spec/system/select_message/channel_spec.rb b/plugins/chat/spec/system/select_message/channel_spec.rb
index 3acfddd71cf..679ef038d6e 100644
--- a/plugins/chat/spec/system/select_message/channel_spec.rb
+++ b/plugins/chat/spec/system/select_message/channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat | Select message | channel", type: :system do
+RSpec.describe "Chat | Select message | channel" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
diff --git a/plugins/chat/spec/system/select_message/thread_spec.rb b/plugins/chat/spec/system/select_message/thread_spec.rb
index 4c730d32ee5..96a1ef44e50 100644
--- a/plugins/chat/spec/system/select_message/thread_spec.rb
+++ b/plugins/chat/spec/system/select_message/thread_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat | Select message | thread", type: :system do
+RSpec.describe "Chat | Select message | thread" do
fab!(:current_user, :user)
fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
fab!(:thread_1) { Fabricate(:chat_thread, channel: channel_1) }
diff --git a/plugins/chat/spec/system/send_message_spec.rb b/plugins/chat/spec/system/send_message_spec.rb
index 4a74011ab3f..99e2ee07f71 100644
--- a/plugins/chat/spec/system/send_message_spec.rb
+++ b/plugins/chat/spec/system/send_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Send message", type: :system do
+RSpec.describe "Send message" do
fab!(:user_1, :admin)
fab!(:user_2, :admin)
diff --git a/plugins/chat/spec/system/separate_sidebar_mode_spec.rb b/plugins/chat/spec/system/separate_sidebar_mode_spec.rb
index dfb0a90caae..24593222b2d 100644
--- a/plugins/chat/spec/system/separate_sidebar_mode_spec.rb
+++ b/plugins/chat/spec/system/separate_sidebar_mode_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Separate sidebar mode", type: :system do
+RSpec.describe "Separate sidebar mode" do
let(:chat_page) { PageObjects::Pages::Chat.new }
let(:sidebar_page) { PageObjects::Pages::ChatSidebar.new }
let(:sidebar_component) { PageObjects::Components::NavigationMenu::Sidebar.new }
diff --git a/plugins/chat/spec/system/shortcuts/drawer_spec.rb b/plugins/chat/spec/system/shortcuts/drawer_spec.rb
index 08733b2f7b0..9215675ad40 100644
--- a/plugins/chat/spec/system/shortcuts/drawer_spec.rb
+++ b/plugins/chat/spec/system/shortcuts/drawer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Shortcuts | drawer", type: :system do
+RSpec.describe "Shortcuts | drawer" do
fab!(:user_1, :admin)
fab!(:channel_1, :chat_channel)
fab!(:channel_2, :chat_channel)
diff --git a/plugins/chat/spec/system/shortcuts/full_page_spec.rb b/plugins/chat/spec/system/shortcuts/full_page_spec.rb
index 930400102d6..22a3cbf3f0b 100644
--- a/plugins/chat/spec/system/shortcuts/full_page_spec.rb
+++ b/plugins/chat/spec/system/shortcuts/full_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Shortcuts | full page", type: :system do
+RSpec.describe "Shortcuts | full page" do
fab!(:channel_1, :chat_channel)
fab!(:current_user, :user)
diff --git a/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb b/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb
index 988230876c6..a5f9a24d0e4 100644
--- a/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb
+++ b/plugins/chat/spec/system/shortcuts/mark_all_read_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Shortcuts | mark all read", type: :system do
+RSpec.describe "Shortcuts | mark all read" do
fab!(:user_1, :admin)
fab!(:channel_1, :chat_channel)
fab!(:channel_2, :chat_channel)
diff --git a/plugins/chat/spec/system/shortcuts/sidebar_spec.rb b/plugins/chat/spec/system/shortcuts/sidebar_spec.rb
index 77023a0f9b4..fa150a0cae8 100644
--- a/plugins/chat/spec/system/shortcuts/sidebar_spec.rb
+++ b/plugins/chat/spec/system/shortcuts/sidebar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Shortcuts | sidebar", type: :system do
+RSpec.describe "Shortcuts | sidebar" do
fab!(:current_user, :admin)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb b/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
index ed9e68672ea..02e8b78c1b6 100644
--- a/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
+++ b/plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Sidebar navigation menu", type: :system do
+RSpec.describe "Sidebar navigation menu" do
let(:sidebar_page) { PageObjects::Pages::ChatSidebar.new }
let(:sidebar_component) { PageObjects::Components::NavigationMenu::Sidebar.new }
diff --git a/plugins/chat/spec/system/sidebars_spec.rb b/plugins/chat/spec/system/sidebars_spec.rb
index 2cebed247fe..22eaebcaf61 100644
--- a/plugins/chat/spec/system/sidebars_spec.rb
+++ b/plugins/chat/spec/system/sidebars_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Navigation", type: :system do
+RSpec.describe "Navigation" do
fab!(:category)
fab!(:topic)
fab!(:post) { Fabricate(:post, topic: topic) }
diff --git a/plugins/chat/spec/system/silenced_user_spec.rb b/plugins/chat/spec/system/silenced_user_spec.rb
index 297f21694b3..302f352e3eb 100644
--- a/plugins/chat/spec/system/silenced_user_spec.rb
+++ b/plugins/chat/spec/system/silenced_user_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Silenced user", type: :system do
+RSpec.describe "Silenced user" do
fab!(:channel_1, :category_channel)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/single_thread_spec.rb b/plugins/chat/spec/system/single_thread_spec.rb
index acf5c9ad5ad..a7a3d7dc4c7 100644
--- a/plugins/chat/spec/system/single_thread_spec.rb
+++ b/plugins/chat/spec/system/single_thread_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Single thread in side panel", type: :system do
+describe "Single thread in side panel" do
fab!(:current_user, :user)
let(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/starred_channels_spec.rb b/plugins/chat/spec/system/starred_channels_spec.rb
index 656996668f0..ce99b5f93ff 100644
--- a/plugins/chat/spec/system/starred_channels_spec.rb
+++ b/plugins/chat/spec/system/starred_channels_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Starred channels", type: :system do
+RSpec.describe "Starred channels" do
fab!(:current_user, :user)
let(:chat_page) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/thread_list/drawer_spec.rb b/plugins/chat/spec/system/thread_list/drawer_spec.rb
index c093a6130a5..11a84fb64e4 100644
--- a/plugins/chat/spec/system/thread_list/drawer_spec.rb
+++ b/plugins/chat/spec/system/thread_list/drawer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Thread list in side panel | drawer", type: :system do
+describe "Thread list in side panel | drawer" do
fab!(:current_user, :admin)
fab!(:channel, :chat_channel)
fab!(:other_user, :user)
diff --git a/plugins/chat/spec/system/thread_list/full_page_spec.rb b/plugins/chat/spec/system/thread_list/full_page_spec.rb
index 6fb9289f150..48736078fee 100644
--- a/plugins/chat/spec/system/thread_list/full_page_spec.rb
+++ b/plugins/chat/spec/system/thread_list/full_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Thread list in side panel | full page", type: :system do
+describe "Thread list in side panel | full page" do
fab!(:current_user, :user)
fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
fab!(:other_user, :user)
diff --git a/plugins/chat/spec/system/thread_preview_spec.rb b/plugins/chat/spec/system/thread_preview_spec.rb
index 301b12134bf..356b0c77543 100644
--- a/plugins/chat/spec/system/thread_preview_spec.rb
+++ b/plugins/chat/spec/system/thread_preview_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Thread preview", type: :system do
+describe "Thread preview" do
fab!(:current_user, :admin)
fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, use_service: true) }
diff --git a/plugins/chat/spec/system/thread_tracking/drawer_spec.rb b/plugins/chat/spec/system/thread_tracking/drawer_spec.rb
index 7d95819ab8f..88f1a7a5861 100644
--- a/plugins/chat/spec/system/thread_tracking/drawer_spec.rb
+++ b/plugins/chat/spec/system/thread_tracking/drawer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Thread tracking state | drawer", type: :system do
+describe "Thread tracking state | drawer" do
include ActiveSupport::Testing::TimeHelpers
fab!(:current_user, :admin)
diff --git a/plugins/chat/spec/system/thread_tracking/full_page_spec.rb b/plugins/chat/spec/system/thread_tracking/full_page_spec.rb
index ff3b1eeec20..eae4ac738ca 100644
--- a/plugins/chat/spec/system/thread_tracking/full_page_spec.rb
+++ b/plugins/chat/spec/system/thread_tracking/full_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Thread tracking state | full page", type: :system do
+describe "Thread tracking state | full page" do
fab!(:current_user, :user)
fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }
fab!(:other_user, :user)
diff --git a/plugins/chat/spec/system/transcript_spec.rb b/plugins/chat/spec/system/transcript_spec.rb
index 5f3d6520c2c..828dfeaf6f4 100644
--- a/plugins/chat/spec/system/transcript_spec.rb
+++ b/plugins/chat/spec/system/transcript_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Quoting chat message transcripts", type: :system do
+RSpec.describe "Quoting chat message transcripts" do
fab!(:current_user, :user)
fab!(:admin)
fab!(:chat_channel_1, :chat_channel)
diff --git a/plugins/chat/spec/system/unfollow_dm_channel_spec.rb b/plugins/chat/spec/system/unfollow_dm_channel_spec.rb
index b90c53a28f1..069f60b8160 100644
--- a/plugins/chat/spec/system/unfollow_dm_channel_spec.rb
+++ b/plugins/chat/spec/system/unfollow_dm_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Unfollow DM channel", type: :system do
+RSpec.describe "Unfollow DM channel" do
fab!(:current_user, :user)
fab!(:other_user, :user)
fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user, other_user]) }
diff --git a/plugins/chat/spec/system/update_last_read_spec.rb b/plugins/chat/spec/system/update_last_read_spec.rb
index 70b97b3bc83..b4349181dc4 100644
--- a/plugins/chat/spec/system/update_last_read_spec.rb
+++ b/plugins/chat/spec/system/update_last_read_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Update last read", type: :system do
+RSpec.describe "Update last read" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:messages) { Fabricate.times(15, :chat_message, chat_channel: channel_1) }
diff --git a/plugins/chat/spec/system/uploads_spec.rb b/plugins/chat/spec/system/uploads_spec.rb
index e074630d6bc..fdaecc58b82 100644
--- a/plugins/chat/spec/system/uploads_spec.rb
+++ b/plugins/chat/spec/system/uploads_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Uploading files in chat messages", type: :system do
+describe "Uploading files in chat messages" do
fab!(:current_user, :user)
fab!(:channel_1, :chat_channel)
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
diff --git a/plugins/chat/spec/system/user_card_spec.rb b/plugins/chat/spec/system/user_card_spec.rb
index b077b13db33..9cd6ee16ec5 100644
--- a/plugins/chat/spec/system/user_card_spec.rb
+++ b/plugins/chat/spec/system/user_card_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User card", type: :system do
+RSpec.describe "User card" do
fab!(:current_user, :user)
fab!(:topic_1, :topic)
diff --git a/plugins/chat/spec/system/user_chat_preferences_spec.rb b/plugins/chat/spec/system/user_chat_preferences_spec.rb
index f40ce8184b0..fe008901de3 100644
--- a/plugins/chat/spec/system/user_chat_preferences_spec.rb
+++ b/plugins/chat/spec/system/user_chat_preferences_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User chat preferences", type: :system do
+RSpec.describe "User chat preferences" do
fab!(:current_user, :user)
let(:user_preferences_chat_page) { PageObjects::Pages::UserPreferencesChat.new }
diff --git a/plugins/chat/spec/system/user_menu_notifications/sidebar_spec.rb b/plugins/chat/spec/system/user_menu_notifications/sidebar_spec.rb
index 7ef82d4de2c..2efa4087af3 100644
--- a/plugins/chat/spec/system/user_menu_notifications/sidebar_spec.rb
+++ b/plugins/chat/spec/system/user_menu_notifications/sidebar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User menu notifications | sidebar", type: :system do
+RSpec.describe "User menu notifications | sidebar" do
fab!(:current_user, :user)
let(:chat) { PageObjects::Pages::Chat.new }
diff --git a/plugins/chat/spec/system/user_profile_spec.rb b/plugins/chat/spec/system/user_profile_spec.rb
index 9c53f522d40..7399bbc4ee5 100644
--- a/plugins/chat/spec/system/user_profile_spec.rb
+++ b/plugins/chat/spec/system/user_profile_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User profile", type: :system do
+RSpec.describe "User profile" do
fab!(:current_user, :user)
fab!(:user)
diff --git a/plugins/chat/spec/system/user_status/sidebar_spec.rb b/plugins/chat/spec/system/user_status/sidebar_spec.rb
index 3d52779a5a0..5efa3217f1a 100644
--- a/plugins/chat/spec/system/user_status/sidebar_spec.rb
+++ b/plugins/chat/spec/system/user_status/sidebar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User status | sidebar", type: :system do
+RSpec.describe "User status | sidebar" do
fab!(:current_user, :user)
fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user]) }
diff --git a/plugins/chat/spec/system/user_threads_spec.rb b/plugins/chat/spec/system/user_threads_spec.rb
index 8522b008ddd..d52be53c274 100644
--- a/plugins/chat/spec/system/user_threads_spec.rb
+++ b/plugins/chat/spec/system/user_threads_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User threads", type: :system do
+RSpec.describe "User threads" do
fab!(:current_user, :user)
fab!(:channel_1) { Fabricate(:chat_channel, threading_enabled: true) }
diff --git a/plugins/chat/spec/system/visit_channel_spec.rb b/plugins/chat/spec/system/visit_channel_spec.rb
index 86eabe11da6..5319ebd631b 100644
--- a/plugins/chat/spec/system/visit_channel_spec.rb
+++ b/plugins/chat/spec/system/visit_channel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Visit channel", type: :system do
+RSpec.describe "Visit channel" do
fab!(:category)
fab!(:topic)
fab!(:post) { Fabricate(:post, topic: topic) }
diff --git a/plugins/checklist/spec/system/rich_editor_extension_spec.rb b/plugins/checklist/spec/system/rich_editor_extension_spec.rb
index dc794b0698b..b0d837ce016 100644
--- a/plugins/checklist/spec/system/rich_editor_extension_spec.rb
+++ b/plugins/checklist/spec/system/rich_editor_extension_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror editor - Checklist extension", type: :system do
+describe "Composer - ProseMirror editor - Checklist extension" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:composer) { PageObjects::Components::Composer.new }
let(:rich) { composer.rich_editor }
diff --git a/plugins/discourse-adplugin/spec/system/ad_impression_spec.rb b/plugins/discourse-adplugin/spec/system/ad_impression_spec.rb
index 7aaf634d856..7c217d56f69 100644
--- a/plugins/discourse-adplugin/spec/system/ad_impression_spec.rb
+++ b/plugins/discourse-adplugin/spec/system/ad_impression_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "AdPlugin::AdImpression", type: :system do
+describe "AdPlugin::AdImpression" do
before { enable_current_plugin }
describe "when a user sees an ad" do
diff --git a/plugins/discourse-adplugin/spec/system/admin_house_ad_spec.rb b/plugins/discourse-adplugin/spec/system/admin_house_ad_spec.rb
index 94e101f50af..8fb6b159ecc 100644
--- a/plugins/discourse-adplugin/spec/system/admin_house_ad_spec.rb
+++ b/plugins/discourse-adplugin/spec/system/admin_house_ad_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin House Ad", type: :system do
+describe "Admin House Ad" do
fab!(:admin)
let(:house_ads_page) { PageObjects::Pages::AdminHouseAds.new }
diff --git a/plugins/discourse-adplugin/spec/system/core_features_spec.rb b/plugins/discourse-adplugin/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-adplugin/spec/system/core_features_spec.rb
+++ b/plugins/discourse-adplugin/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-adplugin/spec/system/dfp_ads_spec.rb b/plugins/discourse-adplugin/spec/system/dfp_ads_spec.rb
index 09e79f14db3..ea24ad3e56a 100644
--- a/plugins/discourse-adplugin/spec/system/dfp_ads_spec.rb
+++ b/plugins/discourse-adplugin/spec/system/dfp_ads_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DFP External Ads", type: :system do
+describe "DFP External Ads" do
before { enable_current_plugin }
fab!(:user) { Fabricate(:user, trust_level: 1) }
diff --git a/plugins/discourse-affiliate/spec/system/core_features_spec.rb b/plugins/discourse-affiliate/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-affiliate/spec/system/core_features_spec.rb
+++ b/plugins/discourse-affiliate/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-ai/app/serializers/ai_spam_serializer.rb b/plugins/discourse-ai/app/serializers/ai_spam_serializer.rb
index fbf36b92b6a..d10fe2bdd3c 100644
--- a/plugins/discourse-ai/app/serializers/ai_spam_serializer.rb
+++ b/plugins/discourse-ai/app/serializers/ai_spam_serializer.rb
@@ -63,6 +63,6 @@ class AiSpamSerializer < ApplicationSerializer
def spam_scanning_user
user = DiscourseAi::AiModeration::SpamScanner.flagging_user
- user.serializable_hash(only: %i[id username name admin]) if user.present?
+ (user.presence&.serializable_hash(only: %i[id username name admin]))
end
end
diff --git a/plugins/discourse-ai/app/services/discourse_ai/summarization/regenerate_summaries.rb b/plugins/discourse-ai/app/services/discourse_ai/summarization/regenerate_summaries.rb
index 43770e4bf43..1356208dbba 100644
--- a/plugins/discourse-ai/app/services/discourse_ai/summarization/regenerate_summaries.rb
+++ b/plugins/discourse-ai/app/services/discourse_ai/summarization/regenerate_summaries.rb
@@ -66,12 +66,12 @@ module DiscourseAi
topics.each do |topic|
if params.type == "gist"
summarizer = DiscourseAi::Summarization.topic_gist(topic)
- summarizer.delete_cached_summaries! if summarizer.present?
+ (summarizer.presence&.delete_cached_summaries!)
Jobs.enqueue(:fast_track_topic_gist, topic_id: topic.id, force_regenerate: true)
else
summarizer = DiscourseAi::Summarization.topic_summary(topic)
- summarizer.delete_cached_summaries! if summarizer.present?
+ (summarizer.presence&.delete_cached_summaries!)
Jobs.enqueue(
:stream_topic_ai_summary,
diff --git a/plugins/discourse-ai/spec/system/admin_ai_agent_spec.rb b/plugins/discourse-ai/spec/system/admin_ai_agent_spec.rb
index 92aefb5e5c8..06d1b157f3e 100644
--- a/plugins/discourse-ai/spec/system/admin_ai_agent_spec.rb
+++ b/plugins/discourse-ai/spec/system/admin_ai_agent_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin AI agent configuration", type: :system do
+RSpec.describe "Admin AI agent configuration" do
fab!(:admin)
let(:page_header) { PageObjects::Components::DPageHeader.new }
let(:form) { PageObjects::Components::FormKit.new("form") }
diff --git a/plugins/discourse-ai/spec/system/admin_ai_features_spec.rb b/plugins/discourse-ai/spec/system/admin_ai_features_spec.rb
index c6c61af70d3..95068ee45c5 100644
--- a/plugins/discourse-ai/spec/system/admin_ai_features_spec.rb
+++ b/plugins/discourse-ai/spec/system/admin_ai_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin AI features configuration", type: :system do
+RSpec.describe "Admin AI features configuration" do
fab!(:admin)
fab!(:llm_model)
fab!(:summarization_agent, :ai_agent)
diff --git a/plugins/discourse-ai/spec/system/admin_ai_translations_spec.rb b/plugins/discourse-ai/spec/system/admin_ai_translations_spec.rb
index 64fc94e566b..2902de169fc 100644
--- a/plugins/discourse-ai/spec/system/admin_ai_translations_spec.rb
+++ b/plugins/discourse-ai/spec/system/admin_ai_translations_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin AI translations", type: :system do
+RSpec.describe "Admin AI translations" do
fab!(:admin)
let(:page_header) { PageObjects::Components::DPageHeader.new }
diff --git a/plugins/discourse-ai/spec/system/admin_dashboard_spec.rb b/plugins/discourse-ai/spec/system/admin_dashboard_spec.rb
index fd770656655..e2e5c1e4320 100644
--- a/plugins/discourse-ai/spec/system/admin_dashboard_spec.rb
+++ b/plugins/discourse-ai/spec/system/admin_dashboard_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin dashboard", type: :system do
+RSpec.describe "Admin dashboard" do
fab!(:admin)
before { enable_current_plugin }
diff --git a/plugins/discourse-ai/spec/system/ai_artifact_key_value_api_spec.rb b/plugins/discourse-ai/spec/system/ai_artifact_key_value_api_spec.rb
index 50c03b4d0e6..f7f1da8302e 100644
--- a/plugins/discourse-ai/spec/system/ai_artifact_key_value_api_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_artifact_key_value_api_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Artifact Key-Value API", type: :system do
+RSpec.describe "AI Artifact Key-Value API" do
fab!(:user)
fab!(:private_message_topic) { Fabricate(:private_message_topic, user: user) }
fab!(:private_message_post) { Fabricate(:post, topic: private_message_topic, user: user) }
diff --git a/plugins/discourse-ai/spec/system/ai_bot/agent_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/agent_spec.rb
index a8f59b62cff..e6ab8e7ea14 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/agent_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/agent_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI agents", type: :system do
+RSpec.describe "AI agents" do
fab!(:admin)
fab!(:gpt_4) { Fabricate(:llm_model, name: "gpt-4") }
diff --git a/plugins/discourse-ai/spec/system/ai_bot/ai_bot_helper_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/ai_bot_helper_spec.rb
index 18aca7d9137..ea11ffd5fba 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/ai_bot_helper_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/ai_bot_helper_spec.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
-RSpec.describe "AI chat channel summarization", type: :system do
+RSpec.describe "AI chat channel summarization" do
fab!(:user)
fab!(:group) { Fabricate(:group, visibility_level: Group.visibility_levels[:staff]) }
diff --git a/plugins/discourse-ai/spec/system/ai_bot/ai_share_conversation_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/ai_share_conversation_spec.rb
index 9361ac2716d..bb9f65a8d43 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/ai_share_conversation_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/ai_share_conversation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Share conversation via link", type: :system do
+RSpec.describe "Share conversation via link" do
fab!(:admin) { Fabricate(:admin, username: "ai_sharer") }
fab!(:gpt_4) { Fabricate(:llm_model, name: "gpt-4") }
diff --git a/plugins/discourse-ai/spec/system/ai_bot/artifact_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/artifact_spec.rb
index 5a0998c2b32..293a21254d2 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/artifact_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/artifact_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Artifact with Data Attributes", type: :system do
+RSpec.describe "AI Artifact with Data Attributes" do
fab!(:admin)
fab!(:user)
fab!(:author, :user)
diff --git a/plugins/discourse-ai/spec/system/ai_bot/header_toggle_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/header_toggle_spec.rb
index 04da93685f5..6d97bd2623a 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/header_toggle_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/header_toggle_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Bot - Header Toggle", type: :system do
+RSpec.describe "AI Bot - Header Toggle" do
let(:topic_page) { PageObjects::Pages::Topic.new }
let(:ai_pm_homepage) { PageObjects::Components::AiPmHomepage.new }
let(:header) { PageObjects::Pages::DiscourseAi::Header.new }
diff --git a/plugins/discourse-ai/spec/system/ai_bot/homepage_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/homepage_spec.rb
index 880da68356e..61fa1f435bd 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/homepage_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/homepage_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Bot - Homepage", type: :system do
+RSpec.describe "AI Bot - Homepage" do
let(:cdp) { PageObjects::CDP.new }
let(:topic_page) { PageObjects::Pages::Topic.new }
let(:composer) { PageObjects::Components::Composer.new }
diff --git a/plugins/discourse-ai/spec/system/ai_bot/share_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/share_spec.rb
index 9c75a3b7ea7..ca1e2d7fce6 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/share_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/share_spec.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
-RSpec.describe "Share conversation", type: :system do
+RSpec.describe "Share conversation" do
fab!(:admin) { Fabricate(:admin, username: "ai_sharer") }
fab!(:gpt_4) { Fabricate(:llm_model, name: "gpt-4") }
let(:bot_user) { DiscourseAi::AiBot::EntryPoint.find_user_from_model("gpt-4") }
diff --git a/plugins/discourse-ai/spec/system/ai_bot/tool_list_editor_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/tool_list_editor_spec.rb
index a9951dcc5ba..fbaa3480af8 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/tool_list_editor_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/tool_list_editor_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "AI Tool List Editor Dropdown", type: :system do
+describe "AI Tool List Editor Dropdown" do
fab!(:admin)
before do
diff --git a/plugins/discourse-ai/spec/system/ai_bot/tool_spec.rb b/plugins/discourse-ai/spec/system/ai_bot/tool_spec.rb
index ca74178f556..2c9d09d9b47 100644
--- a/plugins/discourse-ai/spec/system/ai_bot/tool_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_bot/tool_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "AI Tool Management", type: :system do
+describe "AI Tool Management" do
fab!(:admin)
let(:page_header) { PageObjects::Components::DPageHeader.new }
diff --git a/plugins/discourse-ai/spec/system/ai_helper/ai_composer_helper_spec.rb b/plugins/discourse-ai/spec/system/ai_helper/ai_composer_helper_spec.rb
index b65f46ca8a0..6dd3a01a24b 100644
--- a/plugins/discourse-ai/spec/system/ai_helper/ai_composer_helper_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_helper/ai_composer_helper_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Composer helper", type: :system do
+RSpec.describe "AI Composer helper" do
fab!(:user) { Fabricate(:admin, refresh_auto_groups: true) }
fab!(:non_member_group, :group)
fab!(:embedding_definition)
diff --git a/plugins/discourse-ai/spec/system/ai_helper/ai_image_caption_spec.rb b/plugins/discourse-ai/spec/system/ai_helper/ai_image_caption_spec.rb
index 878ed34198d..d1b3b569122 100644
--- a/plugins/discourse-ai/spec/system/ai_helper/ai_image_caption_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_helper/ai_image_caption_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI image caption", type: :system do
+RSpec.describe "AI image caption" do
fab!(:user) { Fabricate(:admin, refresh_auto_groups: true) }
fab!(:non_member_group, :group)
let(:user_preferences_ai_page) { PageObjects::Pages::UserPreferencesAi.new }
diff --git a/plugins/discourse-ai/spec/system/ai_helper/ai_post_helper_spec.rb b/plugins/discourse-ai/spec/system/ai_helper/ai_post_helper_spec.rb
index 9d63bfceaba..5ecbde76d88 100644
--- a/plugins/discourse-ai/spec/system/ai_helper/ai_post_helper_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_helper/ai_post_helper_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Post helper", type: :system do
+RSpec.describe "AI Post helper" do
fab!(:user, :admin)
fab!(:non_member_group, :group)
fab!(:topic)
diff --git a/plugins/discourse-ai/spec/system/ai_helper/ai_proofreading_spec.rb b/plugins/discourse-ai/spec/system/ai_helper/ai_proofreading_spec.rb
index b6cd21174c7..cbd8ecf4d86 100644
--- a/plugins/discourse-ai/spec/system/ai_helper/ai_proofreading_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_helper/ai_proofreading_spec.rb
@@ -2,7 +2,7 @@
include SystemHelpers
-RSpec.describe "AI Composer Proofreading Features", type: :system do
+RSpec.describe "AI Composer Proofreading Features" do
fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }
before do
diff --git a/plugins/discourse-ai/spec/system/ai_helper/ai_split_topic_suggestion_spec.rb b/plugins/discourse-ai/spec/system/ai_helper/ai_split_topic_suggestion_spec.rb
index f748f38a302..ea9d2ced6c0 100644
--- a/plugins/discourse-ai/spec/system/ai_helper/ai_split_topic_suggestion_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_helper/ai_split_topic_suggestion_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Post helper", type: :system do
+RSpec.describe "AI Post helper" do
fab!(:user, :admin)
fab!(:non_member_group, :group)
fab!(:topic)
diff --git a/plugins/discourse-ai/spec/system/ai_moderation/ai_spam_spec.rb b/plugins/discourse-ai/spec/system/ai_moderation/ai_spam_spec.rb
index 5431b3598e0..948eac6247b 100644
--- a/plugins/discourse-ai/spec/system/ai_moderation/ai_spam_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_moderation/ai_spam_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Spam Configuration", type: :system do
+RSpec.describe "AI Spam Configuration" do
fab!(:admin)
before do
diff --git a/plugins/discourse-ai/spec/system/ai_usage_spec.rb b/plugins/discourse-ai/spec/system/ai_usage_spec.rb
index 5907d959d3b..81bd5eb2384 100644
--- a/plugins/discourse-ai/spec/system/ai_usage_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_usage_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Usage Admin Page", type: :system do
+RSpec.describe "AI Usage Admin Page" do
fab!(:admin)
fab!(:llm_model)
diff --git a/plugins/discourse-ai/spec/system/ai_user_preferences_spec.rb b/plugins/discourse-ai/spec/system/ai_user_preferences_spec.rb
index f55324d9b80..6b7c0206a6a 100644
--- a/plugins/discourse-ai/spec/system/ai_user_preferences_spec.rb
+++ b/plugins/discourse-ai/spec/system/ai_user_preferences_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User AI preferences", type: :system do
+RSpec.describe "User AI preferences" do
fab!(:user) { Fabricate(:admin, refresh_auto_groups: true) }
fab!(:llm_model)
let(:user_preferences_ai_page) { PageObjects::Pages::UserPreferencesAi.new }
diff --git a/plugins/discourse-ai/spec/system/core_features_spec.rb b/plugins/discourse-ai/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-ai/spec/system/core_features_spec.rb
+++ b/plugins/discourse-ai/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-ai/spec/system/embeddings/ai_embedding_definition_spec.rb b/plugins/discourse-ai/spec/system/embeddings/ai_embedding_definition_spec.rb
index 9d168b69a20..dd8d5aa9180 100644
--- a/plugins/discourse-ai/spec/system/embeddings/ai_embedding_definition_spec.rb
+++ b/plugins/discourse-ai/spec/system/embeddings/ai_embedding_definition_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Managing Embeddings configurations", type: :system do
+RSpec.describe "Managing Embeddings configurations" do
fab!(:admin)
fab!(:ai_secret) { Fabricate(:ai_secret, name: "Test API Key", secret: "abcd") }
diff --git a/plugins/discourse-ai/spec/system/embeddings/semantic_search_spec.rb b/plugins/discourse-ai/spec/system/embeddings/semantic_search_spec.rb
index ed340b89cd1..d5c675ae7a2 100644
--- a/plugins/discourse-ai/spec/system/embeddings/semantic_search_spec.rb
+++ b/plugins/discourse-ai/spec/system/embeddings/semantic_search_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "AI Composer helper", type: :system do
+RSpec.describe "AI Composer helper" do
let(:search_page) { PageObjects::Pages::Search.new }
let(:query) { "apple_pie" }
let(:hypothetical_post) { "This is an hypothetical post generated from the keyword apple_pie" }
diff --git a/plugins/discourse-ai/spec/system/llms/ai_llm_spec.rb b/plugins/discourse-ai/spec/system/llms/ai_llm_spec.rb
index c69d8a3eda6..16aaf03c133 100644
--- a/plugins/discourse-ai/spec/system/llms/ai_llm_spec.rb
+++ b/plugins/discourse-ai/spec/system/llms/ai_llm_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Managing LLM configurations", type: :system do
+RSpec.describe "Managing LLM configurations" do
fab!(:admin)
fab!(:ai_secret) { Fabricate(:ai_secret, name: "Test API Key", secret: "abcd") }
diff --git a/plugins/discourse-ai/spec/system/summarization/chat_summarization_spec.rb b/plugins/discourse-ai/spec/system/summarization/chat_summarization_spec.rb
index 59e947b7978..0fba44c2bb2 100644
--- a/plugins/discourse-ai/spec/system/summarization/chat_summarization_spec.rb
+++ b/plugins/discourse-ai/spec/system/summarization/chat_summarization_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Summarize a channel since your last visit", type: :system do
+RSpec.describe "Summarize a channel since your last visit" do
fab!(:current_user, :user)
fab!(:group)
fab!(:channel, :chat_channel)
diff --git a/plugins/discourse-ai/spec/system/summarization/gists_toggle_spec.rb b/plugins/discourse-ai/spec/system/summarization/gists_toggle_spec.rb
index 934e90a4554..f4f8e1cd458 100644
--- a/plugins/discourse-ai/spec/system/summarization/gists_toggle_spec.rb
+++ b/plugins/discourse-ai/spec/system/summarization/gists_toggle_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Gists Toggle Functionality", type: :system do
+describe "Gists Toggle Functionality" do
fab!(:admin)
fab!(:group)
fab!(:topic_with_gist, :topic)
@@ -111,7 +111,7 @@ describe "Gists Toggle Functionality", type: :system do
end
end
-describe "Gists Toggle Functionality - Mobile", type: :system, mobile: true do
+describe "Gists Toggle Functionality - Mobile", mobile: true do
fab!(:admin)
fab!(:group)
fab!(:topic_with_gist, :topic)
diff --git a/plugins/discourse-ai/spec/system/summarization/topic_summarization_spec.rb b/plugins/discourse-ai/spec/system/summarization/topic_summarization_spec.rb
index 2e9fc746a51..a23990f12b4 100644
--- a/plugins/discourse-ai/spec/system/summarization/topic_summarization_spec.rb
+++ b/plugins/discourse-ai/spec/system/summarization/topic_summarization_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Summarize a topic ", type: :system do
+RSpec.describe "Summarize a topic " do
fab!(:current_user, :user)
fab!(:group)
fab!(:topic)
diff --git a/plugins/discourse-apple-auth/spec/system/core_features_spec.rb b/plugins/discourse-apple-auth/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-apple-auth/spec/system/core_features_spec.rb
+++ b/plugins/discourse-apple-auth/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-assign/spec/system/assign_post_spec.rb b/plugins/discourse-assign/spec/system/assign_post_spec.rb
index b2cd3340631..2a3054ac6e0 100644
--- a/plugins/discourse-assign/spec/system/assign_post_spec.rb
+++ b/plugins/discourse-assign/spec/system/assign_post_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Assign | Assigning posts", type: :system do
+describe "Assign | Assigning posts" do
let(:topic_page) { PageObjects::Pages::Topic.new }
let(:assign_modal) { PageObjects::Modals::Assign.new }
fab!(:staff_user) { Fabricate(:user, groups: [Group[:staff]]) }
diff --git a/plugins/discourse-assign/spec/system/assign_topic_spec.rb b/plugins/discourse-assign/spec/system/assign_topic_spec.rb
index f55ea484010..16af06531c6 100644
--- a/plugins/discourse-assign/spec/system/assign_topic_spec.rb
+++ b/plugins/discourse-assign/spec/system/assign_topic_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Assign | Assigning topics", type: :system do
+describe "Assign | Assigning topics" do
let(:topic_page) { PageObjects::Pages::Topic.new }
let(:assign_modal) { PageObjects::Modals::Assign.new }
fab!(:admin1, :admin)
diff --git a/plugins/discourse-assign/spec/system/bulk_assign_spec.rb b/plugins/discourse-assign/spec/system/bulk_assign_spec.rb
index 0f481065376..9b949680836 100644
--- a/plugins/discourse-assign/spec/system/bulk_assign_spec.rb
+++ b/plugins/discourse-assign/spec/system/bulk_assign_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Assign | Bulk Assign", type: :system do
+describe "Assign | Bulk Assign" do
let(:topic_page) { PageObjects::Pages::Topic.new }
let(:assign_modal) { PageObjects::Modals::Assign.new }
let(:topic_list_header) { PageObjects::Components::TopicListHeader.new }
diff --git a/plugins/discourse-assign/spec/system/core_features_spec.rb b/plugins/discourse-assign/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-assign/spec/system/core_features_spec.rb
+++ b/plugins/discourse-assign/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-assign/spec/system/group_assigned_spec.rb b/plugins/discourse-assign/spec/system/group_assigned_spec.rb
index a863fef91c4..b1b541562be 100644
--- a/plugins/discourse-assign/spec/system/group_assigned_spec.rb
+++ b/plugins/discourse-assign/spec/system/group_assigned_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Assign | Group assigned", type: :system do
+RSpec.describe "Assign | Group assigned" do
fab!(:admin)
fab!(:group)
fab!(:topic)
diff --git a/plugins/discourse-assign/spec/system/group_preferences_spec.rb b/plugins/discourse-assign/spec/system/group_preferences_spec.rb
index 68c497bbe73..746d431ba65 100644
--- a/plugins/discourse-assign/spec/system/group_preferences_spec.rb
+++ b/plugins/discourse-assign/spec/system/group_preferences_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Assign | Group Preferences", type: :system do
+RSpec.describe "Assign | Group Preferences" do
fab!(:admin)
fab!(:group)
diff --git a/plugins/discourse-assign/spec/system/user_menu_spec.rb b/plugins/discourse-assign/spec/system/user_menu_spec.rb
index 528360e735c..4eaa2577c04 100644
--- a/plugins/discourse-assign/spec/system/user_menu_spec.rb
+++ b/plugins/discourse-assign/spec/system/user_menu_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Assign | User Menu", type: :system do
+RSpec.describe "Assign | User Menu" do
fab!(:admin)
let(:user_menu) { PageObjects::Components::UserMenu.new }
diff --git a/plugins/discourse-assign/spec/system/user_preferences_spec.rb b/plugins/discourse-assign/spec/system/user_preferences_spec.rb
index 5e23f8d62b1..7688d7d9f04 100644
--- a/plugins/discourse-assign/spec/system/user_preferences_spec.rb
+++ b/plugins/discourse-assign/spec/system/user_preferences_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Assign | User Preferences", type: :system do
+describe "Assign | User Preferences" do
fab!(:user)
let(:selector) { "[data-setting-name='user-notification-level-when-assigned'] .combobox" }
diff --git a/plugins/discourse-calendar/spec/system/calendar_first_day_of_week_spec.rb b/plugins/discourse-calendar/spec/system/calendar_first_day_of_week_spec.rb
index 928af552dba..50dbc9ca788 100644
--- a/plugins/discourse-calendar/spec/system/calendar_first_day_of_week_spec.rb
+++ b/plugins/discourse-calendar/spec/system/calendar_first_day_of_week_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Calendar first day of week", type: :system do
+describe "Calendar first day of week" do
fab!(:admin)
let(:upcoming_events) { PageObjects::Pages::DiscourseCalendar::UpcomingEvents.new }
diff --git a/plugins/discourse-calendar/spec/system/category_calendar_spec.rb b/plugins/discourse-calendar/spec/system/category_calendar_spec.rb
index 5b32bacf2c7..ef6b0dd2873 100644
--- a/plugins/discourse-calendar/spec/system/category_calendar_spec.rb
+++ b/plugins/discourse-calendar/spec/system/category_calendar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Category calendar", type: :system do
+describe "Category calendar" do
fab!(:admin)
fab!(:user)
fab!(:category)
diff --git a/plugins/discourse-calendar/spec/system/composer/prosemirror_event_spec.rb b/plugins/discourse-calendar/spec/system/composer/prosemirror_event_spec.rb
index a53be42eebe..dd599e2db45 100644
--- a/plugins/discourse-calendar/spec/system/composer/prosemirror_event_spec.rb
+++ b/plugins/discourse-calendar/spec/system/composer/prosemirror_event_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Event Editor", type: :system do
+describe "Composer - ProseMirror - Event Editor" do
include_context "with prosemirror editor"
before do
diff --git a/plugins/discourse-calendar/spec/system/core_features_spec.rb b/plugins/discourse-calendar/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-calendar/spec/system/core_features_spec.rb
+++ b/plugins/discourse-calendar/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-calendar/spec/system/disable_sort_spec.rb b/plugins/discourse-calendar/spec/system/disable_sort_spec.rb
index a1c82346a08..d589a2166df 100644
--- a/plugins/discourse-calendar/spec/system/disable_sort_spec.rb
+++ b/plugins/discourse-calendar/spec/system/disable_sort_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Disabling topic list sorting", type: :system do
+describe "Disabling topic list sorting" do
fab!(:category)
let(:category_page) { PageObjects::Pages::Category.new }
diff --git a/plugins/discourse-calendar/spec/system/group_timezones_spec.rb b/plugins/discourse-calendar/spec/system/group_timezones_spec.rb
index b5fecbeff69..66f510bc3a1 100644
--- a/plugins/discourse-calendar/spec/system/group_timezones_spec.rb
+++ b/plugins/discourse-calendar/spec/system/group_timezones_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Group timezones feature", type: :system do
+describe "Group timezones feature" do
fab!(:group) { Fabricate(:group, name: "test-group") }
fab!(:users) do
diff --git a/plugins/discourse-calendar/spec/system/post_calendar_spec.rb b/plugins/discourse-calendar/spec/system/post_calendar_spec.rb
index 77fccf1fa78..341d368c43e 100644
--- a/plugins/discourse-calendar/spec/system/post_calendar_spec.rb
+++ b/plugins/discourse-calendar/spec/system/post_calendar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post calendar", type: :system do
+describe "Post calendar" do
fab!(:admin)
let(:calendar_post) { create_post(user: admin, raw: "[calendar]\n[/calendar]") }
diff --git a/plugins/discourse-calendar/spec/system/post_event_spec.rb b/plugins/discourse-calendar/spec/system/post_event_spec.rb
index fbb80a5c580..25eca4b1632 100644
--- a/plugins/discourse-calendar/spec/system/post_event_spec.rb
+++ b/plugins/discourse-calendar/spec/system/post_event_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post event", type: :system do
+describe "Post event" do
fab!(:admin)
fab!(:user, :admin)
fab!(:group)
diff --git a/plugins/discourse-calendar/spec/system/upcoming_events_spec.rb b/plugins/discourse-calendar/spec/system/upcoming_events_spec.rb
index aef9df3913d..17ef6b7ac55 100644
--- a/plugins/discourse-calendar/spec/system/upcoming_events_spec.rb
+++ b/plugins/discourse-calendar/spec/system/upcoming_events_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Upcoming Events", type: :system do
+describe "Upcoming Events" do
fab!(:admin)
fab!(:user)
fab!(:category)
diff --git a/plugins/discourse-chat-integration/spec/system/core_features_spec.rb b/plugins/discourse-chat-integration/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-chat-integration/spec/system/core_features_spec.rb
+++ b/plugins/discourse-chat-integration/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-chat-integration/spec/system/create_channel_spec.rb b/plugins/discourse-chat-integration/spec/system/create_channel_spec.rb
index 6102aa682a9..af3721dc100 100644
--- a/plugins/discourse-chat-integration/spec/system/create_channel_spec.rb
+++ b/plugins/discourse-chat-integration/spec/system/create_channel_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
require_relative "../dummy_provider"
-RSpec.describe "Create channel", type: :system do
+RSpec.describe "Create channel" do
fab!(:admin)
include_context "with dummy provider"
diff --git a/plugins/discourse-chat-integration/spec/system/rule_tags_spec.rb b/plugins/discourse-chat-integration/spec/system/rule_tags_spec.rb
index 2b126f5ac31..dc9f14bbeb4 100644
--- a/plugins/discourse-chat-integration/spec/system/rule_tags_spec.rb
+++ b/plugins/discourse-chat-integration/spec/system/rule_tags_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Chat Integration Rule Tags", type: :system do
+RSpec.describe "Chat Integration Rule Tags" do
fab!(:admin)
fab!(:tag1) { Fabricate(:tag, name: "support") }
fab!(:tag2) { Fabricate(:tag, name: "bug") }
diff --git a/plugins/discourse-data-explorer/spec/system/bookmark_spec.rb b/plugins/discourse-data-explorer/spec/system/bookmark_spec.rb
index 1b7095c2bbb..b670a7fd535 100644
--- a/plugins/discourse-data-explorer/spec/system/bookmark_spec.rb
+++ b/plugins/discourse-data-explorer/spec/system/bookmark_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Bookmarking reports attached to a group", type: :system do
+describe "Bookmarking reports attached to a group" do
fab!(:current_user, :admin)
fab!(:query_1) do
Fabricate(
diff --git a/plugins/discourse-data-explorer/spec/system/core_features_spec.rb b/plugins/discourse-data-explorer/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-data-explorer/spec/system/core_features_spec.rb
+++ b/plugins/discourse-data-explorer/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-data-explorer/spec/system/param_input_spec.rb b/plugins/discourse-data-explorer/spec/system/param_input_spec.rb
index 59659189362..38a6365fd9d 100644
--- a/plugins/discourse-data-explorer/spec/system/param_input_spec.rb
+++ b/plugins/discourse-data-explorer/spec/system/param_input_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Param input", type: :system do
+RSpec.describe "Param input" do
ALL_PARAMS_SQL = <<~SQL
-- [params]
-- int :int
diff --git a/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb b/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb
index b3d4ef56f9b..88a225e846f 100644
--- a/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb
+++ b/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Data explorer query runner", type: :system do
+RSpec.describe "Data explorer query runner" do
fab!(:admin)
fab!(:group) { Fabricate(:group, name: "group") }
fab!(:group_user) { Fabricate(:group_user, user: admin, group: group) }
diff --git a/plugins/discourse-data-explorer/spec/system/reports_spec.rb b/plugins/discourse-data-explorer/spec/system/reports_spec.rb
index 3b42a7da215..1e0fbac6b12 100644
--- a/plugins/discourse-data-explorer/spec/system/reports_spec.rb
+++ b/plugins/discourse-data-explorer/spec/system/reports_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Reports", type: :system do
+RSpec.describe "Reports" do
fab!(:group) { Fabricate(:group, name: "group") }
fab!(:user, :admin)
fab!(:group_user) { Fabricate(:group_user, user: user, group: group) }
diff --git a/plugins/discourse-details/spec/system/details_spec.rb b/plugins/discourse-details/spec/system/details_spec.rb
index a5cdc029263..77dd3e5e282 100644
--- a/plugins/discourse-details/spec/system/details_spec.rb
+++ b/plugins/discourse-details/spec/system/details_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Details button", type: :system do
+describe "Details button" do
fab!(:admin)
let(:composer) { PageObjects::Components::Composer.new }
diff --git a/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb b/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb
index 7d5561cd0a9..7e3a0a8ba0a 100644
--- a/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb
+++ b/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin leaderboards", type: :system do
+describe "Admin leaderboards" do
fab!(:current_user, :admin)
let(:admin_leaderboard_page) { PageObjects::Pages::AdminLeaderboards.new }
let(:dialog) { PageObjects::Components::Dialog.new }
diff --git a/plugins/discourse-gamification/spec/system/core_features_spec.rb b/plugins/discourse-gamification/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-gamification/spec/system/core_features_spec.rb
+++ b/plugins/discourse-gamification/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-gamification/spec/system/recalculate_scores_form_spec.rb b/plugins/discourse-gamification/spec/system/recalculate_scores_form_spec.rb
index 7debd3c3907..144c8f20565 100644
--- a/plugins/discourse-gamification/spec/system/recalculate_scores_form_spec.rb
+++ b/plugins/discourse-gamification/spec/system/recalculate_scores_form_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Recalculate Scores Form", type: :system do
+describe "Recalculate Scores Form" do
let(:recalculate_scores_modal) { PageObjects::Modals::RecalculateScoresForm.new }
fab!(:admin)
diff --git a/plugins/discourse-github/spec/system/core_features_spec.rb b/plugins/discourse-github/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-github/spec/system/core_features_spec.rb
+++ b/plugins/discourse-github/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-graphviz/spec/system/core_features_spec.rb b/plugins/discourse-graphviz/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-graphviz/spec/system/core_features_spec.rb
+++ b/plugins/discourse-graphviz/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-hcaptcha/spec/system/core_features_spec.rb b/plugins/discourse-hcaptcha/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-hcaptcha/spec/system/core_features_spec.rb
+++ b/plugins/discourse-hcaptcha/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-local-dates/spec/system/local_dates_spec.rb b/plugins/discourse-local-dates/spec/system/local_dates_spec.rb
index 0951dc63249..bd7430a0b1a 100644
--- a/plugins/discourse-local-dates/spec/system/local_dates_spec.rb
+++ b/plugins/discourse-local-dates/spec/system/local_dates_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Local dates", type: :system do
+describe "Local dates" do
fab!(:topic)
fab!(:current_user) { Fabricate(:user, refresh_auto_groups: true) }
let(:year) { Time.zone.now.year + 1 }
diff --git a/plugins/discourse-local-dates/spec/system/post_small_action_spec.rb b/plugins/discourse-local-dates/spec/system/post_small_action_spec.rb
index 801e7b2b10f..cd343e90c83 100644
--- a/plugins/discourse-local-dates/spec/system/post_small_action_spec.rb
+++ b/plugins/discourse-local-dates/spec/system/post_small_action_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post small actions", type: :system do
+describe "Post small actions" do
fab!(:current_user, :user)
fab!(:topic)
fab!(:post) { Fabricate(:post, topic: topic) }
diff --git a/plugins/discourse-local-dates/spec/system/rich_editor_extension_spec.rb b/plugins/discourse-local-dates/spec/system/rich_editor_extension_spec.rb
index 07dacd897e6..cdd9e54dc3b 100644
--- a/plugins/discourse-local-dates/spec/system/rich_editor_extension_spec.rb
+++ b/plugins/discourse-local-dates/spec/system/rich_editor_extension_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror editor - Local Dates extension", type: :system do
+describe "Composer - ProseMirror editor - Local Dates extension" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:cdp) { PageObjects::CDP.new }
let(:composer) { PageObjects::Components::Composer.new }
diff --git a/plugins/discourse-login-with-amazon/spec/system/associated_account_prefs_spec.rb b/plugins/discourse-login-with-amazon/spec/system/associated_account_prefs_spec.rb
index 762f7842401..a3251db8dd4 100644
--- a/plugins/discourse-login-with-amazon/spec/system/associated_account_prefs_spec.rb
+++ b/plugins/discourse-login-with-amazon/spec/system/associated_account_prefs_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Amazon Associated Account Preferences", type: :system do
+RSpec.describe "Amazon Associated Account Preferences" do
fab!(:user)
let!(:user_account_preferences_page) { PageObjects::Pages::UserPreferencesAccount.new }
diff --git a/plugins/discourse-login-with-amazon/spec/system/core_features_spec.rb b/plugins/discourse-login-with-amazon/spec/system/core_features_spec.rb
index 646117e39e3..f632e31c422 100644
--- a/plugins/discourse-login-with-amazon/spec/system/core_features_spec.rb
+++ b/plugins/discourse-login-with-amazon/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before do
SiteSetting.login_with_amazon_client_id = "somekey"
SiteSetting.login_with_amazon_client_secret = "somesecretkey"
diff --git a/plugins/discourse-lti/spec/system/core_features_spec.rb b/plugins/discourse-lti/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-lti/spec/system/core_features_spec.rb
+++ b/plugins/discourse-lti/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-math/spec/system/chat_message_spec.rb b/plugins/discourse-math/spec/system/chat_message_spec.rb
index 94ea7daf164..6740de431a8 100644
--- a/plugins/discourse-math/spec/system/chat_message_spec.rb
+++ b/plugins/discourse-math/spec/system/chat_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Discourse Math - chat message", type: :system do
+RSpec.describe "Discourse Math - chat message" do
fab!(:current_user, :admin)
fab!(:channel, :chat_channel)
diff --git a/plugins/discourse-math/spec/system/composer_spec.rb b/plugins/discourse-math/spec/system/composer_spec.rb
index 4d1f21989b3..02e5cd83c2d 100644
--- a/plugins/discourse-math/spec/system/composer_spec.rb
+++ b/plugins/discourse-math/spec/system/composer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Discourse Math - composer", type: :system do
+RSpec.describe "Discourse Math - composer" do
fab!(:current_user) do
# Start in markdown mode so we can type math syntax, then toggle to rich editor
Fabricate(:admin, composition_mode: UserOption.composition_mode_types[:markdown])
diff --git a/plugins/discourse-math/spec/system/core_features_spec.rb b/plugins/discourse-math/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-math/spec/system/core_features_spec.rb
+++ b/plugins/discourse-math/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-math/spec/system/post_spec.rb b/plugins/discourse-math/spec/system/post_spec.rb
index d03502e5d78..f858c7b454f 100644
--- a/plugins/discourse-math/spec/system/post_spec.rb
+++ b/plugins/discourse-math/spec/system/post_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Discourse Math - post", type: :system do
+RSpec.describe "Discourse Math - post" do
fab!(:current_user, :admin)
before do
diff --git a/plugins/discourse-microsoft-auth/spec/system/core_features_spec.rb b/plugins/discourse-microsoft-auth/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-microsoft-auth/spec/system/core_features_spec.rb
+++ b/plugins/discourse-microsoft-auth/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-narrative-bot/spec/system/user_spec.rb b/plugins/discourse-narrative-bot/spec/system/user_spec.rb
index e9835db5d95..c31775ffeb9 100644
--- a/plugins/discourse-narrative-bot/spec/system/user_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/system/user_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Narrative Bot PM", type: :system do
+describe "Narrative Bot PM" do
fab!(:admin)
fab!(:current_user, :user)
fab!(:topics) { Fabricate.times(2, :post).map(&:topic) }
diff --git a/plugins/discourse-oauth2-basic/spec/system/admin_config_login_spec.rb b/plugins/discourse-oauth2-basic/spec/system/admin_config_login_spec.rb
index 86ff1210902..04e395feefb 100644
--- a/plugins/discourse-oauth2-basic/spec/system/admin_config_login_spec.rb
+++ b/plugins/discourse-oauth2-basic/spec/system/admin_config_login_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Config Login and Authentication OAuth2 tab", type: :system do
+describe "Admin Config Login and Authentication OAuth2 tab" do
fab!(:current_user, :admin)
let(:admin_login_page) { PageObjects::Pages::AdminLoginAndAuthentication.new }
diff --git a/plugins/discourse-oauth2-basic/spec/system/core_features_spec.rb b/plugins/discourse-oauth2-basic/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-oauth2-basic/spec/system/core_features_spec.rb
+++ b/plugins/discourse-oauth2-basic/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-openid-connect/spec/system/admin_config_login_spec.rb b/plugins/discourse-openid-connect/spec/system/admin_config_login_spec.rb
index be9a8af4e66..4b28477b45b 100644
--- a/plugins/discourse-openid-connect/spec/system/admin_config_login_spec.rb
+++ b/plugins/discourse-openid-connect/spec/system/admin_config_login_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Config Login and Authentication OIDC tab", type: :system do
+describe "Admin Config Login and Authentication OIDC tab" do
fab!(:current_user, :admin)
let(:admin_login_page) { PageObjects::Pages::AdminLoginAndAuthentication.new }
diff --git a/plugins/discourse-openid-connect/spec/system/core_features_spec.rb b/plugins/discourse-openid-connect/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-openid-connect/spec/system/core_features_spec.rb
+++ b/plugins/discourse-openid-connect/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-patreon/spec/system/core_features_spec.rb b/plugins/discourse-patreon/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-patreon/spec/system/core_features_spec.rb
+++ b/plugins/discourse-patreon/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-policy/spec/system/core_features_spec.rb b/plugins/discourse-policy/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-policy/spec/system/core_features_spec.rb
+++ b/plugins/discourse-policy/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-post-voting/spec/system/core_features_spec.rb b/plugins/discourse-post-voting/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-post-voting/spec/system/core_features_spec.rb
+++ b/plugins/discourse-post-voting/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-post-voting/spec/system/post_voting_spec.rb b/plugins/discourse-post-voting/spec/system/post_voting_spec.rb
index 3914e695e5c..527a72cc010 100644
--- a/plugins/discourse-post-voting/spec/system/post_voting_spec.rb
+++ b/plugins/discourse-post-voting/spec/system/post_voting_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Post voting", type: :system do
+RSpec.describe "Post voting" do
fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }
fab!(:user1) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:user2) { Fabricate(:user, refresh_auto_groups: true) }
diff --git a/plugins/discourse-post-voting/spec/system/viewing_reviewable_spec.rb b/plugins/discourse-post-voting/spec/system/viewing_reviewable_spec.rb
index 0fdff2aac91..fb00ea42159 100644
--- a/plugins/discourse-post-voting/spec/system/viewing_reviewable_spec.rb
+++ b/plugins/discourse-post-voting/spec/system/viewing_reviewable_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Viewing reviewable post voting comment", type: :system do
+describe "Viewing reviewable post voting comment" do
fab!(:admin)
fab!(:group)
fab!(:topic) { Fabricate(:topic, subtype: Topic::POST_VOTING_SUBTYPE) }
diff --git a/plugins/discourse-reactions/spec/system/core_features_spec.rb b/plugins/discourse-reactions/spec/system/core_features_spec.rb
index ca779bf1ad4..3e1cf0751c5 100644
--- a/plugins/discourse-reactions/spec/system/core_features_spec.rb
+++ b/plugins/discourse-reactions/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features", skip_examples: %i[likes]
diff --git a/plugins/discourse-reactions/spec/system/reaction_notifications_spec.rb b/plugins/discourse-reactions/spec/system/reaction_notifications_spec.rb
index 1b8586aea25..b75cbf655be 100644
--- a/plugins/discourse-reactions/spec/system/reaction_notifications_spec.rb
+++ b/plugins/discourse-reactions/spec/system/reaction_notifications_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Reactions | Notifications", type: :system do
+describe "Reactions | Notifications" do
fab!(:current_user, :user)
fab!(:acting_user_1) { Fabricate(:user, name: "Bruce Wayne I") }
fab!(:acting_user_2) { Fabricate(:user, name: "Bruce Wayne II") }
diff --git a/plugins/discourse-reactions/spec/system/reactions_activity_spec.rb b/plugins/discourse-reactions/spec/system/reactions_activity_spec.rb
index 843972b55b5..2b94684dccb 100644
--- a/plugins/discourse-reactions/spec/system/reactions_activity_spec.rb
+++ b/plugins/discourse-reactions/spec/system/reactions_activity_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Reactions | Activity", type: :system do
+describe "Reactions | Activity" do
fab!(:current_user, :user)
before do
diff --git a/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb b/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb
index 318e182c7b1..fd9e5ff5ba9 100644
--- a/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb
+++ b/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Reactions | Post reaction user list", type: :system do
+describe "Reactions | Post reaction user list" do
fab!(:current_user, :user)
fab!(:user_2, :user)
fab!(:user_3, :user)
diff --git a/plugins/discourse-rewind/spec/system/core_features_spec.rb b/plugins/discourse-rewind/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-rewind/spec/system/core_features_spec.rb
+++ b/plugins/discourse-rewind/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-rewind/spec/system/dismiss_spec.rb b/plugins/discourse-rewind/spec/system/dismiss_spec.rb
index 0fefc7ca691..0f9612a964e 100644
--- a/plugins/discourse-rewind/spec/system/dismiss_spec.rb
+++ b/plugins/discourse-rewind/spec/system/dismiss_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DiscourseRewind | dismiss", type: :system do
+describe "DiscourseRewind | dismiss" do
fab!(:user) { Fabricate(:user, created_at: DateTime.parse("2020-01-01")) }
let(:rewind_page) { PageObjects::Pages::Rewind.new }
diff --git a/plugins/discourse-rewind/spec/system/display_most_viewed_tags_spec.rb b/plugins/discourse-rewind/spec/system/display_most_viewed_tags_spec.rb
index d20df037cc0..98a933776cd 100644
--- a/plugins/discourse-rewind/spec/system/display_most_viewed_tags_spec.rb
+++ b/plugins/discourse-rewind/spec/system/display_most_viewed_tags_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Display most viewed tags in rewind", type: :system do
+describe "Display most viewed tags in rewind" do
fab!(:current_user) { Fabricate(:user, created_at: DateTime.parse("2020-01-01")) }
fab!(:tag_1, :tag)
fab!(:tag_2, :tag)
diff --git a/plugins/discourse-rewind/spec/system/rewind_profile_tab_spec.rb b/plugins/discourse-rewind/spec/system/rewind_profile_tab_spec.rb
index 4bbc7fa6ba9..9ce40431b84 100644
--- a/plugins/discourse-rewind/spec/system/rewind_profile_tab_spec.rb
+++ b/plugins/discourse-rewind/spec/system/rewind_profile_tab_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DiscourseRewind | rewind profile link", type: :system do
+describe "DiscourseRewind | rewind profile link" do
fab!(:current_user) { Fabricate(:user, created_at: DateTime.parse("2020-01-01")) }
let(:rewind_page) { PageObjects::Pages::Rewind.new }
diff --git a/plugins/discourse-rewind/spec/system/rewind_sharing_spec.rb b/plugins/discourse-rewind/spec/system/rewind_sharing_spec.rb
index d77d5e199c7..844d89c95e7 100644
--- a/plugins/discourse-rewind/spec/system/rewind_sharing_spec.rb
+++ b/plugins/discourse-rewind/spec/system/rewind_sharing_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DiscourseRewind | rewind sharing", type: :system do
+describe "DiscourseRewind | rewind sharing" do
fab!(:current_user) do
Fabricate(
:user,
diff --git a/plugins/discourse-rewind/spec/system/rewind_tab_spec.rb b/plugins/discourse-rewind/spec/system/rewind_tab_spec.rb
index aa5d8bb74cb..96fae53347f 100644
--- a/plugins/discourse-rewind/spec/system/rewind_tab_spec.rb
+++ b/plugins/discourse-rewind/spec/system/rewind_tab_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DiscourseRewind | rewind tab", type: :system do
+describe "DiscourseRewind | rewind tab" do
fab!(:current_user) { Fabricate(:user, created_at: DateTime.parse("2020-01-01")) }
let(:rewind_page) { PageObjects::Pages::Rewind.new }
diff --git a/plugins/discourse-rewind/spec/system/user_preferences_spec.rb b/plugins/discourse-rewind/spec/system/user_preferences_spec.rb
index ce558a43bb2..bc88be960dc 100644
--- a/plugins/discourse-rewind/spec/system/user_preferences_spec.rb
+++ b/plugins/discourse-rewind/spec/system/user_preferences_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "DiscourseRewind | user preferences", type: :system do
+describe "DiscourseRewind | user preferences" do
fab!(:current_user) { Fabricate(:user, created_at: DateTime.parse("2020-01-01")) }
let(:rewind_page) { PageObjects::Pages::Rewind.new }
diff --git a/plugins/discourse-rss-polling/spec/system/admin_spec.rb b/plugins/discourse-rss-polling/spec/system/admin_spec.rb
index 31d1fc382b5..b795b9df0cf 100644
--- a/plugins/discourse-rss-polling/spec/system/admin_spec.rb
+++ b/plugins/discourse-rss-polling/spec/system/admin_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Rss Polling - admin", type: :system do
+RSpec.describe "Rss Polling - admin" do
fab!(:current_user, :admin)
fab!(:category_1, :category)
fab!(:tag_1, :tag)
diff --git a/plugins/discourse-rss-polling/spec/system/core_features_spec.rb b/plugins/discourse-rss-polling/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-rss-polling/spec/system/core_features_spec.rb
+++ b/plugins/discourse-rss-polling/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-solved/spec/system/core_features_spec.rb b/plugins/discourse-solved/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-solved/spec/system/core_features_spec.rb
+++ b/plugins/discourse-solved/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-solved/spec/system/solved_spec.rb b/plugins/discourse-solved/spec/system/solved_spec.rb
index 2bc69edb665..481c804e190 100644
--- a/plugins/discourse-solved/spec/system/solved_spec.rb
+++ b/plugins/discourse-solved/spec/system/solved_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Solved", type: :system do
+describe "Solved" do
fab!(:admin)
fab!(:solver, :user)
fab!(:accepter) { Fabricate(:user, name: "<b>DERP<b>") }
diff --git a/plugins/discourse-solved/spec/system/solved_with_tags_spec.rb b/plugins/discourse-solved/spec/system/solved_with_tags_spec.rb
index 46a8d0c22ef..7686ed3d883 100644
--- a/plugins/discourse-solved/spec/system/solved_with_tags_spec.rb
+++ b/plugins/discourse-solved/spec/system/solved_with_tags_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Solved with tags", type: :system do
+describe "Solved with tags" do
fab!(:user)
fab!(:replier, :user)
fab!(:tag)
diff --git a/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb b/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb
index 23da0b8e7b8..2e43a398dbc 100644
--- a/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb
+++ b/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Support Category Type Setup", type: :system do
+RSpec.describe "Support Category Type Setup" do
fab!(:admin)
let(:category_page) { PageObjects::Pages::Category.new }
diff --git a/plugins/discourse-subscriptions/spec/system/campaign_banner_spec.rb b/plugins/discourse-subscriptions/spec/system/campaign_banner_spec.rb
index 693bbfcec09..74aaeb535d2 100644
--- a/plugins/discourse-subscriptions/spec/system/campaign_banner_spec.rb
+++ b/plugins/discourse-subscriptions/spec/system/campaign_banner_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Campaign Banner", type: :system do
+RSpec.describe "Campaign Banner" do
fab!(:user)
fab!(:contributor) { Fabricate(:user, username: "contributor1") }
diff --git a/plugins/discourse-subscriptions/spec/system/core_features_spec.rb b/plugins/discourse-subscriptions/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-subscriptions/spec/system/core_features_spec.rb
+++ b/plugins/discourse-subscriptions/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-subscriptions/spec/system/pricing_table_spec.rb b/plugins/discourse-subscriptions/spec/system/pricing_table_spec.rb
index 8e0b0429ee0..8a542104f05 100644
--- a/plugins/discourse-subscriptions/spec/system/pricing_table_spec.rb
+++ b/plugins/discourse-subscriptions/spec/system/pricing_table_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Pricing Table", type: :system do
+RSpec.describe "Pricing Table" do
fab!(:admin)
fab!(:product) { Fabricate(:product, external_id: "prod_OiK") }
let(:dialog) { PageObjects::Components::Dialog.new }
diff --git a/plugins/discourse-subscriptions/spec/system/subscription_product_spec.rb b/plugins/discourse-subscriptions/spec/system/subscription_product_spec.rb
index 4bac8813c74..4941b91b78f 100644
--- a/plugins/discourse-subscriptions/spec/system/subscription_product_spec.rb
+++ b/plugins/discourse-subscriptions/spec/system/subscription_product_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Subscription products", type: :system do
+describe "Subscription products" do
fab!(:admin)
fab!(:product) { Fabricate(:product, external_id: "prod_OiK") }
let(:dialog) { PageObjects::Components::Dialog.new }
diff --git a/plugins/discourse-subscriptions/spec/system/subscription_subscription_spec.rb b/plugins/discourse-subscriptions/spec/system/subscription_subscription_spec.rb
index 1350e1a4161..62be6ff7225 100644
--- a/plugins/discourse-subscriptions/spec/system/subscription_subscription_spec.rb
+++ b/plugins/discourse-subscriptions/spec/system/subscription_subscription_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Subscription products", type: :system do
+describe "Subscription products" do
fab!(:admin)
fab!(:user)
fab!(:product) { Fabricate(:product, external_id: "prod_OiK") }
diff --git a/plugins/discourse-templates/lib/tasks/discourse-templates.rake b/plugins/discourse-templates/lib/tasks/discourse-templates.rake
index 5c1f7c96adb..7b0be68e215 100644
--- a/plugins/discourse-templates/lib/tasks/discourse-templates.rake
+++ b/plugins/discourse-templates/lib/tasks/discourse-templates.rake
@@ -196,7 +196,7 @@ def purge_old_data
key: canned_replies_store_name,
)
- old_replies.destroy! if old_replies.present?
+ (old_replies.presence&.destroy!)
puts "Finished!"
rescue StandardError => e
diff --git a/plugins/discourse-templates/spec/system/chat_composer_spec.rb b/plugins/discourse-templates/spec/system/chat_composer_spec.rb
index 7521a1889f1..6476f78e4ec 100644
--- a/plugins/discourse-templates/spec/system/chat_composer_spec.rb
+++ b/plugins/discourse-templates/spec/system/chat_composer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Inserting templates in the chat composer", type: :system do
+RSpec.describe "Inserting templates in the chat composer" do
fab!(:current_user, :user)
fab!(:other_user, :user)
fab!(:templates_category, :category)
diff --git a/plugins/discourse-templates/spec/system/core_features_spec.rb b/plugins/discourse-templates/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-templates/spec/system/core_features_spec.rb
+++ b/plugins/discourse-templates/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-templates/spec/system/tag_filtering_spec.rb b/plugins/discourse-templates/spec/system/tag_filtering_spec.rb
index 91e8e02be0c..11945bf0df8 100644
--- a/plugins/discourse-templates/spec/system/tag_filtering_spec.rb
+++ b/plugins/discourse-templates/spec/system/tag_filtering_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Filtering templates by tags", type: :system do
+RSpec.describe "Filtering templates by tags" do
fab!(:current_user, :user)
fab!(:templates_category, :category)
fab!(:tag_1, :tag)
diff --git a/plugins/discourse-topic-voting/spec/system/core_features_spec.rb b/plugins/discourse-topic-voting/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-topic-voting/spec/system/core_features_spec.rb
+++ b/plugins/discourse-topic-voting/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-topic-voting/spec/system/voting_spec.rb b/plugins/discourse-topic-voting/spec/system/voting_spec.rb
index 80604f5b661..7525a43d2b6 100644
--- a/plugins/discourse-topic-voting/spec/system/voting_spec.rb
+++ b/plugins/discourse-topic-voting/spec/system/voting_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Topic voting", type: :system do
+RSpec.describe "Topic voting" do
fab!(:user)
fab!(:admin) { Fabricate(:admin, trust_level: TrustLevel[4]) }
fab!(:category1, :category)
diff --git a/plugins/discourse-user-notes/spec/system/core_features_spec.rb b/plugins/discourse-user-notes/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-user-notes/spec/system/core_features_spec.rb
+++ b/plugins/discourse-user-notes/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/discourse-user-notes/spec/system/reviewable_user_notes_spec.rb b/plugins/discourse-user-notes/spec/system/reviewable_user_notes_spec.rb
index 58aea860fc5..88de85858ba 100644
--- a/plugins/discourse-user-notes/spec/system/reviewable_user_notes_spec.rb
+++ b/plugins/discourse-user-notes/spec/system/reviewable_user_notes_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Reviewable User Notes", type: :system do
+RSpec.describe "Reviewable User Notes" do
fab!(:admin)
fab!(:user)
fab!(:reviewable_flagged_post)
diff --git a/plugins/discourse-user-notes/spec/system/user_notes_spec.rb b/plugins/discourse-user-notes/spec/system/user_notes_spec.rb
index 074ae612ea5..6554fd8bc8e 100644
--- a/plugins/discourse-user-notes/spec/system/user_notes_spec.rb
+++ b/plugins/discourse-user-notes/spec/system/user_notes_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User Notes", type: :system do
+RSpec.describe "User Notes" do
fab!(:admin)
fab!(:user)
diff --git a/plugins/discourse-zendesk-plugin/spec/system/core_features_spec.rb b/plugins/discourse-zendesk-plugin/spec/system/core_features_spec.rb
index db86db283bd..ea0fa3f5e4d 100644
--- a/plugins/discourse-zendesk-plugin/spec/system/core_features_spec.rb
+++ b/plugins/discourse-zendesk-plugin/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
before { enable_current_plugin }
it_behaves_like "having working core features"
diff --git a/plugins/footnote/spec/system/admin_sidebar_navigation_spec.rb b/plugins/footnote/spec/system/admin_sidebar_navigation_spec.rb
index 65e02bc8a90..241574d251f 100644
--- a/plugins/footnote/spec/system/admin_sidebar_navigation_spec.rb
+++ b/plugins/footnote/spec/system/admin_sidebar_navigation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin | Sidebar Navigation", type: :system do
+RSpec.describe "Admin | Sidebar Navigation" do
fab!(:admin)
let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
diff --git a/plugins/footnote/spec/system/rich_editor_extension_spec.rb b/plugins/footnote/spec/system/rich_editor_extension_spec.rb
index 2a4c011b217..12f144da997 100644
--- a/plugins/footnote/spec/system/rich_editor_extension_spec.rb
+++ b/plugins/footnote/spec/system/rich_editor_extension_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror editor - Footnote extension", type: :system do
+describe "Composer - ProseMirror editor - Footnote extension" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:cdp) { PageObjects::CDP.new }
let(:composer) { PageObjects::Components::Composer.new }
diff --git a/plugins/poll/spec/system/dynamic_polls_spec.rb b/plugins/poll/spec/system/dynamic_polls_spec.rb
index 30ee1c47db0..56e4b6785e3 100644
--- a/plugins/poll/spec/system/dynamic_polls_spec.rb
+++ b/plugins/poll/spec/system/dynamic_polls_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Dynamic polls", type: :system do
+describe "Dynamic polls" do
fab!(:admin)
fab!(:topic)
diff --git a/plugins/spoiler-alert/spec/system/composer_spoiler_spec.rb b/plugins/spoiler-alert/spec/system/composer_spoiler_spec.rb
index f6903522732..6e950e96367 100644
--- a/plugins/spoiler-alert/spec/system/composer_spoiler_spec.rb
+++ b/plugins/spoiler-alert/spec/system/composer_spoiler_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror editor - Spoiler extension", type: :system do
+describe "Composer - ProseMirror editor - Spoiler extension" do
fab!(:current_user) do
Fabricate(
:user,
diff --git a/plugins/styleguide/spec/system/smoke_test_spec.rb b/plugins/styleguide/spec/system/smoke_test_spec.rb
index 990e185ff73..24dcfa0335e 100644
--- a/plugins/styleguide/spec/system/smoke_test_spec.rb
+++ b/plugins/styleguide/spec/system/smoke_test_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Styleguide Smoke Test", type: :system do
+RSpec.describe "Styleguide Smoke Test" do
fab!(:admin)
# keep this hash updated when adding, removing or renaming components
diff --git a/script/bulk_import/uploads_importer.rb b/script/bulk_import/uploads_importer.rb
index 5d9f47afe5e..de1d8f355cc 100644
--- a/script/bulk_import/uploads_importer.rb
+++ b/script/bulk_import/uploads_importer.rb
@@ -767,9 +767,7 @@ module BulkImport
SiteSetting.max_image_size_kb = settings[:max_image_size_kb]
if settings[:multisite]
- # rubocop:disable Discourse/NoDirectMultisiteManipulation
Rails.configuration.multisite = true
- # rubocop:enable Discourse/NoDirectMultisiteManipulation
RailsMultisite::ConnectionManagement.class_eval do
def self.current_db_override=(value)
diff --git a/script/import_scripts/answerhub.rb b/script/import_scripts/answerhub.rb
index 183b5dce01b..a95d0c474d1 100644
--- a/script/import_scripts/answerhub.rb
+++ b/script/import_scripts/answerhub.rb
@@ -215,7 +215,7 @@ class ImportScripts::AnswerHub < ImportScripts::Base
reply_to_post_id = post_id_from_imported_post_id(p["c_parent"])
reply_to_post = reply_to_post_id.present? ? Post.find(reply_to_post_id) : nil
- reply_to_post_number = reply_to_post.present? ? reply_to_post.post_number : nil
+ reply_to_post_number = reply_to_post.presence&.post_number
user_id = user_id_from_imported_user_id(p["c_author"]) || Discourse::SYSTEM_USER_ID
diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb
index f16b275e5b9..2ece7668a63 100644
--- a/script/import_scripts/lithium.rb
+++ b/script/import_scripts/lithium.rb
@@ -1090,7 +1090,7 @@ SQL
files.each do |file|
upload, filename = find_upload(user_id, file["attachment_id"], file["file_name"])
if upload.present?
- html << "\n" if html.present?
+ html.presence&.<<("\n")
html << html_for_upload(upload, filename)
end
end
diff --git a/spec/system/about_page_spec.rb b/spec/system/about_page_spec.rb
index e72f5af05b8..c5c4f512fb5 100644
--- a/spec/system/about_page_spec.rb
+++ b/spec/system/about_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "About page", type: :system do
+describe "About page" do
fab!(:image_upload)
fab!(:admin) { Fabricate(:admin, last_seen_at: 1.hour.ago) }
fab!(:moderator) { Fabricate(:moderator, last_seen_at: 1.hour.ago) }
diff --git a/spec/system/admin_about_config_area_spec.rb b/spec/system/admin_about_config_area_spec.rb
index 6ac1fe06af9..d67cab53c90 100644
--- a/spec/system/admin_about_config_area_spec.rb
+++ b/spec/system/admin_about_config_area_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin About Config Area Page", type: :system do
+describe "Admin About Config Area Page" do
fab!(:admin)
fab!(:image_upload)
diff --git a/spec/system/admin_api_keys_spec.rb b/spec/system/admin_api_keys_spec.rb
index 59c07e2f214..ef77d33860a 100644
--- a/spec/system/admin_api_keys_spec.rb
+++ b/spec/system/admin_api_keys_spec.rb
@@ -1,6 +1,6 @@
#frozen_string_literal: true
-describe "Admin API Keys Page", type: :system do
+describe "Admin API Keys Page" do
fab!(:current_user, :admin)
let(:api_keys_page) { PageObjects::Pages::AdminApiKeys.new }
diff --git a/spec/system/admin_backups_spec.rb b/spec/system/admin_backups_spec.rb
index 4a56b366e4a..27d49419ba1 100644
--- a/spec/system/admin_backups_spec.rb
+++ b/spec/system/admin_backups_spec.rb
@@ -1,6 +1,6 @@
#frozen_string_literal: true
-describe "Admin Backups Page", type: :system do
+describe "Admin Backups Page" do
fab!(:current_user, :admin)
let(:backups_page) { PageObjects::Pages::AdminBackups.new }
let(:dialog) { PageObjects::Components::Dialog.new }
diff --git a/spec/system/admin_badges_grouping_modal_spec.rb b/spec/system/admin_badges_grouping_modal_spec.rb
index 4d93127a026..8d99e8e171a 100644
--- a/spec/system/admin_badges_grouping_modal_spec.rb
+++ b/spec/system/admin_badges_grouping_modal_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Badges Grouping Modal", type: :system do
+describe "Admin Badges Grouping Modal" do
before { SiteSetting.enable_badges = true }
fab!(:current_user, :admin)
diff --git a/spec/system/admin_badges_spec.rb b/spec/system/admin_badges_spec.rb
index b15eddc4c23..fded8f331f6 100644
--- a/spec/system/admin_badges_spec.rb
+++ b/spec/system/admin_badges_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Badges Page", type: :system do
+describe "Admin Badges Page" do
before { SiteSetting.enable_badges = true }
fab!(:current_user, :admin)
diff --git a/spec/system/admin_color_palette_config_area_spec.rb b/spec/system/admin_color_palette_config_area_spec.rb
index a9d27af2658..2930f6fb707 100644
--- a/spec/system/admin_color_palette_config_area_spec.rb
+++ b/spec/system/admin_color_palette_config_area_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Color Palette Config Area Page", type: :system do
+describe "Admin Color Palette Config Area Page" do
fab!(:admin)
fab!(:color_scheme) { Fabricate(:color_scheme, user_selectable: false, name: "A Test Palette") }
fab!(:color_scheme_2, :color_scheme)
diff --git a/spec/system/admin_color_palettes_config_area_spec.rb b/spec/system/admin_color_palettes_config_area_spec.rb
index 8bf75b5fc42..bc723b10086 100644
--- a/spec/system/admin_color_palettes_config_area_spec.rb
+++ b/spec/system/admin_color_palettes_config_area_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Color Palettes Config Area Page", type: :system do
+describe "Admin Color Palettes Config Area Page" do
fab!(:admin) { Fabricate(:admin, locale: "en") }
fab!(:palette) { Fabricate(:color_scheme, user_selectable: false, name: "A Test Palette") }
fab!(:theme) { Fabricate(:theme, name: "Test Theme") }
diff --git a/spec/system/admin_config_login_and_authentication_spec.rb b/spec/system/admin_config_login_and_authentication_spec.rb
index 79f432fcde1..c55da99185e 100644
--- a/spec/system/admin_config_login_and_authentication_spec.rb
+++ b/spec/system/admin_config_login_and_authentication_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Config Login and Authentication", type: :system do
+describe "Admin Config Login and Authentication" do
fab!(:current_user, :admin)
let(:admin_login_page) { PageObjects::Pages::AdminLoginAndAuthentication.new }
diff --git a/spec/system/admin_config_theme_site_settings_spec.rb b/spec/system/admin_config_theme_site_settings_spec.rb
index afd83d8201c..706b08fa313 100644
--- a/spec/system/admin_config_theme_site_settings_spec.rb
+++ b/spec/system/admin_config_theme_site_settings_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Theme Site Settings", type: :system do
+describe "Admin Theme Site Settings" do
fab!(:current_user, :admin)
fab!(:theme_1) { Fabricate(:theme, name: "Blue Steel") }
fab!(:theme_2) { Fabricate(:theme, name: "Derelicte") }
diff --git a/spec/system/admin_customize_components_config_area_spec.rb b/spec/system/admin_customize_components_config_area_spec.rb
index c059d660d0a..f8249809501 100644
--- a/spec/system/admin_customize_components_config_area_spec.rb
+++ b/spec/system/admin_customize_components_config_area_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Customize Themes Config Area Page", type: :system do
+describe "Admin Customize Themes Config Area Page" do
fab!(:admin)
fab!(:parent_theme) { Fabricate(:theme, name: "A theme") }
fab!(:parent_theme_2) { Fabricate(:theme, name: "B theme") }
diff --git a/spec/system/admin_customize_emojis_spec.rb b/spec/system/admin_customize_emojis_spec.rb
index 83a1ef5efc0..b8fc070f5ed 100644
--- a/spec/system/admin_customize_emojis_spec.rb
+++ b/spec/system/admin_customize_emojis_spec.rb
@@ -1,6 +1,6 @@
#frozen_string_literal: true
-describe "Admin Customize Emoji Page", type: :system do
+describe "Admin Customize Emoji Page" do
fab!(:current_user, :admin)
let(:emojis_page) { PageObjects::Pages::AdminEmojis.new }
diff --git a/spec/system/admin_customize_form_templates_spec.rb b/spec/system/admin_customize_form_templates_spec.rb
index 10968a045d2..5fb30abdd52 100644
--- a/spec/system/admin_customize_form_templates_spec.rb
+++ b/spec/system/admin_customize_form_templates_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Customize Form Templates", type: :system do
+describe "Admin Customize Form Templates" do
let(:form_template_page) { PageObjects::Pages::FormTemplate.new }
let(:ace_editor) { PageObjects::Components::AceEditor.new }
diff --git a/spec/system/admin_customize_themes_config_area_spec.rb b/spec/system/admin_customize_themes_config_area_spec.rb
index 733c3203b6f..147bad95a44 100644
--- a/spec/system/admin_customize_themes_config_area_spec.rb
+++ b/spec/system/admin_customize_themes_config_area_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Customize Themes Config Area Page", type: :system do
+describe "Admin Customize Themes Config Area Page" do
fab!(:admin)
fab!(:theme) { Fabricate(:theme, name: "First theme") }
fab!(:foundation_theme) { Theme.foundation_theme }
diff --git a/spec/system/admin_customize_themes_spec.rb b/spec/system/admin_customize_themes_spec.rb
index fa31123d3b2..14217794468 100644
--- a/spec/system/admin_customize_themes_spec.rb
+++ b/spec/system/admin_customize_themes_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Customize Themes", type: :system do
+describe "Admin Customize Themes" do
fab!(:color_scheme) do
Fabricate(:color_scheme, base_scheme_id: ColorScheme::NAMES_TO_ID_MAP["Light"])
end
diff --git a/spec/system/admin_dashboard_community_health_spec.rb b/spec/system/admin_dashboard_community_health_spec.rb
index d710cfe7671..8b1fc131eb9 100644
--- a/spec/system/admin_dashboard_community_health_spec.rb
+++ b/spec/system/admin_dashboard_community_health_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Dashboard Community Health", type: :system do
+describe "Admin Dashboard Community Health" do
fab!(:current_user, :admin)
before { sign_in(current_user) }
diff --git a/spec/system/admin_dashboard_general_spec.rb b/spec/system/admin_dashboard_general_spec.rb
index eca34b7bf75..432169bef02 100644
--- a/spec/system/admin_dashboard_general_spec.rb
+++ b/spec/system/admin_dashboard_general_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Dashboard General Tab", type: :system do
+describe "Admin Dashboard General Tab" do
fab!(:admin)
fab!(:user)
fab!(:user_visit) { Fabricate(:user_visit, user: admin) }
diff --git a/spec/system/admin_editing_objects_typed_theme_setting_spec.rb b/spec/system/admin_editing_objects_typed_theme_setting_spec.rb
index eb05fbfa070..9ad49337e85 100644
--- a/spec/system/admin_editing_objects_typed_theme_setting_spec.rb
+++ b/spec/system/admin_editing_objects_typed_theme_setting_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin editing objects type", type: :system do
+RSpec.describe "Admin editing objects type" do
let(:admin_objects_setting_editor_page) { PageObjects::Pages::AdminObjectsSettingEditor.new }
fab!(:admin)
diff --git a/spec/system/admin_email_login_readonly_spec.rb b/spec/system/admin_email_login_readonly_spec.rb
index a5203a26cff..9b65d2a71a2 100644
--- a/spec/system/admin_email_login_readonly_spec.rb
+++ b/spec/system/admin_email_login_readonly_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin email login in readonly mode", type: :system do
+describe "Admin email login in readonly mode" do
fab!(:admin)
context "when site is in readonly mode" do
diff --git a/spec/system/admin_email_templates_index_spec.rb b/spec/system/admin_email_templates_index_spec.rb
index c10763f0ccc..21369d261f7 100644
--- a/spec/system/admin_email_templates_index_spec.rb
+++ b/spec/system/admin_email_templates_index_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Email Templates Page", type: :system do
+describe "Admin Email Templates Page" do
fab!(:admin)
let(:email_templates_page) { PageObjects::Pages::AdminEmailTemplatesIndex.new }
diff --git a/spec/system/admin_email_templates_spec.rb b/spec/system/admin_email_templates_spec.rb
index c66104a498b..4d57c021414 100644
--- a/spec/system/admin_email_templates_spec.rb
+++ b/spec/system/admin_email_templates_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Email Templates", type: :system do
+describe "Admin Email Templates" do
fab!(:admin)
let(:email_templates_page) { PageObjects::Pages::AdminEmailTemplates.new }
diff --git a/spec/system/admin_embeddable_hosts_spec.rb b/spec/system/admin_embeddable_hosts_spec.rb
index 03d3ae9d69c..0dc6ff4d46e 100644
--- a/spec/system/admin_embeddable_hosts_spec.rb
+++ b/spec/system/admin_embeddable_hosts_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin EmbeddableHost Management", type: :system do
+RSpec.describe "Admin EmbeddableHost Management" do
fab!(:admin)
fab!(:author, :admin)
fab!(:author_2, :admin)
diff --git a/spec/system/admin_filter_controls_spec.rb b/spec/system/admin_filter_controls_spec.rb
index 9168affe71f..ed7cd0521bb 100644
--- a/spec/system/admin_filter_controls_spec.rb
+++ b/spec/system/admin_filter_controls_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "AdminFilterControls", type: :system do
+describe "AdminFilterControls" do
fab!(:admin)
let(:filter_controls) do
diff --git a/spec/system/admin_flags_spec.rb b/spec/system/admin_flags_spec.rb
index 8122c12883e..eca8ec943e0 100644
--- a/spec/system/admin_flags_spec.rb
+++ b/spec/system/admin_flags_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Flags Page", type: :system do
+describe "Admin Flags Page" do
fab!(:admin)
fab!(:post)
diff --git a/spec/system/admin_fonts_spec.rb b/spec/system/admin_fonts_spec.rb
index f48298116e8..95421d7fb37 100644
--- a/spec/system/admin_fonts_spec.rb
+++ b/spec/system/admin_fonts_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Fonts Page", type: :system do
+describe "Admin Fonts Page" do
fab!(:admin)
fab!(:image_upload)
diff --git a/spec/system/admin_groups_list_spec.rb b/spec/system/admin_groups_list_spec.rb
index f75cc0f669c..1cd5ad4c6f3 100644
--- a/spec/system/admin_groups_list_spec.rb
+++ b/spec/system/admin_groups_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Users Page", type: :system do
+describe "Admin Users Page" do
fab!(:current_user, :admin)
fab!(:group_1) { Fabricate(:group, name: "group_a") }
fab!(:group_2) { Fabricate(:group, name: "group_b") }
diff --git a/spec/system/admin_logo_spec.rb b/spec/system/admin_logo_spec.rb
index 8270665bfe8..20a72613073 100644
--- a/spec/system/admin_logo_spec.rb
+++ b/spec/system/admin_logo_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Logo Page", type: :system do
+describe "Admin Logo Page" do
fab!(:admin)
fab!(:image_upload)
diff --git a/spec/system/admin_notices_spec.rb b/spec/system/admin_notices_spec.rb
index d4d3cc531e0..31904e05c38 100644
--- a/spec/system/admin_notices_spec.rb
+++ b/spec/system/admin_notices_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Notices", type: :system do
+describe "Admin Notices" do
let(:admin_dashboard) { PageObjects::Pages::AdminDashboard.new }
before do
diff --git a/spec/system/admin_onboarding_banner_spec.rb b/spec/system/admin_onboarding_banner_spec.rb
index 2754d0d7f1e..dafdeb81b0c 100644
--- a/spec/system/admin_onboarding_banner_spec.rb
+++ b/spec/system/admin_onboarding_banner_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Onboarding Banner", type: :system do
+describe "Admin Onboarding Banner" do
fab!(:admin)
let(:banner) { PageObjects::Components::AdminOnboardingBanner.new }
diff --git a/spec/system/admin_permalinks_page_spec.rb b/spec/system/admin_permalinks_page_spec.rb
index e5224760104..c36a000a4bd 100644
--- a/spec/system/admin_permalinks_page_spec.rb
+++ b/spec/system/admin_permalinks_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Permalinks Page", type: :system do
+describe "Admin Permalinks Page" do
fab!(:admin)
fab!(:post)
diff --git a/spec/system/admin_reports_spec.rb b/spec/system/admin_reports_spec.rb
index cab5ca75131..dc65725f408 100644
--- a/spec/system/admin_reports_spec.rb
+++ b/spec/system/admin_reports_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Reports", type: :system do
+describe "Admin Reports" do
fab!(:current_user, :admin)
before { sign_in(current_user) }
diff --git a/spec/system/admin_search_spec.rb b/spec/system/admin_search_spec.rb
index 8edea16f0b4..6053877d084 100644
--- a/spec/system/admin_search_spec.rb
+++ b/spec/system/admin_search_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Search", type: :system do
+describe "Admin Search" do
fab!(:current_user, :admin)
let(:search_modal) { PageObjects::Modals::AdminSearch.new }
let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
diff --git a/spec/system/admin_sidebar_navigation_spec.rb b/spec/system/admin_sidebar_navigation_spec.rb
index 6e2560c2c20..3f80d9d5e96 100644
--- a/spec/system/admin_sidebar_navigation_spec.rb
+++ b/spec/system/admin_sidebar_navigation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin | Sidebar Navigation", type: :system do
+describe "Admin | Sidebar Navigation" do
UNFILTERED_LINK_COUNT = 42
fab!(:admin)
diff --git a/spec/system/admin_site_setting_bulk_action_spec.rb b/spec/system/admin_site_setting_bulk_action_spec.rb
index 667e777c240..9eea573bb42 100644
--- a/spec/system/admin_site_setting_bulk_action_spec.rb
+++ b/spec/system/admin_site_setting_bulk_action_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Site Setting Bulk Action", type: :system do
+describe "Admin Site Setting Bulk Action" do
let(:settings_page) { PageObjects::Pages::AdminSiteSettings.new }
let(:banner) { PageObjects::Components::AdminChangesBanner.new }
let(:dialog) { PageObjects::Components::Dialog.new }
diff --git a/spec/system/admin_site_setting_category_bulk_action_spec.rb b/spec/system/admin_site_setting_category_bulk_action_spec.rb
index 0c45f07437c..717050dd403 100644
--- a/spec/system/admin_site_setting_category_bulk_action_spec.rb
+++ b/spec/system/admin_site_setting_category_bulk_action_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Site Setting Category Bulk Action", type: :system do
+describe "Admin Site Setting Category Bulk Action" do
let(:settings_page) { PageObjects::Pages::AdminSiteSettings.new }
let(:banner) { PageObjects::Components::AdminChangesBanner.new }
let(:dialog) { PageObjects::Components::Dialog.new }
diff --git a/spec/system/admin_site_setting_label_formatting_spec.rb b/spec/system/admin_site_setting_label_formatting_spec.rb
index 7fbc0631c79..1c201cee060 100644
--- a/spec/system/admin_site_setting_label_formatting_spec.rb
+++ b/spec/system/admin_site_setting_label_formatting_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Site Setting Formatting", type: :system do
+describe "Admin Site Setting Formatting" do
let(:settings_page) { PageObjects::Pages::AdminSiteSettings.new }
fab!(:admin)
diff --git a/spec/system/admin_site_setting_locale_spec.rb b/spec/system/admin_site_setting_locale_spec.rb
index 041a4688bda..6f4b767b903 100644
--- a/spec/system/admin_site_setting_locale_spec.rb
+++ b/spec/system/admin_site_setting_locale_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Site Setting Locales", type: :system do
+describe "Admin Site Setting Locales" do
let(:settings_page) { PageObjects::Pages::AdminSiteSettings.new }
fab!(:admin)
diff --git a/spec/system/admin_site_setting_requires_confirmation_spec.rb b/spec/system/admin_site_setting_requires_confirmation_spec.rb
index ca6d081f79d..5c1a499f82b 100644
--- a/spec/system/admin_site_setting_requires_confirmation_spec.rb
+++ b/spec/system/admin_site_setting_requires_confirmation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Site Setting Requires Confirmation", type: :system do
+describe "Admin Site Setting Requires Confirmation" do
let(:settings_page) { PageObjects::Pages::AdminSiteSettings.new }
let(:dialog) { PageObjects::Components::Dialog.new }
fab!(:admin)
diff --git a/spec/system/admin_site_setting_search_spec.rb b/spec/system/admin_site_setting_search_spec.rb
index daa51871f05..fda0ba7a1b0 100644
--- a/spec/system/admin_site_setting_search_spec.rb
+++ b/spec/system/admin_site_setting_search_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Site Setting Search", type: :system do
+describe "Admin Site Setting Search" do
let(:settings_page) { PageObjects::Pages::AdminSiteSettings.new }
fab!(:admin)
diff --git a/spec/system/admin_site_setting_tag_list_spec.rb b/spec/system/admin_site_setting_tag_list_spec.rb
index 7be6f878d5d..7f8b45d146c 100644
--- a/spec/system/admin_site_setting_tag_list_spec.rb
+++ b/spec/system/admin_site_setting_tag_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Admin tag list site setting", type: :system do
+RSpec.describe "Admin tag list site setting" do
fab!(:admin)
fab!(:tag_1, :tag)
fab!(:tag_2, :tag)
diff --git a/spec/system/admin_site_setting_topic_chooser_spec.rb b/spec/system/admin_site_setting_topic_chooser_spec.rb
index e5d1cb61dc3..fbc17a2be6b 100644
--- a/spec/system/admin_site_setting_topic_chooser_spec.rb
+++ b/spec/system/admin_site_setting_topic_chooser_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Site Setting Topic Selector Component", type: :system do
+describe "Admin Site Setting Topic Selector Component" do
let(:settings_page) { PageObjects::Pages::AdminSiteSettings.new }
let(:banner) { PageObjects::Components::AdminChangesBanner.new }
fab!(:admin)
diff --git a/spec/system/admin_site_texts_spec.rb b/spec/system/admin_site_texts_spec.rb
index 514a9595f73..c2256168d6f 100644
--- a/spec/system/admin_site_texts_spec.rb
+++ b/spec/system/admin_site_texts_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Site Texts Page", type: :system do
+describe "Admin Site Texts Page" do
fab!(:admin)
let(:site_texts_page) { PageObjects::Pages::AdminSiteTexts.new }
diff --git a/spec/system/admin_staff_action_logs_spec.rb b/spec/system/admin_staff_action_logs_spec.rb
index 43fbc67ee03..ca9d7003677 100644
--- a/spec/system/admin_staff_action_logs_spec.rb
+++ b/spec/system/admin_staff_action_logs_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin staff action logs", type: :system do
+describe "Admin staff action logs" do
fab!(:current_user, :admin)
fab!(:history_1) do
Fabricate(
diff --git a/spec/system/admin_upcoming_changes_spec.rb b/spec/system/admin_upcoming_changes_spec.rb
index 439d8028f6f..9faf9a96f8a 100644
--- a/spec/system/admin_upcoming_changes_spec.rb
+++ b/spec/system/admin_upcoming_changes_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin upcoming changes", type: :system do
+describe "Admin upcoming changes" do
fab!(:current_user, :admin)
let(:upcoming_changes_page) { PageObjects::Pages::AdminUpcomingChanges.new }
diff --git a/spec/system/admin_user_badges_spec.rb b/spec/system/admin_user_badges_spec.rb
index 37da4a8886f..74d2929d5f9 100644
--- a/spec/system/admin_user_badges_spec.rb
+++ b/spec/system/admin_user_badges_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin User Badges Page", type: :system do
+describe "Admin User Badges Page" do
before { SiteSetting.enable_badges = true }
fab!(:granter, :admin)
diff --git a/spec/system/admin_user_fields_spec.rb b/spec/system/admin_user_fields_spec.rb
index 6e1ec183981..bb5e2c85ff7 100644
--- a/spec/system/admin_user_fields_spec.rb
+++ b/spec/system/admin_user_fields_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin User Fields", type: :system do
+describe "Admin User Fields" do
fab!(:current_user, :admin)
before { sign_in(current_user) }
diff --git a/spec/system/admin_user_spec.rb b/spec/system/admin_user_spec.rb
index 8b791dc7cd2..a93c74744ba 100644
--- a/spec/system/admin_user_spec.rb
+++ b/spec/system/admin_user_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin User Page", type: :system do
+describe "Admin User Page" do
fab!(:current_user, :admin)
let(:admin_users_page) { PageObjects::Pages::AdminUsers.new }
diff --git a/spec/system/admin_users_list_spec.rb b/spec/system/admin_users_list_spec.rb
index 6301075f6c6..1db814ee462 100644
--- a/spec/system/admin_users_list_spec.rb
+++ b/spec/system/admin_users_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Users Page", type: :system do
+describe "Admin Users Page" do
fab!(:current_user, :admin)
fab!(:another_admin, :admin)
fab!(:user_1, :user)
diff --git a/spec/system/admin_watched_words_spec.rb b/spec/system/admin_watched_words_spec.rb
index dcdf27c2252..5ff18154e01 100644
--- a/spec/system/admin_watched_words_spec.rb
+++ b/spec/system/admin_watched_words_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Watched Words", type: :system do
+describe "Admin Watched Words" do
fab!(:current_user, :admin)
before { sign_in(current_user) }
diff --git a/spec/system/admin_web_hook_events_spec.rb b/spec/system/admin_web_hook_events_spec.rb
index 3c6c2897f14..7c5a806a051 100644
--- a/spec/system/admin_web_hook_events_spec.rb
+++ b/spec/system/admin_web_hook_events_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin WebHook Events", type: :system do
+describe "Admin WebHook Events" do
fab!(:web_hook)
fab!(:admin)
fab!(:web_hook_event1) { Fabricate(:web_hook_event, web_hook: web_hook, status: 200) }
diff --git a/spec/system/admin_webhooks_spec.rb b/spec/system/admin_webhooks_spec.rb
index 622691f8473..515d9e3ec49 100644
--- a/spec/system/admin_webhooks_spec.rb
+++ b/spec/system/admin_webhooks_spec.rb
@@ -1,6 +1,6 @@
#frozen_string_literal: true
-describe "Admin Webhooks Page", type: :system do
+describe "Admin Webhooks Page" do
fab!(:admin)
fab!(:tag)
diff --git a/spec/system/admin_welcome_banner_config_spec.rb b/spec/system/admin_welcome_banner_config_spec.rb
index 93374a4c479..d799144fb5f 100644
--- a/spec/system/admin_welcome_banner_config_spec.rb
+++ b/spec/system/admin_welcome_banner_config_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin Welcome Banner Config", type: :system do
+describe "Admin Welcome Banner Config" do
fab!(:admin)
let(:config_page) { PageObjects::Pages::AdminWelcomeBannerConfig.new }
diff --git a/spec/system/admin_whats_new_spec.rb b/spec/system/admin_whats_new_spec.rb
index df8d66f6984..a49c97c69fb 100644
--- a/spec/system/admin_whats_new_spec.rb
+++ b/spec/system/admin_whats_new_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Admin What's New Page", type: :system do
+describe "Admin What's New Page" do
let(:whats_new_page) { PageObjects::Pages::AdminWhatsNew.new }
let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
fab!(:admin)
diff --git a/spec/system/blocks_spec.rb b/spec/system/blocks_spec.rb
index 0222aa69ecb..1b583e51092 100644
--- a/spec/system/blocks_spec.rb
+++ b/spec/system/blocks_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Block conditions", type: :system do
+describe "Block conditions" do
fab!(:theme) do
theme_dir = "#{Rails.root}/spec/fixtures/themes/dev-tools-test-theme"
theme = RemoteTheme.import_theme_from_directory(theme_dir)
diff --git a/spec/system/bookmarks_spec.rb b/spec/system/bookmarks_spec.rb
index 0ea591a5c31..f1116b9bbba 100644
--- a/spec/system/bookmarks_spec.rb
+++ b/spec/system/bookmarks_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Bookmarking posts and topics", type: :system do
+describe "Bookmarking posts and topics" do
fab!(:topic)
fab!(:topic_2, :topic)
fab!(:current_user) { Fabricate(:user, refresh_auto_groups: true) }
diff --git a/spec/system/bootstrap_error_pages_spec.rb b/spec/system/bootstrap_error_pages_spec.rb
index 766c62c0d4c..f48269794fc 100644
--- a/spec/system/bootstrap_error_pages_spec.rb
+++ b/spec/system/bootstrap_error_pages_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "bootstrap_error_pages", type: :system do
+describe "bootstrap_error_pages" do
before { SiteSetting.bootstrap_error_pages = true }
it "boots ember for non-existent route" do
diff --git a/spec/system/capabilities_service_spec.rb b/spec/system/capabilities_service_spec.rb
index 1e9b89cb23e..d00718dc44c 100644
--- a/spec/system/capabilities_service_spec.rb
+++ b/spec/system/capabilities_service_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "capabilities service", type: :system do
+describe "capabilities service" do
describe "viewport helpers" do
it "works" do
def matches(name)
diff --git a/spec/system/category_localizations_spec.rb b/spec/system/category_localizations_spec.rb
index 09801c461b0..053d0ba1908 100644
--- a/spec/system/category_localizations_spec.rb
+++ b/spec/system/category_localizations_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Category Localizations", type: :system do
+describe "Category Localizations" do
SWITCHER_SELECTOR = "button[data-identifier='language-switcher']"
fab!(:admin)
diff --git a/spec/system/category_topics_spec.rb b/spec/system/category_topics_spec.rb
index 82e5935dfde..c4354b679e0 100644
--- a/spec/system/category_topics_spec.rb
+++ b/spec/system/category_topics_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Viewing categories page", type: :system do
+describe "Viewing categories page" do
fab!(:user)
fab!(:category)
fab!(:topic) { Fabricate(:topic, category: category) }
diff --git a/spec/system/change_owner_spec.rb b/spec/system/change_owner_spec.rb
index f036911697d..b8185e2ba7b 100644
--- a/spec/system/change_owner_spec.rb
+++ b/spec/system/change_owner_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Change Owner Modal", type: :system do
+describe "Change Owner Modal" do
fab!(:post) { Fabricate(:post, raw: "This is some post to change owner for") }
fab!(:other_user, :user)
fab!(:admin)
diff --git a/spec/system/composer/category_templates_spec.rb b/spec/system/composer/category_templates_spec.rb
index e4768b09992..be23196e866 100644
--- a/spec/system/composer/category_templates_spec.rb
+++ b/spec/system/composer/category_templates_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer Form Templates", type: :system do
+describe "Composer Form Templates" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:form_template_1) do
Fabricate(
diff --git a/spec/system/composer/default_to_subcategory_spec.rb b/spec/system/composer/default_to_subcategory_spec.rb
index bb6eee9819f..b8c88fd9e80 100644
--- a/spec/system/composer/default_to_subcategory_spec.rb
+++ b/spec/system/composer/default_to_subcategory_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Default to Subcategory when parent Category doesn't allow posting", type: :system do
+describe "Default to Subcategory when parent Category doesn't allow posting" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:group)
fab!(:group_user) { Fabricate(:group_user, user: user, group: group) }
diff --git a/spec/system/composer/dont_feed_the_trolls_popup_spec.rb b/spec/system/composer/dont_feed_the_trolls_popup_spec.rb
index bf551eaa7e1..77f7c7a3613 100644
--- a/spec/system/composer/dont_feed_the_trolls_popup_spec.rb
+++ b/spec/system/composer/dont_feed_the_trolls_popup_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer don't feed the trolls popup", type: :system do
+describe "Composer don't feed the trolls popup" do
fab!(:user)
fab!(:troll, :user)
fab!(:topic) { Fabricate(:topic, user: user) }
diff --git a/spec/system/composer/drafts_spec.rb b/spec/system/composer/drafts_spec.rb
index fc963150483..a5a36599edc 100644
--- a/spec/system/composer/drafts_spec.rb
+++ b/spec/system/composer/drafts_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - Drafts", type: :system do
+describe "Composer - Drafts" do
fab!(:topic, :topic_with_op)
fab!(:current_user, :admin)
diff --git a/spec/system/composer/form_template_tag_chooser_spec.rb b/spec/system/composer/form_template_tag_chooser_spec.rb
index 31cb29183c0..7c40a48951f 100644
--- a/spec/system/composer/form_template_tag_chooser_spec.rb
+++ b/spec/system/composer/form_template_tag_chooser_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer Form Template", type: :system do
+describe "Composer Form Template" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:tag1) { Fabricate(:tag, name: "persian") }
fab!(:tag2) { Fabricate(:tag, name: "siamese") }
diff --git a/spec/system/composer/post_validation_spec.rb b/spec/system/composer/post_validation_spec.rb
index dc2ed4dd579..c9079ce3502 100644
--- a/spec/system/composer/post_validation_spec.rb
+++ b/spec/system/composer/post_validation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer Post Validations", type: :system do
+describe "Composer Post Validations" do
fab!(:tl0_user) { Fabricate(:user, trust_level: TrustLevel[0]) }
fab!(:tl1_user) { Fabricate(:user, trust_level: TrustLevel[1]) }
fab!(:tl2_user) { Fabricate(:user, trust_level: TrustLevel[2]) }
diff --git a/spec/system/composer/prosemirror_autocomplete_spec.rb b/spec/system/composer/prosemirror_autocomplete_spec.rb
index 04283b8e951..e43b598d065 100644
--- a/spec/system/composer/prosemirror_autocomplete_spec.rb
+++ b/spec/system/composer/prosemirror_autocomplete_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Autocomplete", type: :system do
+describe "Composer - ProseMirror - Autocomplete" do
include_context "with prosemirror editor"
it "triggers an autocomplete on mention" do
diff --git a/spec/system/composer/prosemirror_code_spec.rb b/spec/system/composer/prosemirror_code_spec.rb
index d011b8cf87d..51c9d48cbe5 100644
--- a/spec/system/composer/prosemirror_code_spec.rb
+++ b/spec/system/composer/prosemirror_code_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Code formatting", type: :system do
+describe "Composer - ProseMirror - Code formatting" do
include_context "with prosemirror editor"
describe "code formatting" do
diff --git a/spec/system/composer/prosemirror_container_spec.rb b/spec/system/composer/prosemirror_container_spec.rb
index 8a5bcc91a9a..1a99d78fe6a 100644
--- a/spec/system/composer/prosemirror_container_spec.rb
+++ b/spec/system/composer/prosemirror_container_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Container", type: :system do
+describe "Composer - ProseMirror - Container" do
include_context "with prosemirror editor"
it "hides the Composer container's preview button" do
diff --git a/spec/system/composer/prosemirror_images_spec.rb b/spec/system/composer/prosemirror_images_spec.rb
index 309c22cbb6a..398247a7c9e 100644
--- a/spec/system/composer/prosemirror_images_spec.rb
+++ b/spec/system/composer/prosemirror_images_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Images", type: :system do
+describe "Composer - ProseMirror - Images" do
include_context "with prosemirror editor"
describe "image toolbar" do
diff --git a/spec/system/composer/prosemirror_input_rules_spec.rb b/spec/system/composer/prosemirror_input_rules_spec.rb
index 4589ad6d14b..18985b706da 100644
--- a/spec/system/composer/prosemirror_input_rules_spec.rb
+++ b/spec/system/composer/prosemirror_input_rules_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Input rules", type: :system do
+describe "Composer - ProseMirror - Input rules" do
include_context "with prosemirror editor"
it "supports > to create a blockquote" do
diff --git a/spec/system/composer/prosemirror_keymap_spec.rb b/spec/system/composer/prosemirror_keymap_spec.rb
index aef2dee448a..346ccf1a9d2 100644
--- a/spec/system/composer/prosemirror_keymap_spec.rb
+++ b/spec/system/composer/prosemirror_keymap_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Keyboard shortcuts", type: :system do
+describe "Composer - ProseMirror - Keyboard shortcuts" do
include_context "with prosemirror editor"
it "supports Ctrl + B to create a bold text" do
diff --git a/spec/system/composer/prosemirror_links_spec.rb b/spec/system/composer/prosemirror_links_spec.rb
index 1f46c5fdcb1..8e9c2ac5cd7 100644
--- a/spec/system/composer/prosemirror_links_spec.rb
+++ b/spec/system/composer/prosemirror_links_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Links", type: :system do
+describe "Composer - ProseMirror - Links" do
include_context "with prosemirror editor"
let(:upsert_hyperlink_modal) { PageObjects::Modals::UpsertHyperlink.new }
diff --git a/spec/system/composer/prosemirror_onebox_spec.rb b/spec/system/composer/prosemirror_onebox_spec.rb
index 2d250b0f187..c364c78c83a 100644
--- a/spec/system/composer/prosemirror_onebox_spec.rb
+++ b/spec/system/composer/prosemirror_onebox_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Oneboxing", type: :system do
+describe "Composer - ProseMirror - Oneboxing" do
include_context "with prosemirror editor"
before do
diff --git a/spec/system/composer/prosemirror_pasting_spec.rb b/spec/system/composer/prosemirror_pasting_spec.rb
index 093fd64b86a..b78f03d6211 100644
--- a/spec/system/composer/prosemirror_pasting_spec.rb
+++ b/spec/system/composer/prosemirror_pasting_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Pasting content", type: :system do
+describe "Composer - ProseMirror - Pasting content" do
include_context "with prosemirror editor"
it "creates a mention when pasting an HTML anchor with class mention" do
diff --git a/spec/system/composer/prosemirror_quotes_spec.rb b/spec/system/composer/prosemirror_quotes_spec.rb
index b3e77c024d7..bf1a80b1248 100644
--- a/spec/system/composer/prosemirror_quotes_spec.rb
+++ b/spec/system/composer/prosemirror_quotes_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Quotes", type: :system do
+describe "Composer - ProseMirror - Quotes" do
include_context "with prosemirror editor"
it "keeps the cursor outside quote when pasted" do
diff --git a/spec/system/composer/prosemirror_toolbar_spec.rb b/spec/system/composer/prosemirror_toolbar_spec.rb
index 80eb68ca9d9..c1aab830402 100644
--- a/spec/system/composer/prosemirror_toolbar_spec.rb
+++ b/spec/system/composer/prosemirror_toolbar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Toolbar", type: :system do
+describe "Composer - ProseMirror - Toolbar" do
include_context "with prosemirror editor"
describe "toolbar state updates" do
diff --git a/spec/system/composer/prosemirror_watched_words_spec.rb b/spec/system/composer/prosemirror_watched_words_spec.rb
index f854456218a..1d6a0454f87 100644
--- a/spec/system/composer/prosemirror_watched_words_spec.rb
+++ b/spec/system/composer/prosemirror_watched_words_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Watched Words", type: :system do
+describe "Composer - ProseMirror - Watched Words" do
include_context "with prosemirror editor"
context "with watched word replacements" do
diff --git a/spec/system/composer/prosemirror_wrap_spec.rb b/spec/system/composer/prosemirror_wrap_spec.rb
index c22ae95e36b..b557c760fc0 100644
--- a/spec/system/composer/prosemirror_wrap_spec.rb
+++ b/spec/system/composer/prosemirror_wrap_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer - ProseMirror - Inline and Block Wrap", type: :system do
+describe "Composer - ProseMirror - Inline and Block Wrap" do
include_context "with prosemirror editor"
it "supports [wrap] to create a wrap block" do
diff --git a/spec/system/composer/review_media_unless_trust_level_spec.rb b/spec/system/composer/review_media_unless_trust_level_spec.rb
index 26c3af1b600..d7479b4a1fc 100644
--- a/spec/system/composer/review_media_unless_trust_level_spec.rb
+++ b/spec/system/composer/review_media_unless_trust_level_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer using review_media", type: :system do
+describe "Composer using review_media" do
fab!(:current_user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:topic) { Fabricate(:topic, category: Category.find(SiteSetting.uncategorized_category_id)) }
fab!(:post) { Fabricate(:post, topic: topic) }
diff --git a/spec/system/composer/template_validation_spec.rb b/spec/system/composer/template_validation_spec.rb
index 46641e712ae..65516cfa290 100644
--- a/spec/system/composer/template_validation_spec.rb
+++ b/spec/system/composer/template_validation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer Form Template Validations", type: :system do
+describe "Composer Form Template Validations" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:form_template) do
Fabricate(
diff --git a/spec/system/composer_spec.rb b/spec/system/composer_spec.rb
index 4b1ccc25c42..9bf3fa4801f 100644
--- a/spec/system/composer_spec.rb
+++ b/spec/system/composer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer", type: :system do
+describe "Composer" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:composer) { PageObjects::Components::Composer.new }
diff --git a/spec/system/composer_uploads_spec.rb b/spec/system/composer_uploads_spec.rb
index 7b22b21f723..9b5accafd8f 100644
--- a/spec/system/composer_uploads_spec.rb
+++ b/spec/system/composer_uploads_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Uploading files in the composer", type: :system do
+describe "Uploading files in the composer" do
fab!(:current_user) { Fabricate(:user, refresh_auto_groups: true) }
let(:modal) { PageObjects::Modals::Base.new }
diff --git a/spec/system/content_localization_language_switcher_spec.rb b/spec/system/content_localization_language_switcher_spec.rb
index 168cc7c46c1..372e3f87067 100644
--- a/spec/system/content_localization_language_switcher_spec.rb
+++ b/spec/system/content_localization_language_switcher_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Content localization language switcher", type: :system do
+describe "Content localization language switcher" do
SWITCHER_SELECTOR = "button[data-identifier='language-switcher']"
TOGGLE_LOCALIZE_BUTTON_SELECTOR = "button.btn-toggle-localized-content"
diff --git a/spec/system/content_security_policy_spec.rb b/spec/system/content_security_policy_spec.rb
index ebf6f6c03db..8f8ae3ba4c2 100644
--- a/spec/system/content_security_policy_spec.rb
+++ b/spec/system/content_security_policy_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Content security policy", type: :system do
+describe "Content security policy" do
let(:plugin_class) do
Class.new(Plugin::Instance) do
attr_accessor :enabled
diff --git a/spec/system/core_features_spec.rb b/spec/system/core_features_spec.rb
index 6a2dd0d883a..dc8f1a22f08 100644
--- a/spec/system/core_features_spec.rb
+++ b/spec/system/core_features_spec.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
it_behaves_like "having working core features"
end
diff --git a/spec/system/create_invite_spec.rb b/spec/system/create_invite_spec.rb
index 610a886f06e..bbdb27cd54c 100644
--- a/spec/system/create_invite_spec.rb
+++ b/spec/system/create_invite_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Creating Invites", type: :system do
+describe "Creating Invites" do
fab!(:group)
fab!(:user) { Fabricate(:user, groups: [group]) }
fab!(:topic) { Fabricate(:post).topic }
diff --git a/spec/system/csv_exports_spec.rb b/spec/system/csv_exports_spec.rb
index cdaab4c8f66..531d46bbd04 100644
--- a/spec/system/csv_exports_spec.rb
+++ b/spec/system/csv_exports_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "CSV Exports", type: :system do
+RSpec.describe "CSV Exports" do
fab!(:admin)
let(:csv_export_pm_page) { PageObjects::Pages::CSVExportPM.new }
let(:time_format) { "%Y-%m-%d %H:%M:%S UTC" }
diff --git a/spec/system/custom_sidebar_sections_spec.rb b/spec/system/custom_sidebar_sections_spec.rb
index c3bbf8fecad..1b8853087d0 100644
--- a/spec/system/custom_sidebar_sections_spec.rb
+++ b/spec/system/custom_sidebar_sections_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Custom sidebar sections", type: :system do
+describe "Custom sidebar sections" do
fab!(:user)
fab!(:admin)
let(:section_modal) { PageObjects::Modals::SidebarSectionForm.new }
diff --git a/spec/system/dev_tools_spec.rb b/spec/system/dev_tools_spec.rb
index 8242cf79342..3fc0f483c2d 100644
--- a/spec/system/dev_tools_spec.rb
+++ b/spec/system/dev_tools_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Discourse dev tools", type: :system do
+describe "Discourse dev tools" do
let(:toolbar) { PageObjects::Components::DevTools::Toolbar.new }
let(:plugin_outlet_debug) { PageObjects::Components::DevTools::PluginOutletDebug.new }
let(:block_debug) { PageObjects::Components::DevTools::BlockDebug.new }
diff --git a/spec/system/discourse_connect_provider_spec.rb b/spec/system/discourse_connect_provider_spec.rb
index 43f43bf4601..ec0832a9180 100644
--- a/spec/system/discourse_connect_provider_spec.rb
+++ b/spec/system/discourse_connect_provider_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
require "rotp"
-describe "Discourse Connect Provider", type: :system do
+describe "Discourse Connect Provider" do
include DiscourseConnectHelpers
let(:sso_secret) { SecureRandom.alphanumeric(32) }
diff --git a/spec/system/discourse_connect_spec.rb b/spec/system/discourse_connect_spec.rb
index 0c839e827fb..48d93758383 100644
--- a/spec/system/discourse_connect_spec.rb
+++ b/spec/system/discourse_connect_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Discourse Connect", type: :system do
+describe "Discourse Connect" do
include DiscourseConnectHelpers
let(:sso_secret) { SecureRandom.alphanumeric(32) }
diff --git a/spec/system/discovery_breadcrumb_navigation_spec.rb b/spec/system/discovery_breadcrumb_navigation_spec.rb
index d5d1212cd79..474b202ef89 100644
--- a/spec/system/discovery_breadcrumb_navigation_spec.rb
+++ b/spec/system/discovery_breadcrumb_navigation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Navigating with breadcrumbs", type: :system do
+describe "Navigating with breadcrumbs" do
let(:discovery) { PageObjects::Pages::Discovery.new }
fab!(:category1, :category)
diff --git a/spec/system/discovery_category_spec.rb b/spec/system/discovery_category_spec.rb
index a5b5433249f..9c4c8167abb 100644
--- a/spec/system/discovery_category_spec.rb
+++ b/spec/system/discovery_category_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Discovery Category Routes", type: :system do
+describe "Discovery Category Routes" do
fab!(:category) do
Fabricate(:category, show_subcategory_list: true, subcategory_list_style: "boxes")
end
diff --git a/spec/system/discovery_h1_accessibility_spec.rb b/spec/system/discovery_h1_accessibility_spec.rb
index de138f1aa54..3a0cee9bfd8 100644
--- a/spec/system/discovery_h1_accessibility_spec.rb
+++ b/spec/system/discovery_h1_accessibility_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Discovery heading accessibility", type: :system do
+describe "Discovery heading accessibility" do
let(:discovery) { PageObjects::Pages::Discovery.new }
fab!(:category) { Fabricate(:category, name: "General") }
diff --git a/spec/system/discovery_list_spec.rb b/spec/system/discovery_list_spec.rb
index f12c705132e..33574dd290a 100644
--- a/spec/system/discovery_list_spec.rb
+++ b/spec/system/discovery_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Discovery list", type: :system do
+describe "Discovery list" do
fab!(:topics) { Fabricate.times(10, :post).map(&:topic) }
fab!(:reply) { Fabricate(:post, topic: topics.first) }
diff --git a/spec/system/dismissing_new_spec.rb b/spec/system/dismissing_new_spec.rb
index ecfbf724ce8..cdcd3effc85 100644
--- a/spec/system/dismissing_new_spec.rb
+++ b/spec/system/dismissing_new_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Dismissing New", type: :system do
+RSpec.describe "Dismissing New" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:discovery) { PageObjects::Pages::Discovery.new }
diff --git a/spec/system/drafts_dropdown_spec.rb b/spec/system/drafts_dropdown_spec.rb
index 2583ec58838..345e59214fb 100644
--- a/spec/system/drafts_dropdown_spec.rb
+++ b/spec/system/drafts_dropdown_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Drafts dropdown", type: :system do
+describe "Drafts dropdown" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:category)
let(:composer) { PageObjects::Components::Composer.new }
diff --git a/spec/system/edit_category_form_templates_spec.rb b/spec/system/edit_category_form_templates_spec.rb
index b1844ca23cd..1a928c7a6a6 100644
--- a/spec/system/edit_category_form_templates_spec.rb
+++ b/spec/system/edit_category_form_templates_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Edit Category Form Templates", type: :system do
+describe "Edit Category Form Templates" do
fab!(:color_scheme)
fab!(:theme)
fab!(:admin)
diff --git a/spec/system/edit_category_general_spec.rb b/spec/system/edit_category_general_spec.rb
index f2768cc15e1..1fed5803442 100644
--- a/spec/system/edit_category_general_spec.rb
+++ b/spec/system/edit_category_general_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Edit Category General", type: :system do
+describe "Edit Category General" do
fab!(:admin)
fab!(:category)
let(:category_page) { PageObjects::Pages::Category.new }
diff --git a/spec/system/edit_category_images_spec.rb b/spec/system/edit_category_images_spec.rb
index 98ac868ab02..6729f9efc70 100644
--- a/spec/system/edit_category_images_spec.rb
+++ b/spec/system/edit_category_images_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Edit Category Images", type: :system do
+describe "Edit Category Images" do
fab!(:admin)
fab!(:category)
let(:category_page) { PageObjects::Pages::Category.new }
diff --git a/spec/system/edit_category_security_spec.rb b/spec/system/edit_category_security_spec.rb
index ef6b50533b2..28b51b4fc67 100644
--- a/spec/system/edit_category_security_spec.rb
+++ b/spec/system/edit_category_security_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Edit Category Security", type: :system do
+describe "Edit Category Security" do
fab!(:current_user, :admin)
fab!(:group)
fab!(:category)
diff --git a/spec/system/edit_category_settings_spec.rb b/spec/system/edit_category_settings_spec.rb
index 4dd02e14d17..22ccba3f022 100644
--- a/spec/system/edit_category_settings_spec.rb
+++ b/spec/system/edit_category_settings_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Edit Category Settings", type: :system do
+describe "Edit Category Settings" do
fab!(:admin)
fab!(:category)
diff --git a/spec/system/edit_category_tags_spec.rb b/spec/system/edit_category_tags_spec.rb
index 0f58da0f260..3ce4bc82a03 100644
--- a/spec/system/edit_category_tags_spec.rb
+++ b/spec/system/edit_category_tags_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Edit Category Tags", type: :system do
+describe "Edit Category Tags" do
fab!(:admin)
fab!(:category)
fab!(:tag1) { Fabricate(:tag, name: "tag1") }
diff --git a/spec/system/edit_category_topic_template_spec.rb b/spec/system/edit_category_topic_template_spec.rb
index a3b216920b0..3836d7ea715 100644
--- a/spec/system/edit_category_topic_template_spec.rb
+++ b/spec/system/edit_category_topic_template_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Edit category topic template", type: :system do
+describe "Edit category topic template" do
fab!(:admin)
fab!(:category)
diff --git a/spec/system/editing_sidebar_categories_navigation_spec.rb b/spec/system/editing_sidebar_categories_navigation_spec.rb
index 4dd6c0ff2a0..4965709f90e 100644
--- a/spec/system/editing_sidebar_categories_navigation_spec.rb
+++ b/spec/system/editing_sidebar_categories_navigation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Editing sidebar categories navigation", type: :system do
+RSpec.describe "Editing sidebar categories navigation" do
fab!(:user)
fab!(:category2) { Fabricate(:category, name: "category 2") }
diff --git a/spec/system/editing_sidebar_community_section_spec.rb b/spec/system/editing_sidebar_community_section_spec.rb
index de046ef6e46..4c7fd9dc4b2 100644
--- a/spec/system/editing_sidebar_community_section_spec.rb
+++ b/spec/system/editing_sidebar_community_section_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Editing Sidebar Community Section", type: :system do
+RSpec.describe "Editing Sidebar Community Section" do
fab!(:admin)
fab!(:user)
diff --git a/spec/system/editing_sidebar_tags_navigation_spec.rb b/spec/system/editing_sidebar_tags_navigation_spec.rb
index f7658274a23..4e3d1e752ff 100644
--- a/spec/system/editing_sidebar_tags_navigation_spec.rb
+++ b/spec/system/editing_sidebar_tags_navigation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Editing sidebar tags navigation", type: :system do
+RSpec.describe "Editing sidebar tags navigation" do
fab!(:user)
fab!(:tag1) { Fabricate(:tag, name: "tag").tap { |tag| Fabricate.times(3, :topic, tags: [tag]) } }
diff --git a/spec/system/editing_topic_timers_spec.rb b/spec/system/editing_topic_timers_spec.rb
index 69a513fdd8a..67af896f239 100644
--- a/spec/system/editing_topic_timers_spec.rb
+++ b/spec/system/editing_topic_timers_spec.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
-describe "Editing topic timers", type: :system do
+describe "Editing topic timers" do
fab!(:admin)
fab!(:post)
fab!(:topic) { post.topic }
diff --git a/spec/system/email_change_spec.rb b/spec/system/email_change_spec.rb
index ece53411510..40d0c9133e0 100644
--- a/spec/system/email_change_spec.rb
+++ b/spec/system/email_change_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Changing email", type: :system do
+describe "Changing email" do
fab!(:password) { "mysupersecurepassword" }
fab!(:user) { Fabricate(:user, active: true, password: password) }
let(:new_email) { "[email protected]" }
diff --git a/spec/system/embed_mode_spec.rb b/spec/system/embed_mode_spec.rb
index 38dcfcf97f6..0b6bf6e8bdf 100644
--- a/spec/system/embed_mode_spec.rb
+++ b/spec/system/embed_mode_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Embed mode", type: :system do
+describe "Embed mode" do
fab!(:topic)
fab!(:post) { Fabricate(:post, topic: topic) }
diff --git a/spec/system/ember_deprecation_spec.rb b/spec/system/ember_deprecation_spec.rb
index f6daac20420..c99bec66f10 100644
--- a/spec/system/ember_deprecation_spec.rb
+++ b/spec/system/ember_deprecation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "JS Deprecation Handling", type: :system do
+describe "JS Deprecation Handling" do
it "can successfully print a deprecation message after applying production-mode shims" do
visit("/latest")
expect(find("#main-outlet-wrapper")).to be_visible
diff --git a/spec/system/emojis/emoji_deny_list_spec.rb b/spec/system/emojis/emoji_deny_list_spec.rb
index 40a04637a20..e5750a9ff91 100644
--- a/spec/system/emojis/emoji_deny_list_spec.rb
+++ b/spec/system/emojis/emoji_deny_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Emoji deny list", type: :system do
+describe "Emoji deny list" do
let(:topic_page) { PageObjects::Pages::Topic.new }
let(:composer) { PageObjects::Components::Composer.new }
let(:emoji_picker) { PageObjects::Components::EmojiPicker.new }
diff --git a/spec/system/filtering_topics_spec.rb b/spec/system/filtering_topics_spec.rb
index 00a9623b3d0..a0c479cce5b 100644
--- a/spec/system/filtering_topics_spec.rb
+++ b/spec/system/filtering_topics_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Filtering topics", type: :system do
+describe "Filtering topics" do
fab!(:user)
let(:topic_list) { PageObjects::Components::TopicList.new }
let(:topic_query_filter) { PageObjects::Components::TopicQueryFilter.new }
diff --git a/spec/system/finish_installation_spec.rb b/spec/system/finish_installation_spec.rb
index bc2a3b3a58d..162f9ba0f9b 100644
--- a/spec/system/finish_installation_spec.rb
+++ b/spec/system/finish_installation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Finish Installation", type: :system do
+RSpec.describe "Finish Installation" do
include OmniauthHelpers
let(:finish_installation_page) { PageObjects::Pages::FinishInstallation.new }
diff --git a/spec/system/flagging_post_spec.rb b/spec/system/flagging_post_spec.rb
index 679ed979ff3..f130e864656 100644
--- a/spec/system/flagging_post_spec.rb
+++ b/spec/system/flagging_post_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Flagging post", type: :system do
+describe "Flagging post" do
fab!(:current_user, :admin)
fab!(:category)
fab!(:topic) { Fabricate(:topic, category: category) }
diff --git a/spec/system/forgot_password_spec.rb b/spec/system/forgot_password_spec.rb
index c3afca35d0c..b252d28eaa7 100644
--- a/spec/system/forgot_password_spec.rb
+++ b/spec/system/forgot_password_spec.rb
@@ -152,7 +152,7 @@ shared_examples "forgot password scenarios" do
end
end
-describe "User resetting password", type: :system, dump_threads_on_failure: true do
+describe "User resetting password", dump_threads_on_failure: true do
describe "when desktop" do
include_examples "forgot password scenarios"
end
diff --git a/spec/system/grant_badge_spec.rb b/spec/system/grant_badge_spec.rb
index 21604126bb5..450118bb950 100644
--- a/spec/system/grant_badge_spec.rb
+++ b/spec/system/grant_badge_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Granting Badges", type: :system do
+describe "Granting Badges" do
before { SiteSetting.enable_badges = true }
context "when in topic" do
diff --git a/spec/system/group_activity_spec.rb b/spec/system/group_activity_spec.rb
index dde427d4f52..f44f871fd81 100644
--- a/spec/system/group_activity_spec.rb
+++ b/spec/system/group_activity_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Group activity", type: :system do
+describe "Group activity" do
fab!(:user)
fab!(:group)
diff --git a/spec/system/group_card_spec.rb b/spec/system/group_card_spec.rb
index 419a4a4ff4a..e0adf950a7d 100644
--- a/spec/system/group_card_spec.rb
+++ b/spec/system/group_card_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Group Card", type: :system do
+describe "Group Card" do
fab!(:current_user, :user)
fab!(:members) { Fabricate.times(12, :user) }
fab!(:topic)
diff --git a/spec/system/groups/group_members_spec.rb b/spec/system/groups/group_members_spec.rb
index 9cdb073cfc4..fa1ae0dd822 100644
--- a/spec/system/groups/group_members_spec.rb
+++ b/spec/system/groups/group_members_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Group members", type: :system do
+describe "Group members" do
let(:group_page) { PageObjects::Pages::Group.new }
fab!(:admin)
fab!(:group)
diff --git a/spec/system/groups/group_spec.rb b/spec/system/groups/group_spec.rb
index a73657afd68..fa89b9342be 100644
--- a/spec/system/groups/group_spec.rb
+++ b/spec/system/groups/group_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Group", type: :system do
+describe "Group" do
let(:group_page) { PageObjects::Pages::Group.new }
let(:group_index_page) { PageObjects::Pages::GroupIndex.new }
let(:group_form_page) { PageObjects::Pages::GroupForm.new }
diff --git a/spec/system/hashtag_autocomplete_spec.rb b/spec/system/hashtag_autocomplete_spec.rb
index 124e1f93ee8..3a19366af92 100644
--- a/spec/system/hashtag_autocomplete_spec.rb
+++ b/spec/system/hashtag_autocomplete_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
-describe "Using #hashtag autocompletion to search for and lookup categories and tags",
- type: :system do
+describe "Using #hashtag autocompletion to search for and lookup categories and tags" do
fab!(:current_user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:category) do
Fabricate(:category, name: "Cool Category", slug: "cool-cat", topic_count: 3234)
diff --git a/spec/system/header_search_spec.rb b/spec/system/header_search_spec.rb
index 78b6e8d8754..4a6456f2887 100644
--- a/spec/system/header_search_spec.rb
+++ b/spec/system/header_search_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Header Search - Responsive Behavior", type: :system do
+RSpec.describe "Header Search - Responsive Behavior" do
fab!(:current_user, :user)
let(:search_page) { PageObjects::Pages::Search.new }
diff --git a/spec/system/header_spec.rb b/spec/system/header_spec.rb
index d70e31c5d8c..4761cf24ea9 100644
--- a/spec/system/header_spec.rb
+++ b/spec/system/header_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Glimmer Header", type: :system do
+RSpec.describe "Glimmer Header" do
let(:header) { PageObjects::Pages::Header.new }
let(:search) { PageObjects::Pages::Search.new }
fab!(:current_user, :user)
diff --git a/spec/system/homepage_spec.rb b/spec/system/homepage_spec.rb
index dcb0c9fd6ca..37774e07d9e 100644
--- a/spec/system/homepage_spec.rb
+++ b/spec/system/homepage_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Homepage", type: :system do
+describe "Homepage" do
fab!(:admin)
fab!(:user)
fab!(:topics) { Fabricate.times(5, :post).map(&:topic) }
diff --git a/spec/system/i18n_override_spec.rb b/spec/system/i18n_override_spec.rb
index 919877b19c4..33141c554b7 100644
--- a/spec/system/i18n_override_spec.rb
+++ b/spec/system/i18n_override_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "I18n translation overrides", type: :system do
+describe "I18n translation overrides" do
describe "module-scope i18n() lookups" do
fab!(:theme) { Fabricate(:theme, name: "Test Theme") }
fab!(:translation_override) do
diff --git a/spec/system/image_grid_carousel_spec.rb b/spec/system/image_grid_carousel_spec.rb
index c73ea6509ba..5e604f4b382 100644
--- a/spec/system/image_grid_carousel_spec.rb
+++ b/spec/system/image_grid_carousel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Image Carousel", type: :system do
+describe "Image Carousel" do
fab!(:current_user, :admin)
fab!(:upload1) do
UploadCreator.new(file_from_fixtures("logo.png", "images"), "logo.png").create_for(
diff --git a/spec/system/impersonation_spec.rb b/spec/system/impersonation_spec.rb
index ff388787675..c0f98be5485 100644
--- a/spec/system/impersonation_spec.rb
+++ b/spec/system/impersonation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Impersonation", type: :system do
+describe "Impersonation" do
fab!(:admin)
fab!(:user)
diff --git a/spec/system/interface_color_selector_spec.rb b/spec/system/interface_color_selector_spec.rb
index 5cc5b40a966..165e5a717b5 100644
--- a/spec/system/interface_color_selector_spec.rb
+++ b/spec/system/interface_color_selector_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Interface color selector", type: :system do
+describe "Interface color selector" do
let!(:light_scheme) do
ColorScheme.find_by(base_scheme_id: ColorScheme::NAMES_TO_ID_MAP["Solarized Light"])
end
diff --git a/spec/system/keyboard_shortcuts_spec.rb b/spec/system/keyboard_shortcuts_spec.rb
index 5d5d49a8093..5f1c1c29338 100644
--- a/spec/system/keyboard_shortcuts_spec.rb
+++ b/spec/system/keyboard_shortcuts_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Keyboard shortcuts", type: :system do
+RSpec.describe "Keyboard shortcuts" do
it "can have default keyboard shortcuts disabled by the Plugin API" do
sign_in Fabricate(:admin)
diff --git a/spec/system/lightbox_spec.rb b/spec/system/lightbox_spec.rb
index d3241d25e8b..c357deb93a4 100644
--- a/spec/system/lightbox_spec.rb
+++ b/spec/system/lightbox_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Lightbox | Photoswipe", type: :system do
+describe "Lightbox | Photoswipe" do
fab!(:topic)
fab!(:current_user, :admin)
fab!(:upload_1) { Fabricate(:image_upload, width: 2400, height: 3600) }
diff --git a/spec/system/locale_spec.rb b/spec/system/locale_spec.rb
index 3d4d564c1b1..be2c68a7263 100644
--- a/spec/system/locale_spec.rb
+++ b/spec/system/locale_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Locale choice", type: :system do
+RSpec.describe "Locale choice" do
it "loads english locale successfully" do
visit "/"
expect(page).to have_css("html[lang='en']")
diff --git a/spec/system/login_spec.rb b/spec/system/login_spec.rb
index 2e1f4e786bf..551f25d0d98 100644
--- a/spec/system/login_spec.rb
+++ b/spec/system/login_spec.rb
@@ -429,7 +429,7 @@ shared_examples "login scenarios" do
end
end
-describe "Login", type: :system do
+describe "Login" do
context "when desktop" do
include_examples "login scenarios"
end
diff --git a/spec/system/member_upcoming_changes_spec.rb b/spec/system/member_upcoming_changes_spec.rb
index b2464844033..c548003096e 100644
--- a/spec/system/member_upcoming_changes_spec.rb
+++ b/spec/system/member_upcoming_changes_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Member upcoming changes", type: :system do
+RSpec.describe "Member upcoming changes" do
fab!(:current_user, :user)
fab!(:admin)
let(:upcoming_changes_page) { PageObjects::Pages::AdminUpcomingChanges.new }
diff --git a/spec/system/mobile_mode_spec.rb b/spec/system/mobile_mode_spec.rb
index d6a332bc2f5..4b647e06a39 100644
--- a/spec/system/mobile_mode_spec.rb
+++ b/spec/system/mobile_mode_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Viewport-based mobile mode", type: :system do
+RSpec.describe "Viewport-based mobile mode" do
before { SiteSetting.viewport_based_mobile_mode = true }
it "has both stylesheets, and updates classes at runtime" do
diff --git a/spec/system/navigation_menu_state_integration_spec.rb b/spec/system/navigation_menu_state_integration_spec.rb
index 9e8940135fa..475822f0bc7 100644
--- a/spec/system/navigation_menu_state_integration_spec.rb
+++ b/spec/system/navigation_menu_state_integration_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Navigation menu states", type: :system do
+describe "Navigation menu states" do
fab!(:current_user, :user)
let!(:sidebar_navigation) { PageObjects::Components::NavigationMenu::Sidebar.new }
let!(:header_dropdown) { PageObjects::Components::NavigationMenu::HeaderDropdown.new }
diff --git a/spec/system/network_disconnected_spec.rb b/spec/system/network_disconnected_spec.rb
index a6454065dc1..841e5ef4e13 100644
--- a/spec/system/network_disconnected_spec.rb
+++ b/spec/system/network_disconnected_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Network Disconnected", type: :system do
+RSpec.describe "Network Disconnected" do
let(:cdp) { PageObjects::CDP.new }
it "NetworkConnectivity service adds class to DOM and displays offline indicator" do
diff --git a/spec/system/new_category_spec.rb b/spec/system/new_category_spec.rb
index 9674c3860da..73b3324cd50 100644
--- a/spec/system/new_category_spec.rb
+++ b/spec/system/new_category_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "New Category", type: :system do
+describe "New Category" do
fab!(:admin)
let(:category_page) { PageObjects::Pages::Category.new }
diff --git a/spec/system/pm_user_removal_spec.rb b/spec/system/pm_user_removal_spec.rb
index 88478bba509..a1eb1e4adf6 100644
--- a/spec/system/pm_user_removal_spec.rb
+++ b/spec/system/pm_user_removal_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "PM user removal", type: :system do
+describe "PM user removal" do
fab!(:current_user, :admin)
fab!(:other_user, :user)
diff --git a/spec/system/post_history_spec.rb b/spec/system/post_history_spec.rb
index 6971bebcc23..6776b2cd389 100644
--- a/spec/system/post_history_spec.rb
+++ b/spec/system/post_history_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post history with tag changes", type: :system do
+describe "Post history with tag changes" do
fab!(:admin)
fab!(:tag1) { Fabricate(:tag, name: "alpha") }
fab!(:tag2) { Fabricate(:tag, name: "beta") }
diff --git a/spec/system/post_menu_spec.rb b/spec/system/post_menu_spec.rb
index 759c17188b2..3273b576c96 100644
--- a/spec/system/post_menu_spec.rb
+++ b/spec/system/post_menu_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post menu", type: :system do
+describe "Post menu" do
fab!(:admin) { Fabricate(:admin, refresh_auto_groups: true) }
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:topic, reload: true)
diff --git a/spec/system/post_replies_spec.rb b/spec/system/post_replies_spec.rb
index 180c7dd3352..d727e5a10e7 100644
--- a/spec/system/post_replies_spec.rb
+++ b/spec/system/post_replies_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post replies", type: :system do
+describe "Post replies" do
fab!(:user)
fab!(:topic)
fab!(:post) { Fabricate(:post, user:, topic:) }
diff --git a/spec/system/post_selection_copy_quote_spec.rb b/spec/system/post_selection_copy_quote_spec.rb
index 706adcbd7bc..96950d751c7 100644
--- a/spec/system/post_selection_copy_quote_spec.rb
+++ b/spec/system/post_selection_copy_quote_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post selection | Copy quote", type: :system do
+describe "Post selection | Copy quote" do
let(:topic_page) { PageObjects::Pages::Topic.new }
let(:composer) { PageObjects::Components::Composer.new }
let(:cdp) { PageObjects::CDP.new }
diff --git a/spec/system/post_selection_fast_edit_spec.rb b/spec/system/post_selection_fast_edit_spec.rb
index 898c92a78ff..63e5a3bd26d 100644
--- a/spec/system/post_selection_fast_edit_spec.rb
+++ b/spec/system/post_selection_fast_edit_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post selection | Fast edit", type: :system do
+describe "Post selection | Fast edit" do
let(:topic_page) { PageObjects::Pages::Topic.new }
let(:fast_editor) { PageObjects::Components::FastEditor.new }
diff --git a/spec/system/post_small_action_spec.rb b/spec/system/post_small_action_spec.rb
index 33132689a5b..a280836c645 100644
--- a/spec/system/post_small_action_spec.rb
+++ b/spec/system/post_small_action_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post small actions", type: :system do
+describe "Post small actions" do
fab!(:admin)
fab!(:topic)
fab!(:first_post) do
diff --git a/spec/system/post_stream_spec.rb b/spec/system/post_stream_spec.rb
index 835ec81654c..3e3b01ef3f4 100644
--- a/spec/system/post_stream_spec.rb
+++ b/spec/system/post_stream_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post stream", type: :system do
+describe "Post stream" do
fab!(:user)
fab!(:admin)
diff --git a/spec/system/post_translation_spec.rb b/spec/system/post_translation_spec.rb
index df7ac016fa5..8db84e26efc 100644
--- a/spec/system/post_translation_spec.rb
+++ b/spec/system/post_translation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Post translations", type: :system do
+describe "Post translations" do
POST_LANGUAGE_SWITCHER_SELECTOR = "button[data-identifier='post-language-selector']"
fab!(:admin)
diff --git a/spec/system/posts_page_spec.rb b/spec/system/posts_page_spec.rb
index 567ec447f43..b90771e9a19 100644
--- a/spec/system/posts_page_spec.rb
+++ b/spec/system/posts_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Posts page", type: :system do
+describe "Posts page" do
fab!(:post)
fab!(:post_2, :post)
fab!(:post_3, :post)
diff --git a/spec/system/powered_by_discourse_spec.rb b/spec/system/powered_by_discourse_spec.rb
index 3ba09f31317..f8d772049d1 100644
--- a/spec/system/powered_by_discourse_spec.rb
+++ b/spec/system/powered_by_discourse_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Powered by Discourse", type: :system do
+describe "Powered by Discourse" do
it "appears when enabled" do
SiteSetting.enable_powered_by_discourse = true
diff --git a/spec/system/private_message_spec.rb b/spec/system/private_message_spec.rb
index 8a9def75719..39b2b51c827 100644
--- a/spec/system/private_message_spec.rb
+++ b/spec/system/private_message_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Private Message", type: :system do
+describe "Private Message" do
let(:sender) { Fabricate(:user, refresh_auto_groups: true) }
let(:recipient) { Fabricate(:user) }
let(:pm_post) { Fabricate(:private_message_post, user: sender, recipient: recipient) }
diff --git a/spec/system/request_tracker_spec.rb b/spec/system/request_tracker_spec.rb
index 02899a01129..664926c3b75 100644
--- a/spec/system/request_tracker_spec.rb
+++ b/spec/system/request_tracker_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Request tracking", type: :system do
+describe "Request tracking" do
before do
ApplicationRequest.enable
CachedCounting.reset
diff --git a/spec/system/review_filters_spec.rb b/spec/system/review_filters_spec.rb
index d151c614c83..e184b819f1d 100644
--- a/spec/system/review_filters_spec.rb
+++ b/spec/system/review_filters_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Review filters", type: :system do
+describe "Review filters" do
fab!(:admin)
fab!(:moderator)
fab!(:regular_user, :user)
diff --git a/spec/system/reviewables_spec.rb b/spec/system/reviewables_spec.rb
index 8293819c76f..d9be83bda0c 100644
--- a/spec/system/reviewables_spec.rb
+++ b/spec/system/reviewables_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Reviewables", type: :system do
+describe "Reviewables" do
let(:review_page) { PageObjects::Pages::Review.new }
fab!(:admin)
fab!(:theme)
diff --git a/spec/system/s3_secure_uploads_spec.rb b/spec/system/s3_secure_uploads_spec.rb
index 83464e9c674..1c592d37a0d 100644
--- a/spec/system/s3_secure_uploads_spec.rb
+++ b/spec/system/s3_secure_uploads_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Uploading files in the composer to S3", type: :system do
+describe "Uploading files in the composer to S3" do
fab!(:current_user, :admin)
fab!(:other_user) { Fabricate(:user, username: "otherguy") }
diff --git a/spec/system/s3_uploads_spec.rb b/spec/system/s3_uploads_spec.rb
index 923234bfdeb..ed84fafbc52 100644
--- a/spec/system/s3_uploads_spec.rb
+++ b/spec/system/s3_uploads_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Uploading files in the composer to S3", type: :system do
+describe "Uploading files in the composer to S3" do
fab!(:current_user, :admin)
let(:modal) { PageObjects::Modals::Base.new }
diff --git a/spec/system/scroll_manager_service_spec.rb b/spec/system/scroll_manager_service_spec.rb
index 2a5996e9416..971b3e4dcd9 100644
--- a/spec/system/scroll_manager_service_spec.rb
+++ b/spec/system/scroll_manager_service_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Ember route-scroll-manager service", type: :system do
+describe "Ember route-scroll-manager service" do
before do
Fabricate(:admin)
Fabricate.times(50, :post)
diff --git a/spec/system/search_shortcut_variation_spec.rb b/spec/system/search_shortcut_variation_spec.rb
index 4f842efb017..1490dfb850e 100644
--- a/spec/system/search_shortcut_variation_spec.rb
+++ b/spec/system/search_shortcut_variation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Search | Shortcuts for variations of search input", type: :system do
+describe "Search | Shortcuts for variations of search input" do
fab!(:current_user, :user)
let(:welcome_banner) { PageObjects::Components::WelcomeBanner.new }
diff --git a/spec/system/search_spec.rb b/spec/system/search_spec.rb
index 953c80a2eed..6cc0236be23 100644
--- a/spec/system/search_spec.rb
+++ b/spec/system/search_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Search", type: :system do
+describe "Search" do
let(:search_page) { PageObjects::Pages::Search.new }
fab!(:topic)
fab!(:op) { Fabricate(:post, topic: topic) }
diff --git a/spec/system/signup_spec.rb b/spec/system/signup_spec.rb
index f9a77218b48..80fb4b6a9f4 100644
--- a/spec/system/signup_spec.rb
+++ b/spec/system/signup_spec.rb
@@ -434,7 +434,7 @@ shared_examples "signup scenarios" do
end
end
-describe "Signup", type: :system do
+describe "Signup" do
context "when desktop" do
include_examples "signup scenarios"
end
diff --git a/spec/system/social_authentication_spec.rb b/spec/system/social_authentication_spec.rb
index 8790e4c42b7..54ad458edd7 100644
--- a/spec/system/social_authentication_spec.rb
+++ b/spec/system/social_authentication_spec.rb
@@ -593,7 +593,7 @@ shared_examples "social authentication scenarios" do
end
end
-describe "Social authentication", type: :system do
+describe "Social authentication" do
before { SiteSetting.full_name_requirement = "optional_at_signup" }
context "when desktop" do
diff --git a/spec/system/staff_writes_only_mode_spec.rb b/spec/system/staff_writes_only_mode_spec.rb
index b414aa3ad75..c850240c8da 100644
--- a/spec/system/staff_writes_only_mode_spec.rb
+++ b/spec/system/staff_writes_only_mode_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Staff writes only mode", type: :system do
+describe "Staff writes only mode" do
password = SecureRandom.alphanumeric(20)
fab!(:moderator) { Fabricate(:moderator, password:) }
diff --git a/spec/system/table_builder_spec.rb b/spec/system/table_builder_spec.rb
index 61fd6f74aff..086267fcece 100644
--- a/spec/system/table_builder_spec.rb
+++ b/spec/system/table_builder_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Table Builder", type: :system do
+describe "Table Builder" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:composer) { PageObjects::Components::Composer.new }
let(:insert_table_modal) { PageObjects::Modals::InsertTable.new }
diff --git a/spec/system/tag_group_spec.rb b/spec/system/tag_group_spec.rb
index c4d9eb580f4..e8910ed7c08 100644
--- a/spec/system/tag_group_spec.rb
+++ b/spec/system/tag_group_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Tag Groups", type: :system do
+describe "Tag Groups" do
fab!(:admin)
fab!(:tag1) { Fabricate(:tag, name: "cats") }
fab!(:tag2) { Fabricate(:tag, name: "bats") }
diff --git a/spec/system/tag_notification_level_spec.rb b/spec/system/tag_notification_level_spec.rb
index 55b2eaddd5f..f734253b165 100644
--- a/spec/system/tag_notification_level_spec.rb
+++ b/spec/system/tag_notification_level_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Tag notification level", type: :system do
+describe "Tag notification level" do
let(:tags_page) { PageObjects::Pages::Tag.new }
let(:notifications_tracking) do
PageObjects::Components::NotificationsTracking.new(".tag-notifications-tracking")
diff --git a/spec/system/tag_settings_spec.rb b/spec/system/tag_settings_spec.rb
index f3b073103ff..61de794d3a5 100644
--- a/spec/system/tag_settings_spec.rb
+++ b/spec/system/tag_settings_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Tag Settings", type: :system do
+describe "Tag Settings" do
let(:tags_page) { PageObjects::Pages::Tag.new }
let(:dialog) { PageObjects::Components::Dialog.new }
let(:tag_settings_page) { PageObjects::Pages::TagSettings.new }
diff --git a/spec/system/tag_view_spec.rb b/spec/system/tag_view_spec.rb
index 7c729e2c4a8..0a7fa2e3c9d 100644
--- a/spec/system/tag_view_spec.rb
+++ b/spec/system/tag_view_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Tag view", type: :system do
+describe "Tag view" do
fab!(:tag_1) { Fabricate(:tag, name: "design") }
fab!(:tag_2) { Fabricate(:tag, name: "art") }
fab!(:topic) { Fabricate(:topic, tags: [tag_2]) }
diff --git a/spec/system/tags/tags_spec.rb b/spec/system/tags/tags_spec.rb
index 1d8f8c84399..67554a50332 100644
--- a/spec/system/tags/tags_spec.rb
+++ b/spec/system/tags/tags_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Tags", type: :system do
+describe "Tags" do
fab!(:user_tl1) { Fabricate(:user, trust_level: TrustLevel[1]) }
fab!(:user_tl2) { Fabricate(:user, trust_level: TrustLevel[2]) }
fab!(:user_tl3) { Fabricate(:user, trust_level: TrustLevel[3]) }
diff --git a/spec/system/tags_index_spec.rb b/spec/system/tags_index_spec.rb
index b7f98258926..68d3c236e05 100644
--- a/spec/system/tags_index_spec.rb
+++ b/spec/system/tags_index_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Tags index page", type: :system do
+describe "Tags index page" do
fab!(:admin)
fab!(:user)
diff --git a/spec/system/tags_intersection_spec.rb b/spec/system/tags_intersection_spec.rb
index 9a941276b4d..30aaf782abd 100644
--- a/spec/system/tags_intersection_spec.rb
+++ b/spec/system/tags_intersection_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Tags intersection", type: :system do
+describe "Tags intersection" do
let(:discovery) { PageObjects::Pages::Discovery.new }
fab!(:category) { Fabricate(:category, name: "fruits") }
diff --git a/spec/system/theme_qunit_spec.rb b/spec/system/theme_qunit_spec.rb
index fed80e73a0f..8429907ff5c 100644
--- a/spec/system/theme_qunit_spec.rb
+++ b/spec/system/theme_qunit_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Theme qunit testing", type: :system do
+describe "Theme qunit testing" do
let!(:theme_without_tests) { Fabricate(:theme, name: "no-tests-guy") }
let!(:theme_with_test) do
t = Fabricate(:theme, name: "Theme With Tests")
diff --git a/spec/system/topic_admin_menu_spec.rb b/spec/system/topic_admin_menu_spec.rb
index 90cf74dd8ff..c823eedbf48 100644
--- a/spec/system/topic_admin_menu_spec.rb
+++ b/spec/system/topic_admin_menu_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Topic Admin Menu", type: :system do
+describe "Topic Admin Menu" do
fab!(:admin)
let(:topic_page) { PageObjects::Pages::Topic.new }
diff --git a/spec/system/topic_bulk_select_spec.rb b/spec/system/topic_bulk_select_spec.rb
index d256022587a..48ef2057aec 100644
--- a/spec/system/topic_bulk_select_spec.rb
+++ b/spec/system/topic_bulk_select_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Topic bulk select", type: :system do
+describe "Topic bulk select" do
fab!(:topics) { Fabricate.times(10, :post).map(&:topic) }
fab!(:admin)
fab!(:user)
diff --git a/spec/system/topic_list/glimmer_spec.rb b/spec/system/topic_list/glimmer_spec.rb
index 96a87c6e470..865734b7738 100644
--- a/spec/system/topic_list/glimmer_spec.rb
+++ b/spec/system/topic_list/glimmer_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "glimmer topic list", type: :system do
+describe "glimmer topic list" do
fab!(:user)
let(:topic_list) { PageObjects::Components::TopicList.new }
diff --git a/spec/system/topic_list_spec.rb b/spec/system/topic_list_spec.rb
index 200579083e3..b7b55348c4c 100644
--- a/spec/system/topic_list_spec.rb
+++ b/spec/system/topic_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Topic list", type: :system do
+describe "Topic list" do
fab!(:topics) { Fabricate.times(10, :post).map(&:topic) }
before_all do
diff --git a/spec/system/topic_page_spec.rb b/spec/system/topic_page_spec.rb
index f07e2dcfb39..b4debea7e1c 100644
--- a/spec/system/topic_page_spec.rb
+++ b/spec/system/topic_page_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Topic page", type: :system do
+describe "Topic page" do
fab!(:topic)
fab!(:admin)
diff --git a/spec/system/topic_tracking_state_spec.rb b/spec/system/topic_tracking_state_spec.rb
index 9b978d56816..06bbb19fb81 100644
--- a/spec/system/topic_tracking_state_spec.rb
+++ b/spec/system/topic_tracking_state_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Topic tracking state", type: :system do
+describe "Topic tracking state" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:tag)
fab!(:other_tag, :tag)
diff --git a/spec/system/topics_unread_when_closed_spec.rb b/spec/system/topics_unread_when_closed_spec.rb
index 8b180c78d98..4280cc79cd7 100644
--- a/spec/system/topics_unread_when_closed_spec.rb
+++ b/spec/system/topics_unread_when_closed_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Topics unread when closed", type: :system do
+describe "Topics unread when closed" do
fab!(:topics) { Fabricate.times(10, :post).map(&:topic) }
let(:topic_list) { PageObjects::Components::TopicList.new }
let(:topic_page) { PageObjects::Pages::Topic.new }
diff --git a/spec/system/unified_new_topic_list_spec.rb b/spec/system/unified_new_topic_list_spec.rb
index b476c9d95fa..c4cf6b991fe 100644
--- a/spec/system/unified_new_topic_list_spec.rb
+++ b/spec/system/unified_new_topic_list_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Unified new topic list", type: :system do
+describe "Unified new topic list" do
fab!(:user)
fab!(:group) { Fabricate(:group, users: [user]) }
fab!(:category)
diff --git a/spec/system/user_activation_spec.rb b/spec/system/user_activation_spec.rb
index 4bf5b0576cd..039515a55bc 100644
--- a/spec/system/user_activation_spec.rb
+++ b/spec/system/user_activation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Account activation", type: :system do
+describe "Account activation" do
fab!(:password) { "myverysecurepassword" }
fab!(:user) { Fabricate(:user, password: password, active: false) }
diff --git a/spec/system/user_activity_bookmarks_spec.rb b/spec/system/user_activity_bookmarks_spec.rb
index 2b3f098ac07..614a0894755 100644
--- a/spec/system/user_activity_bookmarks_spec.rb
+++ b/spec/system/user_activity_bookmarks_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User activity bookmarks", type: :system do
+describe "User activity bookmarks" do
fab!(:current_user, :user)
fab!(:bookmark_1) do
Fabricate(
diff --git a/spec/system/user_activity_drafts_spec.rb b/spec/system/user_activity_drafts_spec.rb
index 0a9d8558b4d..a1dbdbcd7f0 100644
--- a/spec/system/user_activity_drafts_spec.rb
+++ b/spec/system/user_activity_drafts_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User activity drafts", type: :system do
+describe "User activity drafts" do
fab!(:user)
let(:drafts_page) { PageObjects::Pages::UserActivityDrafts.new }
diff --git a/spec/system/user_activity_posts_spec.rb b/spec/system/user_activity_posts_spec.rb
index f396e1295f8..e4153d1d6d9 100644
--- a/spec/system/user_activity_posts_spec.rb
+++ b/spec/system/user_activity_posts_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User activity posts", type: :system do
+describe "User activity posts" do
before_all { UserActionManager.enable }
fab!(:user)
diff --git a/spec/system/user_card_spec.rb b/spec/system/user_card_spec.rb
index 4477f263761..617b3f8865d 100644
--- a/spec/system/user_card_spec.rb
+++ b/spec/system/user_card_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User Card", type: :system do
+describe "User Card" do
fab!(:current_user, :admin)
fab!(:topic) { Fabricate(:post).topic }
fab!(:user)
diff --git a/spec/system/user_page/hide_from_public_spec.rb b/spec/system/user_page/hide_from_public_spec.rb
index e64977f2cbf..0903afa5c9b 100644
--- a/spec/system/user_page/hide_from_public_spec.rb
+++ b/spec/system/user_page/hide_from_public_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "hide_user_profiles_from_public", type: :system do
+describe "hide_user_profiles_from_public" do
let(:user) { Fabricate(:user) }
before { SiteSetting.hide_user_profiles_from_public = true }
diff --git a/spec/system/user_page/staff_info_spec.rb b/spec/system/user_page/staff_info_spec.rb
index b8a9c502206..48e59485a17 100644
--- a/spec/system/user_page/staff_info_spec.rb
+++ b/spec/system/user_page/staff_info_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Viewing user staff info as an admin", type: :system do
+describe "Viewing user staff info as an admin" do
fab!(:user)
fab!(:admin)
let(:user_page) { PageObjects::Pages::User.new }
diff --git a/spec/system/user_page/user_invites_spec.rb b/spec/system/user_page/user_invites_spec.rb
index 039493a0174..e05ea905003 100644
--- a/spec/system/user_page/user_invites_spec.rb
+++ b/spec/system/user_page/user_invites_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User invites", type: :system do
+describe "User invites" do
fab!(:admin)
fab!(:user)
fab!(:invites_pending) { [1, 2, 3, 4].map { Fabricate(:invite, invited_by: user) } }
diff --git a/spec/system/user_page/user_notifications_spec.rb b/spec/system/user_page/user_notifications_spec.rb
index 00c1f6047ce..ae483f772ad 100644
--- a/spec/system/user_page/user_notifications_spec.rb
+++ b/spec/system/user_page/user_notifications_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User notifications", type: :system do
+describe "User notifications" do
fab!(:user) { Fabricate(:user, name: "Awesome Name") }
let(:user_notifications_page) { PageObjects::Pages::UserNotifications.new }
let(:user_page) { PageObjects::Pages::User.new }
diff --git a/spec/system/user_page/user_page_search_spec.rb b/spec/system/user_page/user_page_search_spec.rb
index 7d3b5bedf8f..c9d2faf356b 100644
--- a/spec/system/user_page/user_page_search_spec.rb
+++ b/spec/system/user_page/user_page_search_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User page search", type: :system do
+describe "User page search" do
fab!(:user)
let(:search_page) { PageObjects::Pages::Search.new }
diff --git a/spec/system/user_page/user_preferences_account_spec.rb b/spec/system/user_page/user_preferences_account_spec.rb
index 5485028c693..b3f6d0c2f50 100644
--- a/spec/system/user_page/user_preferences_account_spec.rb
+++ b/spec/system/user_page/user_preferences_account_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User preferences | Account", type: :system do
+describe "User preferences | Account" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
let(:user_account_preferences_page) { PageObjects::Pages::UserPreferencesAccount.new }
let(:avatar_selector_modal) { PageObjects::Modals::AvatarSelector.new }
diff --git a/spec/system/user_page/user_preferences_interface_spec.rb b/spec/system/user_page/user_preferences_interface_spec.rb
index 2cacfc601c7..fa43a6f7c43 100644
--- a/spec/system/user_page/user_preferences_interface_spec.rb
+++ b/spec/system/user_page/user_preferences_interface_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User preferences | Interface", type: :system do
+describe "User preferences | Interface" do
fab!(:user)
let(:user_preferences_page) { PageObjects::Pages::UserPreferences.new }
let(:user_preferences_interface_page) { PageObjects::Pages::UserPreferencesInterface.new }
diff --git a/spec/system/user_page/user_preferences_navigation_spec.rb b/spec/system/user_page/user_preferences_navigation_spec.rb
index 8eeffd3b73a..e7888d694d7 100644
--- a/spec/system/user_page/user_preferences_navigation_spec.rb
+++ b/spec/system/user_page/user_preferences_navigation_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User preferences | Navigation menu", type: :system do
+describe "User preferences | Navigation menu" do
fab!(:user)
let(:everyone_group) { Group[:everyone] }
let(:user_preferences_page) { PageObjects::Pages::UserPreferences.new }
diff --git a/spec/system/user_page/user_preferences_notifications_spec.rb b/spec/system/user_page/user_preferences_notifications_spec.rb
index 17e8721d313..d2a1d33336f 100644
--- a/spec/system/user_page/user_preferences_notifications_spec.rb
+++ b/spec/system/user_page/user_preferences_notifications_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User preferences | Notifications", type: :system do
+describe "User preferences | Notifications" do
fab!(:user)
let(:user_preferences_notifications_page) { PageObjects::Pages::UserPreferencesNotifications.new }
diff --git a/spec/system/user_page/user_preferences_profile_spec.rb b/spec/system/user_page/user_preferences_profile_spec.rb
index ec8a3145f18..f7d00e3677c 100644
--- a/spec/system/user_page/user_preferences_profile_spec.rb
+++ b/spec/system/user_page/user_preferences_profile_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User preferences | Profile", type: :system do
+describe "User preferences | Profile" do
fab!(:user) { Fabricate(:user, active: true) }
let(:user_preferences_profile_page) { PageObjects::Pages::UserPreferencesProfile.new }
let(:user_preferences_page) { PageObjects::Pages::UserPreferences.new }
diff --git a/spec/system/user_page/user_preferences_security_spec.rb b/spec/system/user_page/user_preferences_security_spec.rb
index fcfa962846d..e0ec3875f35 100644
--- a/spec/system/user_page/user_preferences_security_spec.rb
+++ b/spec/system/user_page/user_preferences_security_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User preferences | Security", type: :system do
+describe "User preferences | Security" do
fab!(:password) { "kungfukenny" }
fab!(:email) { "[email protected]" }
fab!(:admin)
diff --git a/spec/system/user_page/user_preferences_tracking_spec.rb b/spec/system/user_page/user_preferences_tracking_spec.rb
index 4dcfc1768b2..2c1eafb5a3d 100644
--- a/spec/system/user_page/user_preferences_tracking_spec.rb
+++ b/spec/system/user_page/user_preferences_tracking_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User preferences tracking page", type: :system do
+RSpec.describe "User preferences tracking page" do
fab!(:user)
fab!(:tag1) { Fabricate(:tag, name: "javascript") }
fab!(:tag2) { Fabricate(:tag, name: "ruby") }
diff --git a/spec/system/user_page/user_profile_info_panel_spec.rb b/spec/system/user_page/user_profile_info_panel_spec.rb
index 395e6212ce5..0fb684694ab 100644
--- a/spec/system/user_page/user_profile_info_panel_spec.rb
+++ b/spec/system/user_page/user_profile_info_panel_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "User Profile Info Panel", system: true do
+RSpec.describe "User Profile Info Panel" do
let(:user_page) { PageObjects::Pages::User.new }
describe "trust level" do
diff --git a/spec/system/user_page/users_directory_spec.rb b/spec/system/user_page/users_directory_spec.rb
index 2a99719eb3f..fbd123b6afc 100644
--- a/spec/system/user_page/users_directory_spec.rb
+++ b/spec/system/user_page/users_directory_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Users directory", type: :system do
+describe "Users directory" do
fab!(:user)
let!(:initial_directory_events) { [] }
diff --git a/spec/system/user_selector_spec.rb b/spec/system/user_selector_spec.rb
index 187b2dc82a4..1903d4565f9 100644
--- a/spec/system/user_selector_spec.rb
+++ b/spec/system/user_selector_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User selector", type: :system do
+describe "User selector" do
fab!(:topic)
fab!(:post) { Fabricate(:post, topic: topic) }
fab!(:current_user, :admin)
diff --git a/spec/system/user_tips_spec.rb b/spec/system/user_tips_spec.rb
index 5a5b096f35e..d1281b5c64a 100644
--- a/spec/system/user_tips_spec.rb
+++ b/spec/system/user_tips_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "User tips", type: :system do
+describe "User tips" do
fab!(:admin)
fab!(:user)
fab!(:topics) { Fabricate.times(2, :post).map(&:topic) }
diff --git a/spec/system/viewing_category_spec.rb b/spec/system/viewing_category_spec.rb
index 265bf3f23aa..a50d2da9a56 100644
--- a/spec/system/viewing_category_spec.rb
+++ b/spec/system/viewing_category_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Viewing a category", type: :system do
+RSpec.describe "Viewing a category" do
fab!(:category)
fab!(:user)
let(:category_page) { PageObjects::Pages::Category.new }
diff --git a/spec/system/viewing_group_members_spec.rb b/spec/system/viewing_group_members_spec.rb
index aa5544c0c35..3a48af4c8e4 100644
--- a/spec/system/viewing_group_members_spec.rb
+++ b/spec/system/viewing_group_members_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Viewing group members", type: :system do
+RSpec.describe "Viewing group members" do
fab!(:group)
fab!(:user_in_group_1) { Fabricate(:user).tap { |u| group.add(u) } }
fab!(:user_in_group_2) { Fabricate(:user).tap { |u| group.add(u) } }
diff --git a/spec/system/viewing_navigation_menu_preferences_spec.rb b/spec/system/viewing_navigation_menu_preferences_spec.rb
index 5361b533326..5355b0c2deb 100644
--- a/spec/system/viewing_navigation_menu_preferences_spec.rb
+++ b/spec/system/viewing_navigation_menu_preferences_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Viewing sidebar preferences", type: :system do
+describe "Viewing sidebar preferences" do
let(:user_preferences_navigation_menu_page) do
PageObjects::Pages::UserPreferencesNavigationMenu.new
end
diff --git a/spec/system/viewing_reviewable_spec.rb b/spec/system/viewing_reviewable_spec.rb
index 81ff80d41cf..e0c31263f9a 100644
--- a/spec/system/viewing_reviewable_spec.rb
+++ b/spec/system/viewing_reviewable_spec.rb
@@ -2,7 +2,7 @@
require "discourse_ip_info"
-describe "Viewing reviewable item", type: :system do
+describe "Viewing reviewable item" do
fab!(:admin)
fab!(:moderator)
fab!(:group)
diff --git a/spec/system/viewing_sidebar_as_anonymous_user_spec.rb b/spec/system/viewing_sidebar_as_anonymous_user_spec.rb
index be7bb7f212f..d300718f5f2 100644
--- a/spec/system/viewing_sidebar_as_anonymous_user_spec.rb
+++ b/spec/system/viewing_sidebar_as_anonymous_user_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Viewing sidebar as anonymous user", type: :system do
+describe "Viewing sidebar as anonymous user" do
let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
describe "when viewing the tags section" do
diff --git a/spec/system/viewing_sidebar_mobile_spec.rb b/spec/system/viewing_sidebar_mobile_spec.rb
index 8fb42b63cc4..6b1e4aefea9 100644
--- a/spec/system/viewing_sidebar_mobile_spec.rb
+++ b/spec/system/viewing_sidebar_mobile_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Viewing sidebar mobile", type: :system, mobile: true do
+describe "Viewing sidebar mobile", mobile: true do
fab!(:user)
let(:sidebar_dropdown) { PageObjects::Components::SidebarHeaderDropdown.new }
let(:composer) { PageObjects::Components::Composer.new }
diff --git a/spec/system/viewing_sidebar_spec.rb b/spec/system/viewing_sidebar_spec.rb
index ab98671665d..c2786112ee0 100644
--- a/spec/system/viewing_sidebar_spec.rb
+++ b/spec/system/viewing_sidebar_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Viewing sidebar", type: :system do
+describe "Viewing sidebar" do
let(:sidebar) { PageObjects::Components::NavigationMenu::Sidebar.new }
context "as logged in user" do
diff --git a/spec/system/viewing_user_menu_spec.rb b/spec/system/viewing_user_menu_spec.rb
index e69f599b030..8a7c66847e4 100644
--- a/spec/system/viewing_user_menu_spec.rb
+++ b/spec/system/viewing_user_menu_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Viewing User Menu", system: true do
+RSpec.describe "Viewing User Menu" do
fab!(:user)
let(:user_menu) { PageObjects::Components::UserMenu.new }
diff --git a/spec/system/viewing_user_private_messages_spec.rb b/spec/system/viewing_user_private_messages_spec.rb
index 0a62d963d09..92d86f73418 100644
--- a/spec/system/viewing_user_private_messages_spec.rb
+++ b/spec/system/viewing_user_private_messages_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Viewing user private messages", type: :system do
+describe "Viewing user private messages" do
fab!(:user) { Fabricate(:user, username: "mIxed_caSE_usERNAME") }
fab!(:user2, :user)
diff --git a/spec/system/welcome_banner_spec.rb b/spec/system/welcome_banner_spec.rb
index 3077c1ae875..4699dc0cddb 100644
--- a/spec/system/welcome_banner_spec.rb
+++ b/spec/system/welcome_banner_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Welcome banner", type: :system do
+describe "Welcome banner" do
fab!(:current_user) { Fabricate(:user, seen_before: true) }
let(:banner) { PageObjects::Components::WelcomeBanner.new }
let(:search_page) { PageObjects::Pages::Search.new }
diff --git a/spec/system/wizard_spec.rb b/spec/system/wizard_spec.rb
index 409be593829..2c77670623e 100644
--- a/spec/system/wizard_spec.rb
+++ b/spec/system/wizard_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Wizard", type: :system do
+describe "Wizard" do
fab!(:admin)
let(:wizard_page) { PageObjects::Pages::Wizard.new }
diff --git a/themes/horizon/spec/system/composer_peek_spec.rb b/themes/horizon/spec/system/composer_peek_spec.rb
index 19ee4206ce8..3cbd65e7edc 100644
--- a/themes/horizon/spec/system/composer_peek_spec.rb
+++ b/themes/horizon/spec/system/composer_peek_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-describe "Composer peek", type: :system do
+describe "Composer peek" do
fab!(:current_user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:topic, :topic_with_op)
diff --git a/themes/horizon/spec/system/core_features_spec.rb b/themes/horizon/spec/system/core_features_spec.rb
index 3286350083b..6b71dbba912 100644
--- a/themes/horizon/spec/system/core_features_spec.rb
+++ b/themes/horizon/spec/system/core_features_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Core features", type: :system do
+RSpec.describe "Core features" do
fab!(:current_user) { Fabricate(:user, refresh_auto_groups: true) }
let(:composer) { PageObjects::Components::Composer.new }
diff --git a/themes/horizon/spec/system/horizon_high_level_spec.rb b/themes/horizon/spec/system/horizon_high_level_spec.rb
index 2c8652a7adc..314d4fda0a0 100644
--- a/themes/horizon/spec/system/horizon_high_level_spec.rb
+++ b/themes/horizon/spec/system/horizon_high_level_spec.rb
@@ -2,7 +2,7 @@
require_relative "page_objects/components/user_color_palette_selector"
-describe "Horizon theme | High level", type: :system do
+describe "Horizon theme | High level" do
let!(:theme) do
horizon_theme = upload_theme
ColorScheme
diff --git a/themes/horizon/spec/system/sidebar_topic_button_spec.rb b/themes/horizon/spec/system/sidebar_topic_button_spec.rb
index cde1e7df3ad..d816cc29ce4 100644
--- a/themes/horizon/spec/system/sidebar_topic_button_spec.rb
+++ b/themes/horizon/spec/system/sidebar_topic_button_spec.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-RSpec.describe "Sidebar New Topic Button", system: true do
+RSpec.describe "Sidebar New Topic Button" do
before { upload_theme }
fab!(:group)
fab!(:user) { Fabricate(:user, trust_level: 3, groups: [group]) }
diff --git a/themes/horizon/spec/system/user_color_palette_selector_spec.rb b/themes/horizon/spec/system/user_color_palette_selector_spec.rb
index d381f040393..895dbd4b97e 100644
--- a/themes/horizon/spec/system/user_color_palette_selector_spec.rb
+++ b/themes/horizon/spec/system/user_color_palette_selector_spec.rb
@@ -2,7 +2,7 @@
require_relative "page_objects/components/user_color_palette_selector"
-describe "Horizon theme | User color palette selector", type: :system do
+describe "Horizon theme | User color palette selector" do
let(:set_theme_as_default) { true }
let!(:theme) do
horizon_theme = upload_theme(set_theme_as_default: set_theme_as_default)