A platform for community discussion. Free, open, simple.
DEV: Enable Rails/FilePath rubocop rule (#40097)
Jarek Radosz48691ee58294
diff --git a/.rubocop.yml b/.rubocop.ymlindex 435e774ff1e..d406028e208 100644--- a/.rubocop.yml+++ b/.rubocop.yml@@ -68,3 +68,6 @@ Style/RedundantParentheses:Style/RedundantBegin:Enabled: true++Rails/FilePath:+ Enabled: truediff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rbindex d665d4570ec..b57fc035d60 100644--- a/app/controllers/admin/backups_controller.rb+++ b/app/controllers/admin/backups_controller.rb@@ -257,7 +257,7 @@ class Admin::BackupsController < Admin::AdminControllerprivatedef has_enough_space_on_disk?(size)- DiskSpace.free("#{Rails.root}/public/backups") > size+ DiskSpace.free("#{Rails.public_path.join("backups")}") > sizeenddef ensure_backups_enableddiff --git a/app/controllers/theme_javascripts_controller.rb b/app/controllers/theme_javascripts_controller.rbindex 5434bd06167..bacc09468f1 100644--- a/app/controllers/theme_javascripts_controller.rb+++ b/app/controllers/theme_javascripts_controller.rb@@ -1,7 +1,7 @@# frozen_string_literal: trueclass ThemeJavascriptsController < ApplicationController- DISK_CACHE_PATH = "#{Rails.root}/tmp/javascript-cache"- TESTS_DISK_CACHE_PATH = "#{Rails.root}/tmp/javascript-cache/tests"+ DISK_CACHE_PATH = "#{Rails.root.join("tmp/javascript-cache")}"+ TESTS_DISK_CACHE_PATH = "#{Rails.root.join("tmp/javascript-cache/tests")}"skip_before_action(:check_xhr,diff --git a/app/jobs/base.rb b/app/jobs/base.rbindex abe32acac5c..0078c8c3c87 100644--- a/app/jobs/base.rb+++ b/app/jobs/base.rb@@ -124,7 +124,7 @@ module Jobsenddef self.log_path- @@log_path ||= "#{Rails.root}/log/sidekiq.log"+ @@log_path ||= "#{Rails.root.join("log/sidekiq.log")}"enddef self.loggerdiff --git a/app/jobs/onceoff/migrate_custom_emojis.rb b/app/jobs/onceoff/migrate_custom_emojis.rbindex 62fdc6da450..c89f8e2b8ee 100644--- a/app/jobs/onceoff/migrate_custom_emojis.rb+++ b/app/jobs/onceoff/migrate_custom_emojis.rb@@ -5,7 +5,7 @@ module Jobsdef execute_onceoff(args)return if Rails.env.test?- Dir["#{Rails.root}/#{Emoji.base_directory}/*.{png,gif}"].each do |path|+ Dir["#{Rails.root.join("#{Emoji.base_directory}/*.{png,gif}")}"].each do |path|name = File.basename(path, File.extname(path))File.open(path) do |file|diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rbindex a8aadd11341..79e61527ee4 100644--- a/app/jobs/regular/pull_hotlinked_images.rb+++ b/app/jobs/regular/pull_hotlinked_images.rb@@ -249,7 +249,7 @@ module Jobsenddef available_disk_space- 100 - DiskSpace.percent_free("#{Rails.root}/public/uploads")+ 100 - DiskSpace.percent_free("#{Rails.public_path.join("uploads")}")endendenddiff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rbindex 983a4048f2b..59487a76760 100644--- a/app/models/color_scheme.rb+++ b/app/models/color_scheme.rb@@ -352,9 +352,9 @@ class ColorScheme < ActiveRecord::Basevalidate :no_edits_for_remote_copies, on: :updatevalidates_associated :color_scheme_colors- BASE_COLORS_FILE = "#{Rails.root}/app/assets/stylesheets/common/foundation/colors.scss"+ BASE_COLORS_FILE = "#{Rails.root.join("app/assets/stylesheets/common/foundation/colors.scss")}"COLOR_TRANSFORMATION_FILE =- "#{Rails.root}/app/assets/stylesheets/common/foundation/color_transformations.scss"+ "#{Rails.root.join("app/assets/stylesheets/common/foundation/color_transformations.scss")}"@mutex = Mutex.newdiff --git a/app/models/email_style.rb b/app/models/email_style.rbindex 4035584ae2d..ee0b62e462a 100644--- a/app/models/email_style.rb+++ b/app/models/email_style.rb@@ -28,8 +28,7 @@ class EmailStyleenddef self.default_template- @_default_template ||=- File.read(File.join(Rails.root, "app", "views", "email", "default_template.html"))+ @_default_template ||= File.read(Rails.root.join("app/views/email/default_template.html").to_s)enddef self.default_cssdiff --git a/app/models/invite.rb b/app/models/invite.rbindex 37f25017864..88560ffa038 100644--- a/app/models/invite.rb+++ b/app/models/invite.rb@@ -306,13 +306,7 @@ class Invite < ActiveRecord::Baseenddef self.base_directory- File.join(- Rails.root,- "public",- "uploads",- "csv",- RailsMultisite::ConnectionManagement.current_db,- )+ Rails.public_path.join("uploads", "csv", RailsMultisite::ConnectionManagement.current_db).to_senddef ensure_max_redemptions_alloweddiff --git a/app/models/locale_site_setting.rb b/app/models/locale_site_setting.rbindex 704690c6d9d..a90bb8fdfd5 100644--- a/app/models/locale_site_setting.rb+++ b/app/models/locale_site_setting.rb@@ -25,7 +25,7 @@ class LocaleSiteSetting < EnumSiteSetting@lock.synchronize do@language_names ||=begin- names = YAML.safe_load(File.read(File.join(Rails.root, "config", "locales", "names.yml")))+ names = YAML.safe_load(File.read(Rails.root.join("config/locales/names.yml").to_s))DiscoursePluginRegistry.locales.each do |locale, options|if !names.key?(locale) && options[:name] && options[:nativeName]@@ -44,7 +44,7 @@ class LocaleSiteSetting < EnumSiteSettingbeginlocales =Dir- .glob(File.join(Rails.root, "config", "locales", "client.*.yml"))+ .glob(Rails.root.join("config/locales/client.*.yml").to_s).map { |x| x.split(".")[-2] }locales += DiscoursePluginRegistry.locales.keysdiff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rbindex 28a3b017b1e..0501e03b009 100644--- a/app/models/optimized_image.rb+++ b/app/models/optimized_image.rb@@ -254,7 +254,7 @@ class OptimizedImage < ActiveRecord::Base-interlacenone-profile- #{File.join(Rails.root, "vendor", "data", "RT_sRGB.icm")}+ #{Rails.root.join("vendor/data/RT_sRGB.icm")}#{to}],)@@ -283,7 +283,7 @@ class OptimizedImage < ActiveRecord::Base-interlacenone-profile- #{File.join(Rails.root, "vendor", "data", "RT_sRGB.icm")}+ #{Rails.root.join("vendor/data/RT_sRGB.icm")}}instructions << "-quality" << opts[:quality].to_s if opts[:quality]@@ -310,7 +310,7 @@ class OptimizedImage < ActiveRecord::Base-resize#{dimensions}-profile- #{File.join(Rails.root, "vendor", "data", "RT_sRGB.icm")}+ #{Rails.root.join("vendor/data/RT_sRGB.icm")}#{to}}enddiff --git a/app/models/site_setting.rb b/app/models/site_setting.rbindex 29634a0c044..336fa22b94d 100644--- a/app/models/site_setting.rb+++ b/app/models/site_setting.rb@@ -116,7 +116,7 @@ class SiteSetting < ActiveRecord::Baseendend- load_settings(File.join(Rails.root, "config", "site_settings.yml"))+ load_settings(Rails.root.join("config/site_settings.yml").to_s)if Rails.env.test?SAMPLE_TEST_PLUGIN =@@ -127,7 +127,7 @@ class SiteSetting < ActiveRecord::BaseDiscourse.plugins_by_name[SAMPLE_TEST_PLUGIN.name] = SAMPLE_TEST_PLUGINload_settings(- File.join(Rails.root, "spec", "support", "sample_plugin_site_settings.yml"),+ Rails.root.join("spec/support/sample_plugin_site_settings.yml").to_s,plugin: SAMPLE_TEST_PLUGIN.name,)end@@ -136,7 +136,7 @@ class SiteSetting < ActiveRecord::Baseallowed_plugins = GlobalSetting.plugins_to_loadplugin_allowed = ->(name) { allowed_plugins.nil? || allowed_plugins.include?(name) }- Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|+ Dir[Rails.root.join("plugins/*/config/settings.yml").to_s].each do |file|plugin_name = file.split("/")[-3]load_settings(file, plugin: plugin_name) if plugin_allowed.call(plugin_name)end@@ -144,7 +144,7 @@ class SiteSetting < ActiveRecord::Base# Sometimes plugins need to define their own fake site settings for testingif Rails.env.test?Dir[- File.join(Rails.root, "plugins", "*", "spec", "support", "dummy_plugin_site_settings.yml")+ Rails.root.join("plugins/*/spec/support/dummy_plugin_site_settings.yml").to_s].each do |file|plugin_name = file.split("/")[-4]load_settings(file, plugin: plugin_name) if plugin_allowed.call(plugin_name)diff --git a/app/models/user_export.rb b/app/models/user_export.rbindex 57b91258c2f..66ab3b80af8 100644--- a/app/models/user_export.rb+++ b/app/models/user_export.rb@@ -35,13 +35,10 @@ class UserExport < ActiveRecord::Baseenddef self.base_directory- File.join(- Rails.root,- "public",- "uploads",- "csv_exports",- RailsMultisite::ConnectionManagement.current_db,- )+ Rails+ .public_path+ .join("uploads", "csv_exports", RailsMultisite::ConnectionManagement.current_db)+ .to_sendenddiff --git a/app/services/theme_settings_migrations_runner.rb b/app/services/theme_settings_migrations_runner.rbindex e52e1c1ce0f..44943defbef 100644--- a/app/services/theme_settings_migrations_runner.rb+++ b/app/services/theme_settings_migrations_runner.rb@@ -65,7 +65,7 @@ class ThemeSettingsMigrationsRunnerdef self.loader_js_lib_content@loader_js_lib_content ||=File.read(- File.join(Rails.root, "frontend/discourse/node_modules/loader.js/dist/loader/loader.js"),+ Rails.root.join("frontend/discourse/node_modules/loader.js/dist/loader/loader.js").to_s,)enddiff --git a/config/application.rb b/config/application.rbindex f62b5dc0992..6c3ed19d033 100644--- a/config/application.rb+++ b/config/application.rb@@ -123,7 +123,7 @@ module Discourse# auto-load locales in plugins# NOTE: we load both client & server locales since some might be used by PrettyText- config.i18n.load_path += Dir["#{Rails.root}/plugins/*/config/locales/*.yml"]+ config.i18n.load_path += Dir["#{Rails.root.join("plugins/*/config/locales/*.yml")}"]# Configure the default encoding used in templates for Ruby 1.9.config.encoding = "utf-8"diff --git a/config/environments/test.rb b/config/environments/test.rbindex 3453948ffe8..0ece41e2fe0 100644--- a/config/environments/test.rb+++ b/config/environments/test.rb@@ -65,7 +65,7 @@ Discourse::Application.configure do# Catch missing translations during test runs.config.i18n.raise_on_missing_translations = true- config.i18n.load_path += Dir[Rails.root.join("spec", "support", "locales", "**", "*.yml")]+ config.i18n.load_path += Dir[Rails.root.join("spec/support/locales/**/*.yml")]config.after_initialize doActiveRecord::LogSubscriber.backtrace_cleaner.add_silencer do |line|diff --git a/config/initializers/000-development_reload_warnings.rb b/config/initializers/000-development_reload_warnings.rbindex e398d101cf2..29fa9d2f8bf 100644--- a/config/initializers/000-development_reload_warnings.rb+++ b/config/initializers/000-development_reload_warnings.rb@@ -6,15 +6,15 @@if Rails.env.development? && !Rails.configuration.cache_classes && Discourse.running_in_rack? &&!ENV["CI"]paths = [- *Dir["#{Rails.root}/app/*"].reject { |path| path.end_with? "/assets" },- "#{Rails.root}/config",- "#{Rails.root}/lib",- "#{Rails.root}/plugins",+ *Dir["#{Rails.root.join("app/*")}"].reject { |path| path.end_with? "/assets" },+ "#{Rails.root.join("config")}",+ "#{Rails.root.join("lib")}",+ "#{Rails.root.join("plugins")}",]# Find symlinked plugins, and add their real paths to the watch list.paths +=- Dir["#{Rails.root}/plugins/*"]+ Dir["#{Rails.root.join("plugins/*")}"].select { |path| File.symlink? path }.map { |path| File.expand_path(File.readlink(path), File.dirname(path)) }diff --git a/config/initializers/002-freedom_patches.rb b/config/initializers/002-freedom_patches.rbindex b957e037114..302f6798cab 100644--- a/config/initializers/002-freedom_patches.rb+++ b/config/initializers/002-freedom_patches.rb@@ -2,11 +2,11 @@# Multisite freedom patch defines RailsMultisite::DiscoursePatches.config which is used by 200-first_middlewares.rb# Therefore it can not be postponed with .to_prepare-RUN_WITHOUT_PREPARE = ["#{Rails.root}/lib/freedom_patches/rails_multisite.rb"]+RUN_WITHOUT_PREPARE = ["#{Rails.root.join("lib/freedom_patches/rails_multisite.rb")}"]RUN_WITHOUT_PREPARE.each { |path| require(path) }Rails.application.reloader.to_prepare do- Dir["#{Rails.root}/lib/freedom_patches/*.rb"].each do |f|+ Dir["#{Rails.root.join("lib/freedom_patches/*.rb")}"].each do |f|next if RUN_WITHOUT_PREPARE.any? { |path| path == f }require(f)enddiff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rbindex 8147a281753..a96988a7cfd 100644--- a/config/initializers/100-logster.rb+++ b/config/initializers/100-logster.rb@@ -137,7 +137,7 @@ Discourse.plugins.each do |plugin|next if !plugin.metadata.urlLogster.config.project_directories << {- path: "#{Rails.root}/plugins/#{plugin.directory_name}",+ path: "#{Rails.root.join("plugins/#{plugin.directory_name}")}",url: plugin.metadata.url,}enddiff --git a/config/initializers/100-sidekiq.rb b/config/initializers/100-sidekiq.rbindex 639e2978004..ddd3c278e7b 100644--- a/config/initializers/100-sidekiq.rb+++ b/config/initializers/100-sidekiq.rb@@ -78,7 +78,9 @@ Sidekiq.strict_args!Rails.application.config.to_prepare do# Ensure that scheduled jobs are loaded before mini_scheduler is configured.- Dir.glob("#{Rails.root}/app/jobs/scheduled/*.rb") { |f| require(f) } if Rails.env.development?+ if Rails.env.development?+ Dir.glob("#{Rails.root.join("app/jobs/scheduled/*.rb")}") { |f| require(f) }+ endMiniScheduler.configure do |config|config.redis = DiscourseRedis.new(Discourse.sidekiq_redis_config)diff --git a/config/initializers/100-verify_config.rb b/config/initializers/100-verify_config.rbindex 5d779b6aac6..c379a4d0a43 100644--- a/config/initializers/100-verify_config.rb+++ b/config/initializers/100-verify_config.rb@@ -17,7 +17,7 @@ if defined?(Rails::Server) && Rails.env.production? # Only run these checks whenraise "Invalid host_names in database.yml"end- if !Dir.glob(File.join(Rails.root, "public", "assets", "application*.js")).present?+ if !Dir.glob(Rails.public_path.join("assets/application*.js").to_s).present?puts <<~TEXTAssets have not been precompiled. Please run the following commanddiff --git a/config/initializers/999-themes.rb b/config/initializers/999-themes.rbindex bef5cd9e6ac..106cccea2c8 100644--- a/config/initializers/999-themes.rb+++ b/config/initializers/999-themes.rb@@ -7,9 +7,9 @@ Rails.application.config.after_initialize do |config|class Watcherdef watchlistener =- Listen.to("#{Rails.root}/themes") do |modified, added, removed|+ Listen.to("#{Rails.root.join("themes")}") do |modified, added, removed|filepath = modified.first || added.first || removed.first- theme_name = filepath.gsub("#{Rails.root}/themes/", "").split("/").first+ theme_name = filepath.gsub("#{Rails.root.join("themes/")}", "").split("/").firsttheme = Theme.find(Theme::CORE_THEMES[theme_name])Rails.logger.info "Theme folder changed. Syncing #{theme_name}..."@@ -38,7 +38,8 @@ Rails.application.config.after_initialize do |config|theme.theme_fields.where(- name: filepath.gsub("#{Rails.root}/themes/#{theme.name.downcase}/javascripts/", ""),+ name:+ filepath.gsub("#{Rails.root.join("themes/#{theme.name.downcase}/javascripts/")}", ""),type_id: ThemeField.types[:js],).firstdiff --git a/config/initializers/assets.rb b/config/initializers/assets.rbindex cd6b61af002..ca834cc3e86 100644--- a/config/initializers/assets.rb+++ b/config/initializers/assets.rb@@ -10,19 +10,19 @@ Rails.application.config.assets.version = "2-#{GlobalSetting.asset_url_salt}"# Add additional assets to the asset load path.Rails.application.config.assets.paths.push(- "#{Rails.root}/public/javascripts",- "#{Rails.root}/frontend/discourse/dist/assets",+ "#{Rails.public_path.join("javascripts")}",+ "#{Rails.root.join("frontend/discourse/dist/assets")}",)Rails.application.config.assets.paths.push(- *Discourse.plugins.map { |p| "#{Rails.root}/app/assets/generated/#{p.directory_name}/" },+ *Discourse.plugins.map { |p| "#{Rails.root.join("app/assets/generated/#{p.directory_name}/")}" },)# These paths are added automatically by propshaft, but we don't want themRails.application.config.assets.excluded_paths.push(- "#{Rails.root}/app/assets/generated",- "#{Rails.root}/app/assets/javascripts",- "#{Rails.root}/app/assets/stylesheets",+ "#{Rails.root.join("app/assets/generated")}",+ "#{Rails.root.join("app/assets/javascripts")}",+ "#{Rails.root.join("app/assets/stylesheets")}",)# We don't need/want most of Propshaft's preprocessing. Only keep the JS sourcemap handlerdiff --git a/db/migrate/20200517140915_update_deprecated_icon_names.rb b/db/migrate/20200517140915_update_deprecated_icon_names.rbindex 4655bbe23e2..8669e73dd7a 100644--- a/db/migrate/20200517140915_update_deprecated_icon_names.rb+++ b/db/migrate/20200517140915_update_deprecated_icon_names.rb@@ -11,9 +11,10 @@ class UpdateDeprecatedIconNames < ActiveRecord::Migration[6.0]def migrate_value(dir)icons =- File.open("#{Rails.root}/db/migrate/20200517140915_fa4_renames.json", "r:UTF-8") do |f|- JSON.parse(f.read)- end+ File.open(+ "#{Rails.root.join("db/migrate/20200517140915_fa4_renames.json")}",+ "r:UTF-8",+ ) { |f| JSON.parse(f.read) }icons.each do |key, value|from = dir == "up" ? key : valuediff --git a/lib/asset_processor.rb b/lib/asset_processor.rbindex ed354fe2e98..d52b5ebfbbe 100644--- a/lib/asset_processor.rb+++ b/lib/asset_processor.rb@@ -79,7 +79,7 @@ class AssetProcessorenddef self.with_file_lock(&block)- lock_path = "#{Rails.root}/#{LOCK_FILE}"+ lock_path = "#{Rails.root.join("#{LOCK_FILE}")}"FileUtils.mkdir_p(File.dirname(lock_path))File.open(lock_path, File::CREAT | File::RDWR) do |lock_file|lock_file.flock(File::LOCK_EX)diff --git a/lib/autospec/reload_css.rb b/lib/autospec/reload_css.rbindex f8fb530aa8e..6dffdc9a54a 100644--- a/lib/autospec/reload_css.rb+++ b/lib/autospec/reload_css.rb@@ -39,7 +39,7 @@ class Autospec::ReloadCssendpaths.map! do |p|hash = nil- fullpath = "#{Rails.root}/#{p}"+ fullpath = "#{Rails.root.join("#{p}")}"hash = Digest::MD5.hexdigest(File.read(fullpath)) if File.exist?(fullpath)p = p.sub(/\.sass\.erb/, "")p = p.sub(/\.sass/, "")diff --git a/lib/backup_restore.rb b/lib/backup_restore.rbindex 88e5f86ad02..348fbf85793 100644--- a/lib/backup_restore.rb+++ b/lib/backup_restore.rb@@ -190,7 +190,7 @@ module BackupRestoreenddef self.spawn_process!(type, user_id, opts)- script = File.join(Rails.root, "script", "spawn_backup_restore.rb")+ script = Rails.root.join("script/spawn_backup_restore.rb").to_scommand = ["bundle", "exec", "ruby", script, type, user_id, opts.to_json].map(&:to_s)pid = spawn({ "RAILS_DB" => RailsMultisite::ConnectionManagement.current_db }, *command)diff --git a/lib/backup_restore/creator.rb b/lib/backup_restore/creator.rbindex 0691233d043..1e5343ce0e6 100644--- a/lib/backup_restore/creator.rb+++ b/lib/backup_restore/creator.rb@@ -261,7 +261,7 @@ module BackupRestoreenddef local_uploads_directory- @local_uploads_directory ||= File.join(Rails.root, "public", Discourse.store.upload_path)+ @local_uploads_directory ||= Rails.public_path.join(Discourse.store.upload_path).to_senddef has_local_uploads?@@ -291,7 +291,7 @@ module BackupRestoreupload_directory,failure_message: "Failed to archive uploads.",success_status_codes: [0, 1],- chdir: File.join(Rails.root, "public"),+ chdir: Rails.public_path.to_s,)elselog "No local uploads found. Skipping archiving of local uploads..."diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rbindex 92cc38773ab..b1ad94d5da0 100644--- a/lib/backup_restore/database_restorer.rb+++ b/lib/backup_restore/database_restorer.rb@@ -54,7 +54,7 @@ module BackupRestoreDir[Rails.root.join(Migration::SafeMigrate.post_migration_path, "**/*.rb")] +Dir[Rails.root.join("db/migrate/*.rb")] +Dir[Rails.root.join("plugins/**", Migration::SafeMigrate.post_migration_path, "**/*.rb")] +- Dir[Rails.root.join("plugins/**", "db/migrate/*.rb")]+ Dir[Rails.root.join("plugins/**/db/migrate/*.rb")]endprotecteddiff --git a/lib/backup_restore/local_backup_store.rb b/lib/backup_restore/local_backup_store.rbindex 3958ca1a7ed..f3abe3604b5 100644--- a/lib/backup_restore/local_backup_store.rb+++ b/lib/backup_restore/local_backup_store.rb@@ -4,7 +4,7 @@ module BackupRestoreclass LocalBackupStore < BackupStoredef self.base_directory(db: nil, root_directory: nil)current_db = db || RailsMultisite::ConnectionManagement.current_db- root_directory ||= File.join(Rails.root, "public", "backups")+ root_directory ||= Rails.public_path.join("backups").to_sbase_directory = File.join(root_directory, current_db)FileUtils.mkdir_p(base_directory) unless Dir.exist?(base_directory)diff --git a/lib/common_passwords.rb b/lib/common_passwords.rbindex a8ac6c33a87..668fd674f74 100644--- a/lib/common_passwords.rb+++ b/lib/common_passwords.rb@@ -12,7 +12,7 @@# Discourse.redis.without_namespace.del CommonPasswords::LIST_KEYclass CommonPasswords- PASSWORD_FILE = File.join(Rails.root, "lib", "common_passwords", "10-char-common-passwords.txt")+ PASSWORD_FILE = Rails.root.join("lib/common_passwords/10-char-common-passwords.txt").to_sLIST_KEY = "discourse-common-passwords"@mutex = Mutex.newdiff --git a/lib/directory_helper.rb b/lib/directory_helper.rbindex f8bcc9aa64e..d8e6cb0fea4 100644--- a/lib/directory_helper.rb+++ b/lib/directory_helper.rb@@ -3,7 +3,7 @@module DirectoryHelperdef tmp_directory(prefix)directory_cache[prefix] ||= begin- f = File.join(Rails.root, "tmp", Time.now.strftime("#{prefix}%Y%m%d%H%M%S"))+ f = Rails.root.join("tmp", Time.now.strftime("#{prefix}%Y%m%d%H%M%S")).to_sFileUtils.mkdir_p(f) if Dir[f].blank?fenddiff --git a/lib/discourse.rb b/lib/discourse.rbindex 681aa204f74..a87ffea1c55 100644--- a/lib/discourse.rb+++ b/lib/discourse.rb@@ -86,8 +86,8 @@ module Discourserescue Errno::ENOENTend- FileUtils.mkdir_p(File.join(Rails.root, "tmp"))- temp_destination = File.join(Rails.root, "tmp", SecureRandom.hex)+ FileUtils.mkdir_p(Rails.root.join("tmp").to_s)+ temp_destination = Rails.root.join("tmp", SecureRandom.hex).to_sFile.open(temp_destination, "w") do |fd|fd.write(contents)@@ -105,8 +105,8 @@ module Discourserescue Errno::ENOENT, Errno::EINVALend- FileUtils.mkdir_p(File.join(Rails.root, "tmp"))- temp_destination = File.join(Rails.root, "tmp", SecureRandom.hex)+ FileUtils.mkdir_p(Rails.root.join("tmp").to_s)+ temp_destination = Rails.root.join("tmp", SecureRandom.hex).to_sexecute_command("ln", "-s", source, temp_destination)# Remove existing symlink first to prevent FileUtils.mv from moving@@ -343,7 +343,7 @@ module Discourse@plugins = []@plugins_by_name = {}Plugin::Instance- .find_all("#{Rails.root}/plugins")+ .find_all("#{Rails.root.join("plugins")}").each do |p|v = p.metadata.required_version || Discourse::VERSION::STRINGif Discourse.has_needed_version?(Discourse::VERSION::STRING, v)diff --git a/lib/discourse_dev/config.rb b/lib/discourse_dev/config.rbindex 726f17ef2b0..379a2059052 100644--- a/lib/discourse_dev/config.rb+++ b/lib/discourse_dev/config.rb@@ -8,8 +8,8 @@ module DiscourseDevattr_reader :config, :file_pathdef initialize- default_file_path = File.join(Rails.root, "config", "dev_defaults.yml")- @file_path = File.join(Rails.root, "config", "dev.yml")+ default_file_path = Rails.root.join("config/dev_defaults.yml").to_s+ @file_path = Rails.root.join("config/dev.yml").to_s# https://stackoverflow.com/questions/71332602/upgrading-to-ruby-3-1-causes-psychdisallowedclass-exception-when-using-yaml-lodefault_config = YAML.load_file(default_file_path, permitted_classes: [Date])diff --git a/lib/discourse_ip_info.rb b/lib/discourse_ip_info.rbindex 0ccbdc5d7bb..534e90253d1 100644--- a/lib/discourse_ip_info.rb+++ b/lib/discourse_ip_info.rb@@ -17,7 +17,7 @@ class DiscourseIpInfoenddef self.path- @path ||= File.join(Rails.root, "vendor", "data")+ @path ||= Rails.root.join("vendor/data").to_senddef self.mmdb_path(name)diff --git a/lib/disk_space.rb b/lib/disk_space.rbindex 6ddb9365fc1..71b8bfd17af 100644--- a/lib/disk_space.rb+++ b/lib/disk_space.rb@@ -30,7 +30,7 @@ class DiskSpaceenddef self.uploads_path- "#{Rails.root}/public/#{Discourse.store.upload_path}"+ "#{Rails.root.join("public/#{Discourse.store.upload_path}")}"endprivate_class_method :uploads_pathenddiff --git a/lib/email_templates_finder.rb b/lib/email_templates_finder.rbindex 44c76d83917..26b0bacc2b8 100644--- a/lib/email_templates_finder.rb+++ b/lib/email_templates_finder.rb@@ -2,7 +2,7 @@class EmailTemplatesFinderdef self.list- path = File.join(Rails.root, "config", "locales", "server.en.yml")+ path = Rails.root.join("config/locales/server.en.yml").to_syaml = YAML.load_file(path, aliases: true)new(yaml).listenddiff --git a/lib/ember_cli.rb b/lib/ember_cli.rbindex 56f5dc5ecbe..d836c8de782 100644--- a/lib/ember_cli.rb+++ b/lib/ember_cli.rb@@ -5,7 +5,7 @@ class EmberCli < ActiveSupport::CurrentAttributesattribute :request_cachedef self.dist_dir- "#{Rails.root}/frontend/discourse/dist"+ "#{Rails.root.join("frontend/discourse/dist")}"enddef self.assetsdiff --git a/lib/faker/discourse_markdown.rb b/lib/faker/discourse_markdown.rbindex 220fe2bf90d..d4a69eb26f1 100644--- a/lib/faker/discourse_markdown.rb+++ b/lib/faker/discourse_markdown.rb@@ -63,7 +63,7 @@ module Fakerenddef image_cache_dir- @image_cache_dir ||= ::File.join(Rails.root, "tmp", "discourse_dev", "images")+ @image_cache_dir ||= Rails.root.join("tmp/discourse_dev/images").to_senddef load_image(image)diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rbindex f3628038dcb..4b1315f114c 100644--- a/lib/file_store/base_store.rb+++ b/lib/file_store/base_store.rb@@ -155,9 +155,9 @@ module FileStoreCACHE_DIR =if Rails.env.test?- "#{Rails.root}/tmp/download_cache_test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}/"+ "#{Rails.root.join("tmp/download_cache_test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}/")}"else- "#{Rails.root}/tmp/download_cache/"+ "#{Rails.root.join("tmp/download_cache/")}"endCACHE_MAXIMUM_SIZE = 500CACHE_EVICT_COUNT = 100diff --git a/lib/file_store/local_store.rb b/lib/file_store/local_store.rbindex 3a6f1137557..edfdd921310 100644--- a/lib/file_store/local_store.rb+++ b/lib/file_store/local_store.rb@@ -96,7 +96,7 @@ module FileStoreenddef public_dir- File.join(Rails.root, "public")+ Rails.public_path.to_senddef tombstone_dirdiff --git a/lib/highlight_js.rb b/lib/highlight_js.rbindex d535309976e..b16c0556070 100644--- a/lib/highlight_js.rb+++ b/lib/highlight_js.rb@@ -1,7 +1,7 @@# frozen_string_literal: truemodule HighlightJs- HIGHLIGHTJS_DIR = "#{Rails.root}/frontend/discourse/node_modules/@highlightjs/cdn-assets/"+ HIGHLIGHTJS_DIR = "#{Rails.root.join("frontend/discourse/node_modules/@highlightjs/cdn-assets/")}"VERSION = 1 # bump to invalidate caches following core changesdef self.languagesdiff --git a/lib/i18n/locale_file_checker.rb b/lib/i18n/locale_file_checker.rbindex 9e2edbd52c6..3f0e8c0147b 100644--- a/lib/i18n/locale_file_checker.rb+++ b/lib/i18n/locale_file_checker.rb@@ -45,7 +45,9 @@ class LocaleFileCheckerFORCE_PLURAL_COUNT_LOCALES = %w[bs fr lt lv ru sl sr uk]def locale_files- YML_DIRS.map { |dir| Dir["#{Rails.root}/#{dir}/{client,server}.#{@locale}.yml"] }.flatten+ YML_DIRS+ .map { |dir| Dir["#{Rails.root.join("#{dir}/{client,server}.#{@locale}.yml")}"] }+ .flattenenddef reference_file(path)@@ -172,7 +174,7 @@ class LocaleFileCheckerdef plural_keys# rubocop:disable Security/Eval@plural_keys ||=- eval(File.read("#{Rails.root}/#{PLURALS_FILE}"))+ eval(File.read("#{Rails.root.join("#{PLURALS_FILE}")}")).map { |locale, value| [locale.to_s, value[:i18n][:plural][:keys].map(&:to_s)] }.to_henddiff --git a/lib/import_export/importer.rb b/lib/import_export/importer.rbindex 91a94e11da6..69e56b8ba4a 100644--- a/lib/import_export/importer.rb+++ b/lib/import_export/importer.rb@@ -1,6 +1,6 @@# frozen_string_literal: true-require File.join(Rails.root, "script", "import_scripts", "base.rb")+require Rails.root.join("script/import_scripts/base.rb").to_smodule ImportExportclass Importer < ImportScripts::Basediff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rbindex 22e13c6f5a9..ef8339caac4 100644--- a/lib/js_locale_helper.rb+++ b/lib/js_locale_helper.rb@@ -2,7 +2,7 @@module JsLocaleHelperdef self.plugin_client_files(locale_str)- files = Dir["#{Rails.root}/plugins/*/config/locales/client*.#{locale_str}.yml"]+ files = Dir["#{Rails.root.join("plugins/*/config/locales/client*.#{locale_str}.yml")}"]I18n::Backend::DiscourseI18n.sort_locale_files(files)end@@ -35,7 +35,7 @@ module JsLocaleHelperlocale_str = locale.to_s# load default translations- yml_file = "#{Rails.root}/config/locales/client.#{locale_str}.yml"+ yml_file = "#{Rails.root.join("config/locales/client.#{locale_str}.yml")}"if File.exist?(yml_file)translations = YAML.load_file(yml_file)else@@ -275,10 +275,11 @@ module JsLocaleHelperdef self.find_moment_locale(locale_chain, timezone_names: false)if timezone_names- path = "#{Rails.root}/node_modules/@discourse/moment-timezone-names-translations/locales"+ path =+ "#{Rails.root.join("node_modules/@discourse/moment-timezone-names-translations/locales")}"type = :moment_js_timezoneselse- path = "#{Rails.root}/frontend/discourse/node_modules/moment/locale"+ path = "#{Rails.root.join("frontend/discourse/node_modules/moment/locale")}"type = :moment_jsenddiff --git a/lib/middleware/missing_avatars.rb b/lib/middleware/missing_avatars.rbindex b0f6d18a14d..f26b12db94c 100644--- a/lib/middleware/missing_avatars.rb+++ b/lib/middleware/missing_avatars.rb@@ -12,9 +12,9 @@ module Middlewaredef call(env)if (env["REQUEST_PATH"] =~ %r{\A/uploads/default/avatars})- path = "#{Rails.root}/public#{env["REQUEST_PATH"]}"+ path = "#{Rails.root.join("public#{env["REQUEST_PATH"]}")}"unless File.exist?(path)- default_image = "#{Rails.root}/public/images/d-logo-sketch-small.png"+ default_image = "#{Rails.public_path.join("images/d-logo-sketch-small.png")}"return 200, { "Content-Type" => "image/png" }, [File.read(default_image)]endenddiff --git a/lib/onebox.rb b/lib/onebox.rbindex d5d1b9ae672..cab8e29674b 100644--- a/lib/onebox.rb+++ b/lib/onebox.rb@@ -17,7 +17,7 @@ module Oneboxconnect_timeout: 5,timeout: 10,max_download_kb: 2048, # 2MB- load_paths: [File.join(Rails.root, "lib/onebox/templates")],+ load_paths: [Rails.root.join("lib/onebox/templates").to_s],allowed_ports: [80, 443],allowed_schemes: %w[http https],sanitize_config: SanitizeConfig::ONEBOX,diff --git a/lib/oneboxer.rb b/lib/oneboxer.rbindex 3aa54acab02..9bc548c7f4b 100644--- a/lib/oneboxer.rb+++ b/lib/oneboxer.rb@@ -2,7 +2,7 @@require "uri"-Dir["#{Rails.root}/lib/onebox/engine/*_onebox.rb"].sort.each { |f| require f }+Dir["#{Rails.root.join("lib/onebox/engine/*_onebox.rb")}"].sort.each { |f| require f }module OneboxerONEBOX_CSS_CLASS = "onebox"@@ -604,7 +604,7 @@ module Oneboxerdef self.template(template_name)@template_cache ||= {}@template_cache[template_name] ||= begin- full_path = "#{Rails.root}/lib/onebox/templates/#{template_name}.mustache"+ full_path = "#{Rails.root.join("lib/onebox/templates/#{template_name}.mustache")}"File.read(full_path)endenddiff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rbindex 60fa115c048..77556003188 100644--- a/lib/plugin/instance.rb+++ b/lib/plugin/instance.rb@@ -74,7 +74,7 @@ class Plugin::Instancedef resolved_dir@resolved_dir ||=if File.symlink?(root_dir)- File.expand_path(File.readlink(root_dir), "#{Rails.root}/plugins")+ File.expand_path(File.readlink(root_dir), "#{Rails.root.join("plugins")}")elseroot_dirend@@ -1524,7 +1524,7 @@ class Plugin::Instanceprotecteddef self.js_path- File.expand_path "#{Rails.root}/app/assets/generated"+ File.expand_path "#{Rails.root.join("app/assets/generated")}"enddef extra_js_file_path@@ -1547,7 +1547,7 @@ class Plugin::Instanceenddef ensure_images_symlink!- link_from = "#{Rails.root}/app/assets/generated/#{directory_name}/images"+ link_from = "#{Rails.root.join("app/assets/generated/#{directory_name}/images")}"link_target = "#{directory}/assets/images"if Dir.exist? link_targetdiff --git a/lib/plugin/js_manager.rb b/lib/plugin/js_manager.rbindex 836732290b8..94faf7b0dd7 100644--- a/lib/plugin/js_manager.rb+++ b/lib/plugin/js_manager.rb@@ -24,7 +24,8 @@ module Plugindef self.read_manifest(plugin_directory_name)maybe_cache("manifest_#{plugin_directory_name}") do- manifest_path = "#{Rails.root}/app/assets/generated/#{plugin_directory_name}/manifest.json"+ manifest_path =+ "#{Rails.root.join("app/assets/generated/#{plugin_directory_name}/manifest.json")}"JSON.parse(File.read(manifest_path))rescue Errno::ENOENT{}@@ -61,7 +62,7 @@ module Pluginenddef compile_js_bundle(plugin)- base_output_dir = "#{Rails.root}/app/assets/generated/#{plugin.directory_name}"+ base_output_dir = "#{Rails.root.join("app/assets/generated/#{plugin.directory_name}")}"js_dir = "#{base_output_dir}/js/plugins"map_dir = "#{base_output_dir}/map/plugins"diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rbindex 3e340ae3c83..68ffb01cf62 100644--- a/lib/plugin/metadata.rb+++ b/lib/plugin/metadata.rb@@ -6,8 +6,7 @@ endclass Plugin::Metadata# from config/official_plugins.json- OFFICIAL_PLUGINS =- Set.new(JSON.load_file(File.join(Rails.root, "config", "official_plugins.json")))+ OFFICIAL_PLUGINS = Set.new(JSON.load_file(Rails.root.join("config/official_plugins.json").to_s))FIELDS = %i[name about version authors contact_emails url required_version meta_topic_id label]attr_accessor(*FIELDS)diff --git a/lib/pretty_text.rb b/lib/pretty_text.rbindex 7cd0428a257..3e7a79f425d 100644--- a/lib/pretty_text.rb+++ b/lib/pretty_text.rb@@ -82,13 +82,13 @@ module PrettyTextctx.attach("__helpers.#{method}", PrettyText::Helpers.method(method))end- root_path = "#{Rails.root}/frontend"- d_node_modules = "#{Rails.root}/frontend/discourse/node_modules"- md_node_modules = "#{Rails.root}/frontend/discourse-markdown-it/node_modules"+ root_path = "#{Rails.root.join("frontend")}"+ d_node_modules = "#{Rails.root.join("frontend/discourse/node_modules")}"+ md_node_modules = "#{Rails.root.join("frontend/discourse-markdown-it/node_modules")}"ctx.load("#{d_node_modules}/loader.js/dist/loader/loader.js")ctx.load("#{md_node_modules}/markdown-it/dist/markdown-it.js")ctx.load("#{md_node_modules}/xss/dist/xss.js")- ctx.load("#{Rails.root}/lib/pretty_text/vendor-shims.js")+ ctx.load("#{Rails.root.join("lib/pretty_text/vendor-shims.js")}")ctx_load_directory(ctx: ctx,@@ -119,7 +119,7 @@ module PrettyText)end- ctx.load("#{Rails.root}/lib/pretty_text/shims.js")+ ctx.load("#{Rails.root.join("lib/pretty_text/shims.js")}")ctx.eval("__setUnicode(#{Emoji.unicode_replacements_json})")Discourse.plugins.each do |plugin|diff --git a/lib/release_utils.rb b/lib/release_utils.rbindex 1ca1c3db053..cdafaeb9fda 100644--- a/lib/release_utils.rb+++ b/lib/release_utils.rb@@ -192,7 +192,7 @@ module ReleaseUtilsdef self.with_clean_worktree(origin_branch)git "fetch", "origin", origin_branch- path = "#{Rails.root}/tmp/version-bump-worktree-#{SecureRandom.hex}"+ path = "#{Rails.root.join("tmp/version-bump-worktree-#{SecureRandom.hex}")}"beginFileUtils.mkdir_p(path)git "worktree", "add", "--detach", path, "origin/#{origin_branch}"diff --git a/lib/seed_data/topics.rb b/lib/seed_data/topics.rbindex d44187c9eb6..5f9cb2c892f 100644--- a/lib/seed_data/topics.rb+++ b/lib/seed_data/topics.rb@@ -273,7 +273,7 @@ module SeedDataif !quick_start_filename || !File.exist?(quick_start_filename)# TODO Make the quick start guide translatable- quick_start_filename = File.join(Rails.root, "docs", "ADMIN-QUICK-START-GUIDE.md")+ quick_start_filename = Rails.root.join("docs/ADMIN-QUICK-START-GUIDE.md").to_sendcontent = File.read(quick_start_filename)diff --git a/lib/stylesheet/compiler.rb b/lib/stylesheet/compiler.rbindex fdfca7c2dcb..8c96a8974fb 100644--- a/lib/stylesheet/compiler.rb+++ b/lib/stylesheet/compiler.rb@@ -4,7 +4,7 @@ require "stylesheet/importer"module Stylesheetclass Compiler- ASSET_ROOT = "#{Rails.root}/app/assets/stylesheets" unless defined?(ASSET_ROOT)+ ASSET_ROOT = "#{Rails.root.join("app/assets/stylesheets")}" unless defined?(ASSET_ROOT)def self.compile_asset(asset, options = {})importer = Importer.new(options)diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rbindex 1bec3c78398..5ff60fe0ca4 100644--- a/lib/stylesheet/manager.rb+++ b/lib/stylesheet/manager.rb@@ -16,7 +16,7 @@ class Stylesheet::ManagerCACHE_PATH = "tmp/stylesheet-cache"private_constant :CACHE_PATH- MANIFEST_DIR = "#{Rails.root}/tmp/cache/assets/#{Rails.env}"+ MANIFEST_DIR = "#{Rails.root.join("tmp/cache/assets/#{Rails.env}")}"THEME_REGEX = /_theme(_rtl)?\z/COLOR_SCHEME_STYLESHEET = "color_definitions"@@ -167,9 +167,9 @@ class Stylesheet::Managerdef self.list_filesglobs = [- "#{Rails.root}/app/assets/stylesheets/**/*.*css",- "#{Rails.root}/app/assets/images/**/*.*",- "#{Rails.root}/lib/stylesheet/*.rb",+ "#{Rails.root.join("app/assets/stylesheets/**/*.*css")}",+ "#{Rails.root.join("app/assets/images/**/*.*")}",+ "#{Rails.root.join("lib/stylesheet/*.rb")}",]Discourse.plugins.each do |plugin|@@ -194,7 +194,7 @@ class Stylesheet::Managerprivate_class_method :fs_assets_hashdef self.cache_fullpath- path = "#{Rails.root}/#{CACHE_PATH}"+ path = "#{Rails.root.join("#{CACHE_PATH}")}"return path if !Rails.env.test?File.join(path, "test_#{ENV["TEST_ENV_NUMBER"].presence || "0"}")enddiff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rbindex 3ba1c14c434..53c6eded2c5 100644--- a/lib/stylesheet/watcher.rb+++ b/lib/stylesheet/watcher.rb@@ -48,10 +48,10 @@ module Stylesheetbeginplugins_paths =Dir- .glob("#{Rails.root}/plugins/*")+ .glob("#{Rails.root.join("plugins/*")}").map do |file|if File.symlink?(file)- File.expand_path(File.readlink(file), "#{Rails.root}/plugins")+ File.expand_path(File.readlink(file), "#{Rails.root.join("plugins")}")elsefileenddiff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rbindex eea0e03daf3..630fa147ede 100644--- a/lib/svg_sprite.rb+++ b/lib/svg_sprite.rb@@ -320,7 +320,7 @@ module SvgSpriteenddef self.core_svgs_files- @svg_files ||= Dir.glob("#{Rails.root}/vendor/assets/svg-icons/**/*.svg")+ @svg_files ||= Dir.glob("#{Rails.root.join("vendor/assets/svg-icons/**/*.svg")}")enddef self.core_svgsdiff --git a/lib/system_themes_manager.rb b/lib/system_themes_manager.rbindex 31f3906d3a7..4bdc0411bf3 100644--- a/lib/system_themes_manager.rb+++ b/lib/system_themes_manager.rb@@ -9,7 +9,7 @@ class SystemThemesManagertheme_id = Theme::CORE_THEMES[theme_name]raise Discourse::InvalidParameters unless theme_id- theme_dir = "#{Rails.root}/themes/#{theme_name}"+ theme_dir = "#{Rails.root.join("themes/#{theme_name}")}"is_initial_install = !Theme.exists?(id: theme_id)diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rakeindex 4cda3f1aefc..6334dc5c987 100644--- a/lib/tasks/assets.rake+++ b/lib/tasks/assets.rake@@ -6,7 +6,7 @@ task "assets:precompile:build" doraise "Unknown ember version '#{ember_version}'" if !%w[5].include?(ember_version)- compile_command = "EMBER_ENV=production #{Rails.root}/script/assemble_ember_build.rb"+ compile_command = "EMBER_ENV=production #{Rails.root.join("script/assemble_ember_build.rb")}"only_ember_precompile_build_remaining = (ARGV.last == "assets:precompile:build")only_assets_precompile_remaining = (ARGV.last == "assets:precompile")@@ -67,7 +67,7 @@ rescue StandardErrorenddef assets_path- "#{Rails.root}/public/assets"+ "#{Rails.public_path.join("assets")}"enddef gzip(path)@@ -148,7 +148,7 @@ task "assets:precompile:compress_js": "environment" doif GlobalSetting.fallback_assets_path.present?begin- FileUtils.cp_r("#{Rails.root}/public/assets/.", GlobalSetting.fallback_assets_path)+ FileUtils.cp_r("#{Rails.public_path.join("assets/.")}", GlobalSetting.fallback_assets_path)rescue => eSTDERR.puts "Failed to backup assets to #{GlobalSetting.fallback_assets_path}"STDERR.puts ediff --git a/lib/tasks/cdn.rake b/lib/tasks/cdn.rakeindex 559144bf9d2..62b633e9f71 100644--- a/lib/tasks/cdn.rake+++ b/lib/tasks/cdn.rake@@ -9,7 +9,7 @@ task "assets:prestage" => :environment do |t|def get_assets(path)Dir- .glob("#{Rails.root}/public/assets/#{path}*")+ .glob("#{Rails.root.join("public/assets/#{path}*")}").map { |f| "/assets/#{path}#{f.split("/")[-1]}" if f =~ /[a-f0-9]{16}\.(css|js)\z/ }.compactend@@ -19,7 +19,7 @@ task "assets:prestage" => :environment do |t|puts "pre staging: #{assets.join(" ")}"# makes testing simpler leaving this here- config = YAML.safe_load(File.open("#{Rails.root}/config/cdn.yml"))+ config = YAML.safe_load(File.open("#{Rails.root.join("config/cdn.yml")}"))start = Time.nowdiff --git a/lib/tasks/db.rake b/lib/tasks/db.rakeindex 0280f72e405..0243b59104f 100644--- a/lib/tasks/db.rake+++ b/lib/tasks/db.rake@@ -66,7 +66,7 @@ begintop_level_tasks = Rake.application.top_level_tasksdb_create_index = top_level_tasks.index("db:create")if db_create_index && db_create_index < top_level_tasks.length - 1- exec "#{Rails.root}/bin/rake", *top_level_tasks[db_create_index + 1..-1]+ exec "#{Rails.root.join("bin/rake")}", *top_level_tasks[db_create_index + 1..-1]endendenddiff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rakeindex 3ef4d39b5d8..6d7a47a325c 100644--- a/lib/tasks/docker.rake+++ b/lib/tasks/docker.rake@@ -26,7 +26,7 @@ enddef setup_redislog "Starting background redis"- data_directory = "#{Rails.root}/tmp/test_data/redis"+ data_directory = "#{Rails.root.join("tmp/test_data/redis")}"`rm -rf #{data_directory} && mkdir -p #{data_directory}`Process.spawn("redis-server --dir #{data_directory}")enddiff --git a/lib/tasks/documentation.rake b/lib/tasks/documentation.rakeindex 0bc77681700..29d203ba639 100644--- a/lib/tasks/documentation.rake+++ b/lib/tasks/documentation.rake@@ -7,8 +7,8 @@ task "documentation" doenddef generate_chat_documentation- destination = File.join(Rails.root, "documentation/chat/frontend/")- config = File.join(Rails.root, ".jsdoc")+ destination = Rails.root.join("documentation/chat/frontend/").to_s+ config = Rails.root.join(".jsdoc").to_sfiles = %w[plugins/chat/assets/javascripts/discourse/lib/collection.jsplugins/chat/assets/javascripts/discourse/pre-initializers/chat-plugin-api.js@@ -19,7 +19,7 @@ def generate_chat_documentationrequire "open3"require "yard"YARD::Templates::Engine.register_template_path(- File.join(Rails.root, "documentation", "yard-custom-template"),+ Rails.root.join("documentation/yard-custom-template").to_s,)files = %w[plugins/chat/app/services/base.rbdiff --git a/lib/tasks/images.rake b/lib/tasks/images.rakeindex 653b305f23d..3e5936460e9 100644--- a/lib/tasks/images.rake+++ b/lib/tasks/images.rake@@ -3,7 +3,7 @@require "file_helper"task "images:compress" => :environment do- images = Dir.glob("#{Rails.root}/app/**/*.png")+ images = Dir.glob("#{Rails.root.join("app/**/*.png")}")image_sizes = images.map { |i| [i, File.size(i)] }.to_himages.each do |path|diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rakeindex aa19a399b18..8d7cfc3422c 100644--- a/lib/tasks/javascript.rake+++ b/lib/tasks/javascript.rake@@ -7,7 +7,7 @@ def write_template(path, task_name, template)JSbasename = File.basename(path)- output_path = "#{Rails.root}/frontend/#{path}"+ output_path = "#{Rails.root.join("frontend/#{path}")}"File.write(output_path, "#{header}\n\n#{template}")puts "#{basename} created"diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rakeindex 20fad8f6ae1..691a32a586a 100644--- a/lib/tasks/s3.rake+++ b/lib/tasks/s3.rake@@ -59,7 +59,7 @@ def assetsresults = Set.newload_path.assets.each do |asset|- fullpath = "#{Rails.root}/public/assets/#{asset.digested_path}"+ fullpath = "#{Rails.root.join("public/assets/#{asset.digested_path}")}"content_type = MiniMime.lookup_by_filename(fullpath)&.content_typecontent_type ||= "application/json" if fullpath.end_with?(".map")diff --git a/lib/tasks/smoke_test.rake b/lib/tasks/smoke_test.rakeindex a394b61733c..369aaac0a91 100644--- a/lib/tasks/smoke_test.rake+++ b/lib/tasks/smoke_test.rake@@ -14,7 +14,7 @@ task "smoke:test" dourl = ENV["URL"]if !url- require "#{Rails.root}/config/environment"+ require "#{Rails.root.join("config/environment")}"url = Discourse.base_urlend@@ -63,7 +63,7 @@ task "smoke:test" donode_arguments = []node_arguments << "--inspect-brk" if ENV["DEBUG_NODE"]- node_arguments << "#{Rails.root}/test/smoke-test.mjs"+ node_arguments << "#{Rails.root.join("test/smoke-test.mjs")}"node_arguments << urlIOdiff --git a/lib/tasks/svg_icons.rake b/lib/tasks/svg_icons.rakeindex 74bc735b0f6..21d2c6881b0 100644--- a/lib/tasks/svg_icons.rake+++ b/lib/tasks/svg_icons.rake@@ -1,11 +1,11 @@# frozen_string_literal: truedef vendor_svgs- "#{Rails.root}/vendor/assets/svg-icons"+ "#{Rails.root.join("vendor/assets/svg-icons")}"enddef library_src- "#{Rails.root}/node_modules"+ "#{Rails.root.join("node_modules")}"endtask "svgicons:update" dodiff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rakeindex 3ee0baabb92..2ea781bbbb5 100644--- a/lib/tasks/themes.rake+++ b/lib/tasks/themes.rake@@ -450,7 +450,7 @@ task "themes:clone_all_official" do |task, args|ThemeMetadata::OFFICIAL_THEMES.each do |theme_name|repo = "https://github.com/discourse/#{theme_name}"- path = File.join(Rails.root, "tmp/themes/#{theme_name}")+ path = Rails.root.join("tmp/themes/#{theme_name}").to_sattempts = 0@@ -468,7 +468,7 @@ enddesc "pull compatible theme versions for all themes"task "themes:pull_compatible_all" do |t|Dir- .glob(File.expand_path("#{Rails.root}/tmp/themes/*"))+ .glob(File.expand_path("#{Rails.root.join("tmp/themes/*")}")).select { |f| File.directory? f }.each do |theme_path|next unless File.directory?(theme_path + "/.git")@@ -499,7 +499,7 @@ task "themes:qunit_all_official" => :environment do |task, args|official_theme_ids_with_qunit_tests = []ThemeMetadata::OFFICIAL_THEMES.each do |theme_name|- path = File.join(Rails.root, "tmp/themes/#{theme_name}")+ path = Rails.root.join("tmp/themes/#{theme_name}").to_sif Dir.glob("#{File.join(path, "test")}/**/*.{js,gjs}").any?theme = RemoteTheme.import_theme_from_directory(path)@@ -512,7 +512,7 @@ task "themes:qunit_all_official" => :environment do |task, args|core_theme_ids_with_qunit_tests = []Theme::CORE_THEMES.each do |(theme_name, theme_id)|- path = File.join(Rails.root, "themes/#{theme_name}")+ path = Rails.root.join("themes/#{theme_name}").to_sif Dir.glob("#{File.join(path, "test")}/**/*.{js,gjs}").any?core_theme_ids_with_qunit_tests << theme_iddiff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rakeindex c9538b2838d..8d40ad1515d 100644--- a/lib/tasks/uploads.rake+++ b/lib/tasks/uploads.rake@@ -25,7 +25,7 @@ rescue StandardErrorenddef gather_uploads- public_directory = "#{Rails.root}/public"+ public_directory = "#{Rails.public_path}"current_db = RailsMultisite::ConnectionManagement.current_dbputs "", "Gathering uploads for '#{current_db}'...", ""@@ -297,7 +297,7 @@ def regenerate_missing_optimizedreturnend- public_directory = "#{Rails.root}/public"+ public_directory = "#{Rails.public_path}"missing_uploads = Set.newavatar_upload_ids = UserAvatar.all.pluck(:custom_upload_id, :gravatar_upload_id).flatten.compact@@ -935,7 +935,7 @@ def inline_img_tags(post)endendif !upload- local_file = File.join(Rails.root, "public", $2)+ local_file = Rails.public_path.join($2).to_sif File.exist?(local_file)File.open(local_file) do |f|upload = UploadCreator.new(f, "image").create_for(post.user_id)diff --git a/migrations/lib/database/schema.rb b/migrations/lib/database/schema.rbindex 7d553887b5e..4e82d8db432 100644--- a/migrations/lib/database/schema.rb+++ b/migrations/lib/database/schema.rb@@ -100,7 +100,7 @@ module Migrationsdef self.plugin_manifest@plugin_manifest ||=- DSL::PluginManifest.new(manifest_path:, plugins_path: File.join(Rails.root, "plugins"))+ DSL::PluginManifest.new(manifest_path:, plugins_path: Rails.root.join("plugins").to_s)end# --- Validation, Resolution & Generation ---diff --git a/migrations/lib/database/schema/dsl/plugin_introspector.rb b/migrations/lib/database/schema/dsl/plugin_introspector.rbindex 26444123ee6..485bfb78492 100644--- a/migrations/lib/database/schema/dsl/plugin_introspector.rb+++ b/migrations/lib/database/schema/dsl/plugin_introspector.rb@@ -45,7 +45,7 @@ module Migrationsenddef initialize(plugins_path: nil)- @plugins_path = plugins_path || File.join(Rails.root, "plugins")+ @plugins_path = plugins_path || Rails.root.join("plugins").to_senddef introspect@@ -153,7 +153,7 @@ module Migrationsenddef core_migration_paths- [File.join(Rails.root, "db", "migrate"), File.join(Rails.root, "db", "post_migrate")]+ [Rails.root.join("db/migrate").to_s, Rails.root.join("db/post_migrate").to_s]enddef run_core_migrationsdiff --git a/migrations/lib/database/schema/dsl/plugin_manifest.rb b/migrations/lib/database/schema/dsl/plugin_manifest.rbindex 86f102e300d..2c6b6b4cd7d 100644--- a/migrations/lib/database/schema/dsl/plugin_manifest.rb+++ b/migrations/lib/database/schema/dsl/plugin_manifest.rb@@ -7,7 +7,7 @@ module Migrationsclass PluginManifestdef initialize(manifest_path:, plugins_path: nil)@manifest_path = manifest_path- @plugins_path = plugins_path || File.join(Rails.root, "plugins")+ @plugins_path = plugins_path || Rails.root.join("plugins").to_s@data = YAML.safe_load_file(@manifest_path) if available?@data ||= empty_datadiff --git a/plugins/automation/spec/system/admin_plugins_list_spec.rb b/plugins/automation/spec/system/admin_plugins_list_spec.rbindex b00273c6dee..b96196ca832 100644--- a/plugins/automation/spec/system/admin_plugins_list_spec.rb+++ b/plugins/automation/spec/system/admin_plugins_list_spec.rb@@ -12,7 +12,7 @@ describe "Admin Plugins List" doendlet(:automation_plugin) do- Plugin::Instance.parse_from_source(File.join(Rails.root, "plugins", "automation", "plugin.rb"))+ Plugin::Instance.parse_from_source(Rails.root.join("plugins/automation/plugin.rb").to_s)endit "shows the list of plugins" dodiff --git a/plugins/chat/plugin.rb b/plugins/chat/plugin.rbindex 15bda0f0c80..90a05da3636 100644--- a/plugins/chat/plugin.rb+++ b/plugins/chat/plugin.rb@@ -47,7 +47,7 @@ endrequire_relative "lib/chat/engine"after_initialize do- register_seedfu_fixtures(Rails.root.join("plugins", "chat", "db", "fixtures"))+ register_seedfu_fixtures(Rails.root.join("plugins/chat/db/fixtures"))UserNotifications.append_view_path(File.expand_path("../app/views", __FILE__))diff --git a/plugins/discourse-ai/lib/agents/tools/setting_context.rb b/plugins/discourse-ai/lib/agents/tools/setting_context.rbindex 2ffe79e764f..799fef53756 100644--- a/plugins/discourse-ai/lib/agents/tools/setting_context.rb+++ b/plugins/discourse-ai/lib/agents/tools/setting_context.rb@@ -65,7 +65,7 @@ module DiscourseAiresult = +"# #{setting_name}\n#{description}\n\n"setting_info =- find_setting_info(setting_name, [Rails.root.join("config", "site_settings.yml").to_s])+ find_setting_info(setting_name, [Rails.root.join("config/site_settings.yml").to_s])if !setting_infosetting_info =find_setting_info(setting_name, Dir[Rails.root.join("plugins/**/settings.yml")])diff --git a/plugins/discourse-ai/lib/ai_bot/entry_point.rb b/plugins/discourse-ai/lib/ai_bot/entry_point.rbindex c9017233f28..c68d1c220cf 100644--- a/plugins/discourse-ai/lib/ai_bot/entry_point.rb+++ b/plugins/discourse-ai/lib/ai_bot/entry_point.rb@@ -148,9 +148,7 @@ module DiscourseAidoc.css("details").remove if options && options[:strip_details]end- plugin.register_seedfu_fixtures(- Rails.root.join("plugins", "discourse-ai", "db", "fixtures", "ai_bot"),- )+ plugin.register_seedfu_fixtures(Rails.root.join("plugins/discourse-ai/db/fixtures/ai_bot"))plugin.add_to_serializer(:topic_view,diff --git a/plugins/discourse-ai/lib/ai_helper/entry_point.rb b/plugins/discourse-ai/lib/ai_helper/entry_point.rbindex 9e1ffee06ec..f2c2b94ed29 100644--- a/plugins/discourse-ai/lib/ai_helper/entry_point.rb+++ b/plugins/discourse-ai/lib/ai_helper/entry_point.rb@@ -4,7 +4,7 @@ module DiscourseAiclass EntryPointdef inject_into(plugin)plugin.register_seedfu_fixtures(- Rails.root.join("plugins", "discourse-ai", "db", "fixtures", "ai_helper"),+ Rails.root.join("plugins/discourse-ai/db/fixtures/ai_helper"),)plugin.add_to_serializer(:current_user, :can_use_assistant) dodiff --git a/plugins/discourse-ai/plugin.rb b/plugins/discourse-ai/plugin.rbindex 20a520fb5f4..02ee588612c 100644--- a/plugins/discourse-ai/plugin.rb+++ b/plugins/discourse-ai/plugin.rb@@ -103,7 +103,7 @@ after_initialize doadd_admin_route("discourse_ai.title", "discourse-ai", { use_new_show_route: true })- register_seedfu_fixtures(Rails.root.join("plugins", "discourse-ai", "db", "fixtures", "agents"))+ register_seedfu_fixtures(Rails.root.join("plugins/discourse-ai/db/fixtures/agents"))[DiscourseAi::Embeddings::EntryPoint.new,diff --git a/plugins/discourse-ai/spec/configuration/feature_register_spec.rb b/plugins/discourse-ai/spec/configuration/feature_register_spec.rbindex 857eb88fa50..2559022c3e5 100644--- a/plugins/discourse-ai/spec/configuration/feature_register_spec.rb+++ b/plugins/discourse-ai/spec/configuration/feature_register_spec.rb@@ -3,7 +3,7 @@describe DiscourseAi::Configuration::Feature dofab!(:fake_plugin) doplugin = Plugin::Instance.new- plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"+ plugin.path = "#{Rails.root.join("spec/fixtures/plugins/my_plugin/plugin.rb")}"pluginenddiff --git a/plugins/discourse-ai/spec/configuration/module_register_spec.rb b/plugins/discourse-ai/spec/configuration/module_register_spec.rbindex 28633fc68b1..a000a166761 100644--- a/plugins/discourse-ai/spec/configuration/module_register_spec.rb+++ b/plugins/discourse-ai/spec/configuration/module_register_spec.rb@@ -3,7 +3,7 @@describe DiscourseAi::Configuration::Module dofab!(:fake_plugin) doplugin = Plugin::Instance.new- plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"+ plugin.path = "#{Rails.root.join("spec/fixtures/plugins/my_plugin/plugin.rb")}"pluginenddiff --git a/plugins/discourse-ai/spec/lib/agents/agent_spec.rb b/plugins/discourse-ai/spec/lib/agents/agent_spec.rbindex 4c6dd728791..ae5d7382796 100644--- a/plugins/discourse-ai/spec/lib/agents/agent_spec.rb+++ b/plugins/discourse-ai/spec/lib/agents/agent_spec.rb@@ -318,7 +318,7 @@ RSpec.describe DiscourseAi::Agents::Agent dodescribe ".sync_external_registry!" dofab!(:fake_plugin) doplugin = Plugin::Instance.new- plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"+ plugin.path = "#{Rails.root.join("spec/fixtures/plugins/my_plugin/plugin.rb")}"pluginenddiff --git a/plugins/discourse-ai/spec/system/admin_ai_features_spec.rb b/plugins/discourse-ai/spec/system/admin_ai_features_spec.rbindex 9a8a4d39463..bbc57aced2e 100644--- a/plugins/discourse-ai/spec/system/admin_ai_features_spec.rb+++ b/plugins/discourse-ai/spec/system/admin_ai_features_spec.rb@@ -101,7 +101,7 @@ RSpec.describe "Admin AI features configuration" docontext "with external AI features" dolet(:fake_plugin) doplugin = Plugin::Instance.new- plugin.path = "#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb"+ plugin.path = "#{Rails.root.join("spec/fixtures/plugins/my_plugin/plugin.rb")}"pluginenddiff --git a/plugins/discourse-gamification/plugin.rb b/plugins/discourse-gamification/plugin.rbindex f5f6c1d741f..ff02b7cb120 100644--- a/plugins/discourse-gamification/plugin.rb+++ b/plugins/discourse-gamification/plugin.rb@@ -102,10 +102,7 @@ after_initialize doDiscourseGamification::GamificationLeaderboard.first&.idend- SeedFu.fixture_paths << Rails- .root- .join("plugins", "discourse-gamification", "db", "fixtures")- .to_s+ SeedFu.fixture_paths << Rails.root.join("plugins/discourse-gamification/db/fixtures").to_son(:site_setting_changed) do |name|next if name != :score_ranking_strategydiff --git a/plugins/discourse-graphviz/plugin.rb b/plugins/discourse-graphviz/plugin.rbindex bbe5c80dc2f..315669b200f 100644--- a/plugins/discourse-graphviz/plugin.rb+++ b/plugins/discourse-graphviz/plugin.rb@@ -17,7 +17,7 @@ module ::DiscourseGraphvizdef self.contextcontext = MiniRacer::Context.new- context.load("#{Rails.root}/plugins/discourse-graphviz/public/javascripts/viz-3.0.1.js")+ context.load("#{Rails.root.join("plugins/discourse-graphviz/public/javascripts/viz-3.0.1.js")}")contextenddiff --git a/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rb b/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rbindex 11f8a475b5c..be5a1bac256 100644--- a/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rb+++ b/plugins/discourse-lazy-videos/spec/lib/lazy-videos/lazy_vimeo_spec.rb@@ -2,7 +2,7 @@RSpec.describe Onebox::Engine::VimeoOnebox dodef get_response(filename)- file = "#{Rails.root}/plugins/discourse-lazy-videos/spec/fixtures/#{filename}.response"+ file = "#{Rails.root.join("plugins/discourse-lazy-videos/spec/fixtures/#{filename}.response")}"File.read(file)enddiff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rbindex 1fbabd3bb55..f23543ee96b 100644--- a/plugins/discourse-narrative-bot/plugin.rb+++ b/plugins/discourse-narrative-bot/plugin.rb@@ -28,10 +28,7 @@ after_initialize doendend- SeedFu.fixture_paths << Rails- .root- .join("plugins", "discourse-narrative-bot", "db", "fixtures")- .to_s+ SeedFu.fixture_paths << Rails.root.join("plugins/discourse-narrative-bot/db/fixtures").to_sMime::Type.register "image/svg+xml", :svgdiff --git a/plugins/discourse-patreon/lib/seed.rb b/plugins/discourse-patreon/lib/seed.rbindex 883c452721a..efafaa83fe8 100644--- a/plugins/discourse-patreon/lib/seed.rb+++ b/plugins/discourse-patreon/lib/seed.rb@@ -5,7 +5,7 @@ module Patreondef self.seed_content!flair =File.open(- "#{Rails.root}/plugins/discourse-patreon/public/images/patreon-logomark-color-on-white.png",+ "#{Rails.root.join("plugins/discourse-patreon/public/images/patreon-logomark-color-on-white.png")}",)flair_upload =UploadCreator.new(flair, "patreon-flair.png").create_for(Discourse.system_user.id)diff --git a/plugins/discourse-patreon/spec/spec_helper.rb b/plugins/discourse-patreon/spec/spec_helper.rbindex b15f1546acb..72554802987 100644--- a/plugins/discourse-patreon/spec/spec_helper.rb+++ b/plugins/discourse-patreon/spec/spec_helper.rb@@ -2,9 +2,9 @@module Helpersdef get_patreon_response(filename)- dest = "#{Rails.root}/tmp/spec/#{filename}"+ dest = "#{Rails.root.join("tmp/spec/#{filename}")}"FileUtils.mkdir_p(File.dirname(dest))- FileUtils.cp("#{Rails.root}/plugins/discourse-patreon/spec/fixtures/#{filename}", dest)+ FileUtils.cp("#{Rails.root.join("plugins/discourse-patreon/spec/fixtures/#{filename}")}", dest)File.new(dest).readendenddiff --git a/plugins/discourse-reactions/plugin.rb b/plugins/discourse-reactions/plugin.rbindex b8118f0fa1a..ec4155d1937 100644--- a/plugins/discourse-reactions/plugin.rb+++ b/plugins/discourse-reactions/plugin.rb@@ -26,7 +26,7 @@ endrequire_relative "lib/discourse_reactions/engine"after_initialize do- SeedFu.fixture_paths << Rails.root.join("plugins", "discourse-reactions", "db", "fixtures").to_s+ SeedFu.fixture_paths << Rails.root.join("plugins/discourse-reactions/db/fixtures").to_s%w[app/controllers/discourse_reactions/custom_reactions_controller.rbdiff --git a/plugins/discourse-rewind/lib/discourse_rewind/engine.rb b/plugins/discourse-rewind/lib/discourse_rewind/engine.rbindex 5e5f584708c..548db2e6489 100644--- a/plugins/discourse-rewind/lib/discourse_rewind/engine.rb+++ b/plugins/discourse-rewind/lib/discourse_rewind/engine.rb@@ -12,7 +12,7 @@ module ::DiscourseRewindRails.application.reloader.to_prepare doDir[- "#{Rails.root}/plugins/discourse-rewind/app/services/discourse_rewind/rewind/action/*.rb"+ "#{Rails.root.join("plugins/discourse-rewind/app/services/discourse_rewind/rewind/action/*.rb")}"].each { |file| require_dependency file }endenddiff --git a/plugins/discourse-solved/plugin.rb b/plugins/discourse-solved/plugin.rbindex 6130cc249a4..3631418fdea 100644--- a/plugins/discourse-solved/plugin.rb+++ b/plugins/discourse-solved/plugin.rb@@ -39,7 +39,7 @@ endrequire_relative "lib/discourse_solved/engine"after_initialize do- SeedFu.fixture_paths << Rails.root.join("plugins", "discourse-solved", "db", "fixtures").to_s+ SeedFu.fixture_paths << Rails.root.join("plugins/discourse-solved/db/fixtures").to_sUserUpdater::OPTION_ATTR.push(:notify_on_solved)add_to_serializer(:user_option, :notify_on_solved) { object.notify_on_solved }diff --git a/plugins/discourse-subscriptions/spec/requests/user/subscriptions_controller_spec.rb b/plugins/discourse-subscriptions/spec/requests/user/subscriptions_controller_spec.rbindex 445cd2645e6..13ade9353de 100644--- a/plugins/discourse-subscriptions/spec/requests/user/subscriptions_controller_spec.rb+++ b/plugins/discourse-subscriptions/spec/requests/user/subscriptions_controller_spec.rb@@ -53,12 +53,7 @@ RSpec.describe DiscourseSubscriptions::User::SubscriptionsController doplans_json =File.read(Rails.root.join(- "plugins",- "discourse-subscriptions",- "spec",- "fixtures",- "json",- "stripe-price-list.json",+ "plugins/discourse-subscriptions/spec/fixtures/json/stripe-price-list.json",),)@@ -71,12 +66,7 @@ RSpec.describe DiscourseSubscriptions::User::SubscriptionsController dosubscriptions_json =File.read(Rails.root.join(- "plugins",- "discourse-subscriptions",- "spec",- "fixtures",- "json",- "stripe-subscription-list.json",+ "plugins/discourse-subscriptions/spec/fixtures/json/stripe-subscription-list.json",),)diff --git a/plugins/discourse-subscriptions/spec/system/subscription_subscription_spec.rb b/plugins/discourse-subscriptions/spec/system/subscription_subscription_spec.rbindex 62be6ff7225..2a61424457c 100644--- a/plugins/discourse-subscriptions/spec/system/subscription_subscription_spec.rb+++ b/plugins/discourse-subscriptions/spec/system/subscription_subscription_spec.rb@@ -41,24 +41,14 @@ describe "Subscription products" doplans_json =File.read(Rails.root.join(- "plugins",- "discourse-subscriptions",- "spec",- "fixtures",- "json",- "stripe-price-list.json",+ "plugins/discourse-subscriptions/spec/fixtures/json/stripe-price-list.json",),)subscriptions_json =File.read(Rails.root.join(- "plugins",- "discourse-subscriptions",- "spec",- "fixtures",- "json",- "stripe-subscription-list.json",+ "plugins/discourse-subscriptions/spec/fixtures/json/stripe-subscription-list.json",),)diff --git a/plugins/discourse-topic-voting/plugin.rb b/plugins/discourse-topic-voting/plugin.rbindex dde898d5494..212c0cfb77a 100755--- a/plugins/discourse-topic-voting/plugin.rb+++ b/plugins/discourse-topic-voting/plugin.rb@@ -32,10 +32,7 @@ require_relative "lib/discourse_topic_voting/engine"require_relative "lib/discourse_topic_voting/topic_votes_filter"after_initialize do- SeedFu.fixture_paths << Rails- .root- .join("plugins", "discourse-topic-voting", "db", "fixtures")- .to_s+ SeedFu.fixture_paths << Rails.root.join("plugins/discourse-topic-voting/db/fixtures").to_sreloadable_patch doregister_category_type(DiscourseTopicVoting::Categories::Types::Ideas)diff --git a/script/bulk_import/discourse_merger.rb b/script/bulk_import/discourse_merger.rbindex d8a28795541..296232520db 100644--- a/script/bulk_import/discourse_merger.rb+++ b/script/bulk_import/discourse_merger.rb@@ -443,10 +443,7 @@ class BulkImport::DiscourseMerger < BulkImport::Baseputs ""print "copying uploads..."- FileUtils.cp_r(- File.join(@uploads_path, "."),- File.join(Rails.root, "public", "uploads", "default"),- )+ FileUtils.cp_r(File.join(@uploads_path, "."), Rails.public_path.join("uploads/default").to_s)columns = Upload.columns.map(&:name)last_id = Upload.unscoped.maximum(:id) || 1diff --git a/spec/generator/site_setting_rename_migrations_generator_spec.rb b/spec/generator/site_setting_rename_migrations_generator_spec.rbindex e6cd3eb40b0..6fb66218eaf 100644--- a/spec/generator/site_setting_rename_migrations_generator_spec.rb+++ b/spec/generator/site_setting_rename_migrations_generator_spec.rb@@ -10,11 +10,12 @@ RSpec.describe SiteSettingRenameMigrationGenerator, type: :generator dosilence_stdout dodescribed_class.start(%w[site_description contact_email],- destination_root: "#{Rails.root}/tmp",+ destination_root: "#{Rails.root.join("tmp")}",)end- file_path = "#{Rails.root}/tmp/db/migrate/20100101120000_rename_site_description_setting.rb"+ file_path =+ "#{Rails.root.join("tmp/db/migrate/20100101120000_rename_site_description_setting.rb")}"expected_content = <<~EXPECTED_CONTENT# frozen_string_literal: truediff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rbindex 440cccb9f33..995e314b062 100644--- a/spec/integrity/i18n_spec.rb+++ b/spec/integrity/i18n_spec.rb@@ -45,7 +45,7 @@ RSpec.describe "i18n integrity checks" doendend- Dir["#{Rails.root}/config/locales/{client,server}.*.yml"].each do |path|+ Dir["#{Rails.root.join("config/locales/{client,server}.*.yml")}"].each do |path|it "does not contain invalid interpolation keys for '#{path}'" domatches = File.read(path).scan(/%\{([^a-zA-Z\s]+)\}|\{\{([^a-zA-Z\s]+)\}\}/)matches.flatten!@@ -55,7 +55,7 @@ RSpec.describe "i18n integrity checks" doendend- Dir["#{Rails.root}/config/locales/client.*.yml"].each do |path|+ Dir["#{Rails.root.join("config/locales/client.*.yml")}"].each do |path|it "has valid client YAML for '#{path}'" doyaml = load_yaml(path)locale = extract_locale(path)@@ -68,7 +68,7 @@ RSpec.describe "i18n integrity checks" doendend- Dir["#{Rails.root}/**/locale*/*.en.yml"].each do |english_path|+ Dir["#{Rails.root.join("**/locale*/*.en.yml")}"].each do |english_path|english_yaml = load_yaml(english_path)["en"]context(english_path) dodiff --git a/spec/integrity/js_constants_spec.rb b/spec/integrity/js_constants_spec.rbindex c1a0e7e5a18..0b37f047adb 100644--- a/spec/integrity/js_constants_spec.rb+++ b/spec/integrity/js_constants_spec.rb@@ -5,7 +5,7 @@ RSpec.describe "constants match ruby" dodef parse(file)# mini racer doesn't handle JS modules so we'll do this hack- source = File.read("#{Rails.root}/frontend/#{file}")+ source = File.read("#{Rails.root.join("frontend/#{file}")}")source.gsub!(/^export */, "")ctx.eval(source)enddiff --git a/spec/integrity/site_setting_spec.rb b/spec/integrity/site_setting_spec.rbindex 412902d8741..c6e4d074a0d 100644--- a/spec/integrity/site_setting_spec.rb+++ b/spec/integrity/site_setting_spec.rb@@ -1,7 +1,7 @@# frozen_string_literal: trueRSpec.describe "site setting integrity checks" do- let(:site_setting_file) { File.join(Rails.root, "config", "site_settings.yml") }+ let(:site_setting_file) { Rails.root.join("config/site_settings.yml").to_s }let(:yaml) { YAML.load_file(site_setting_file) }%w[hidden client].each do |property|diff --git a/spec/integrity/upcoming_change_metadata_spec.rb b/spec/integrity/upcoming_change_metadata_spec.rbindex f56a49c4800..46d4388a8d3 100644--- a/spec/integrity/upcoming_change_metadata_spec.rb+++ b/spec/integrity/upcoming_change_metadata_spec.rb@@ -2,8 +2,8 @@def upcoming_change_setting_files[- File.join(Rails.root, "config", "site_settings.yml"),- *Dir["#{Rails.root}/plugins/*/config/settings.yml"].sort,+ Rails.root.join("config/site_settings.yml").to_s,+ *Dir["#{Rails.root.join("plugins/*/config/settings.yml")}"].sort,]end@@ -15,7 +15,7 @@ def each_upcoming_change_settingnext if opts[:upcoming_change].blank?setting = {- file: file.delete_prefix("#{Rails.root}/"),+ file: file.delete_prefix("#{Rails.root.join("")}"),setting_name: setting_name,default: default,options: opts,diff --git a/spec/jobs/jobs_base_spec.rb b/spec/jobs/jobs_base_spec.rbindex 835d4b535a3..28f11902570 100644--- a/spec/jobs/jobs_base_spec.rb+++ b/spec/jobs/jobs_base_spec.rb@@ -153,7 +153,7 @@ RSpec.describe ::Jobs::Base doendcontext "when `Discourse.enable_sidekiq_logging?` is `true`" do- let(:tmp_log_file_path) { "#{Rails.root}/tmp/sidekiq_test_log.log" }+ let(:tmp_log_file_path) { "#{Rails.root.join("tmp/sidekiq_test_log.log")}" }before doDiscourse.enable_sidekiq_loggingdiff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rbindex 1418ebcca73..c6377256935 100644--- a/spec/lib/content_security_policy_spec.rb+++ b/spec/lib/content_security_policy_spec.rb@@ -89,7 +89,8 @@ RSpec.describe ContentSecurityPolicy doit "can extend frame_ancestors" doSiteSetting.content_security_policy_frame_ancestors = true- plugin = plugin_class.new(nil, "#{Rails.root}/spec/fixtures/plugins/csp_extension/plugin.rb")+ plugin =+ plugin_class.new(nil, "#{Rails.root.join("spec/fixtures/plugins/csp_extension/plugin.rb")}")plugin.activate!Discourse.plugins << plugindiff --git a/spec/lib/discourse_spec.rb b/spec/lib/discourse_spec.rbindex 37e26aca1d9..888dad46b85 100644--- a/spec/lib/discourse_spec.rb+++ b/spec/lib/discourse_spec.rb@@ -550,7 +550,7 @@ RSpec.describe Discourse doit "works for individual commands" doexpect(Discourse::Utils.execute_command("pwd").strip).to eq(Rails.root.to_s)expect(Discourse::Utils.execute_command("pwd", chdir: "plugins").strip).to eq(- "#{Rails.root}/plugins",+ "#{Rails.root.join("plugins")}",)end@@ -576,12 +576,12 @@ RSpec.describe Discourse doresult =Discourse::Utils.execute_command(chdir: "plugins") do |runner|- expect(runner.exec("pwd").strip).to eq("#{Rails.root}/plugins")+ expect(runner.exec("pwd").strip).to eq("#{Rails.root.join("plugins")}")runner.exec("pwd")end# Should return output of block- expect(result.strip).to eq("#{Rails.root}/plugins")+ expect(result.strip).to eq("#{Rails.root.join("plugins")}")endit "does not leak chdir between threads" dodiff --git a/spec/lib/encodings_spec.rb b/spec/lib/encodings_spec.rbindex 70aac08e7ed..bfa7e635b4b 100644--- a/spec/lib/encodings_spec.rb+++ b/spec/lib/encodings_spec.rb@@ -2,7 +2,7 @@RSpec.describe Encodings dodef to_utf8(filename)- string = File.read("#{Rails.root}/spec/fixtures/encodings/#{filename}").chomp+ string = File.read("#{Rails.root.join("spec/fixtures/encodings/#{filename}")}").chompEncodings.to_utf8(string)enddiff --git a/spec/lib/file_helper_spec.rb b/spec/lib/file_helper_spec.rbindex e5b74e125e4..f5a5047c02c 100644--- a/spec/lib/file_helper_spec.rb+++ b/spec/lib/file_helper_spec.rb@@ -4,7 +4,7 @@ require "file_helper"RSpec.describe FileHelper dolet(:url) { "https://eviltrout.com/trout.png" }- let(:png) { File.read("#{Rails.root}/spec/fixtures/images/cropped.png") }+ let(:png) { File.read("#{Rails.root.join("spec/fixtures/images/cropped.png")}") }before dostub_request(:any, %r{https://eviltrout.com})diff --git a/spec/lib/freedom_patches/translate_accelerator_spec.rb b/spec/lib/freedom_patches/translate_accelerator_spec.rbindex 3d64d914ae0..6ab8d4d5b4e 100644--- a/spec/lib/freedom_patches/translate_accelerator_spec.rb+++ b/spec/lib/freedom_patches/translate_accelerator_spec.rb@@ -3,7 +3,7 @@RSpec.describe "translate accelerator" dobefore do@original_i18n_load_path = I18n.load_path.dup- I18n.load_path += Dir["#{Rails.root}/spec/fixtures/i18n/translate_accelerator.*.yml"]+ I18n.load_path += Dir["#{Rails.root.join("spec/fixtures/i18n/translate_accelerator.*.yml")}"]I18n.reload!enddiff --git a/spec/lib/migration/safe_migrate_spec.rb b/spec/lib/migration/safe_migrate_spec.rbindex c576be31151..33ef910b068 100644--- a/spec/lib/migration/safe_migrate_spec.rb+++ b/spec/lib/migration/safe_migrate_spec.rb@@ -22,7 +22,7 @@ RSpec.describe Migration::SafeMigrate doit "bans all table removal" doMigration::SafeMigrate.enable!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/drop_table"+ path = File.expand_path "#{Rails.root.join("spec/fixtures/db/migrate/drop_table")}"output = capture_stdout { expect do migrate_up(path) end.to raise_error(StandardError) }@@ -35,7 +35,7 @@ RSpec.describe Migration::SafeMigrate doit "bans all table renames" doMigration::SafeMigrate.enable!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/rename_table"+ path = File.expand_path "#{Rails.root.join("spec/fixtures/db/migrate/rename_table")}"output = capture_stdout { expect do migrate_up(path) end.to raise_error(StandardError) }@@ -48,7 +48,7 @@ RSpec.describe Migration::SafeMigrate doit "bans all column removal" doMigration::SafeMigrate.enable!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/remove_column"+ path = File.expand_path "#{Rails.root.join("spec/fixtures/db/migrate/remove_column")}"output = capture_stdout { expect do migrate_up(path) end.to raise_error(StandardError) }@@ -61,7 +61,7 @@ RSpec.describe Migration::SafeMigrate doit "bans all column renames" doMigration::SafeMigrate.enable!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/rename_column"+ path = File.expand_path "#{Rails.root.join("spec/fixtures/db/migrate/rename_column")}"output = capture_stdout { expect do migrate_up(path) end.to raise_error(StandardError) }@@ -75,7 +75,7 @@ RSpec.describe Migration::SafeMigrate doMigration::SafeMigrate.enable!path =- File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/create_index_concurrently_safe_activerecord"+ File.expand_path "#{Rails.root.join("spec/fixtures/db/migrate/create_index_concurrently_safe_activerecord")}"error = nil@@ -93,7 +93,8 @@ RSpec.describe Migration::SafeMigrate doit "allows running a migration that creates an index concurrently if it drops the index first" doMigration::SafeMigrate.enable!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/create_index_concurrently_safe"+ path =+ File.expand_path "#{Rails.root.join("spec/fixtures/db/migrate/create_index_concurrently_safe")}"error = nilcapture_stdout do@@ -111,7 +112,9 @@ RSpec.describe Migration::SafeMigrate doMigration::SafeMigrate.enable!path =- File.expand_path("#{Rails.root}/spec/fixtures/db/migrate/create_index_concurrently_unsafe")+ File.expand_path(+ "#{Rails.root.join("spec/fixtures/db/migrate/create_index_concurrently_unsafe")}",+ )error = nil@@ -129,7 +132,7 @@ RSpec.describe Migration::SafeMigrate doit "allows dropping NOT NULL" doMigration::SafeMigrate.enable!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/drop_not_null"+ path = File.expand_path "#{Rails.root.join("spec/fixtures/db/migrate/drop_not_null")}"output = capture_stdout { migrate_up(path) }@@ -139,7 +142,7 @@ RSpec.describe Migration::SafeMigrate doit "allows dropping default" doMigration::SafeMigrate.enable!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/drop_default"+ path = File.expand_path "#{Rails.root.join("spec/fixtures/db/migrate/drop_default")}"output = capture_stdout { migrate_up(path) }@@ -150,7 +153,7 @@ RSpec.describe Migration::SafeMigrate doMigration::SafeMigrate.enable!Migration::SafeMigrate.disable!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/drop_table"+ path = File.expand_path "#{Rails.root.join("spec/fixtures/db/migrate/drop_table")}"output = capture_stdout { migrate_up(path) }@@ -161,7 +164,7 @@ RSpec.describe Migration::SafeMigrate doit "should not ban unsafe migrations using up" doMigration::SafeMigrate::SafeMigration.enable_safe!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/post_migrate/drop_table"+ path = File.expand_path "#{Rails.root.join("spec/fixtures/db/post_migrate/drop_table")}"output = capture_stdout { migrate_up(path) }@@ -171,7 +174,7 @@ RSpec.describe Migration::SafeMigrate doit "should not ban unsafe migrations using change" doMigration::SafeMigrate::SafeMigration.enable_safe!- path = File.expand_path "#{Rails.root}/spec/fixtures/db/post_migrate/change"+ path = File.expand_path "#{Rails.root.join("spec/fixtures/db/post_migrate/change")}"output = capture_stdout { migrate_up(path) }diff --git a/spec/lib/onebox/engine/github_blob_onebox_spec.rb b/spec/lib/onebox/engine/github_blob_onebox_spec.rbindex 03826367ec0..6f99bb8c2fc 100644--- a/spec/lib/onebox/engine/github_blob_onebox_spec.rb+++ b/spec/lib/onebox/engine/github_blob_onebox_spec.rb@@ -32,7 +32,9 @@ RSpec.describe Onebox::Engine::GithubBlobOnebox doit "does not include blob contents if it is binary" do# stub_request if the response must be binary (ASCII-8BIT)uri_mock = mock("object")- uri_mock.stubs(:open).returns(File.open("#{Rails.root}/spec/fixtures/pdf/small.pdf", "rb"))+ uri_mock.stubs(:open).returns(+ File.open("#{Rails.root.join("spec/fixtures/pdf/small.pdf")}", "rb"),+ )URI.stubs(:parse).with(link).returns(uri)URI.stubs(:parse)diff --git a/spec/lib/plugin/instance_spec.rb b/spec/lib/plugin/instance_spec.rbindex 8fde4a6c337..5570320ae3c 100644--- a/spec/lib/plugin/instance_spec.rb+++ b/spec/lib/plugin/instance_spec.rb@@ -64,12 +64,12 @@ TEXTdescribe "find_all" doit "can find plugins correctly" do- plugins = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")+ plugins = Plugin::Instance.find_all("#{Rails.root.join("spec/fixtures/plugins")}")expect(plugins.count).to eq(5)plugin = plugins[3]expect(plugin.name).to eq("plugin-name")- expect(plugin.path).to eq("#{Rails.root}/spec/fixtures/plugins/my_plugin/plugin.rb")+ expect(plugin.path).to eq("#{Rails.root.join("spec/fixtures/plugins/my_plugin/plugin.rb")}")plugin.git_repo.stubs(:latest_local_commit).returns("123456")plugin.git_repo.stubs(:url).returns("http://github.com/discourse/discourse-plugin")@@ -80,7 +80,7 @@ TEXTendit "does not blow up on missing directory" do- plugins = Plugin::Instance.find_all("#{Rails.root}/frank_zappa")+ plugins = Plugin::Instance.find_all("#{Rails.root.join("frank_zappa")}")expect(plugins.count).to eq(0)endend@@ -139,7 +139,7 @@ TEXTdescribe "git repo details" dodescribe ".discourse_owned?" doit "returns true if the plugin is on github in discourse-org or discourse orgs" do- plugin = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")[3]+ plugin = Plugin::Instance.find_all("#{Rails.root.join("spec/fixtures/plugins")}")[3]plugin.git_repo.stubs(:latest_local_commit).returns("123456")plugin.git_repo.stubs(:url).returns("http://github.com/discourse/discourse-plugin")expect(plugin.discourse_owned?).to eq(true)@@ -152,13 +152,13 @@ TEXTendit "returns false if the commit_url is missing because of git command issues" do- plugin = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")[3]+ plugin = Plugin::Instance.find_all("#{Rails.root.join("spec/fixtures/plugins")}")[3]plugin.git_repo.stubs(:latest_local_commit).returns(nil)expect(plugin.discourse_owned?).to eq(false)endit "returns false if the commit_url has a nil path" do- plugin = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")[3]+ plugin = Plugin::Instance.find_all("#{Rails.root.join("spec/fixtures/plugins")}")[3]plugin.git_repo.stubs(:latest_local_commit).returns("123456")plugin.git_repo.stubs(:url).returns("invalid://url")parsed_url = URI.parse("invalid://url")@@ -170,7 +170,7 @@ TEXTdescribe ".preinstalled?" doit "returns true when the plugin directory has no .git directory" do- plugin = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")[3]+ plugin = Plugin::Instance.find_all("#{Rails.root.join("spec/fixtures/plugins")}")[3]expect(plugin.preinstalled?).to eq(true)end@@ -598,12 +598,12 @@ TEXTexpect(locale[:fallbackLocale]).to eq("pt_BR")expect(locale[:moment_js]).to eq(- ["pt-br", "#{Rails.root}/frontend/discourse/node_modules/moment/locale/pt-br.js"],+ ["pt-br", "#{Rails.root.join("frontend/discourse/node_modules/moment/locale/pt-br.js")}"],)expect(locale[:moment_js_timezones]).to eq(["pt",- "#{Rails.root}/node_modules/@discourse/moment-timezone-names-translations/locales/pt.js",+ "#{Rails.root.join("node_modules/@discourse/moment-timezone-names-translations/locales/pt.js")}",],)expect(locale[:plural]).to be_nil@@ -619,7 +619,7 @@ TEXTexpect(locale[:fallbackLocale]).to be_nilexpect(locale[:moment_js]).to eq(- ["tlh", "#{Rails.root}/frontend/discourse/node_modules/moment/locale/tlh.js"],+ ["tlh", "#{Rails.root.join("frontend/discourse/node_modules/moment/locale/tlh.js")}"],)expect(locale[:plural]).to eq(plural.with_indifferent_access)diff --git a/spec/lib/s3_inventory_multisite_spec.rb b/spec/lib/s3_inventory_multisite_spec.rbindex 6d0898000d6..6eac316150c 100644--- a/spec/lib/s3_inventory_multisite_spec.rb+++ b/spec/lib/s3_inventory_multisite_spec.rb@@ -9,7 +9,7 @@ RSpec.describe "S3Inventory", type: :multisite doS3Inventory.new(:upload, s3_inventory_bucket: "some-inventory-bucket/some/prefix")end- let(:csv_filename) { "#{Rails.root}/spec/fixtures/csv/s3_inventory.csv" }+ let(:csv_filename) { "#{Rails.root.join("spec/fixtures/csv/s3_inventory.csv")}" }it "can create per-site files" dofreeze_timediff --git a/spec/lib/s3_inventory_spec.rb b/spec/lib/s3_inventory_spec.rbindex ee2d756667d..d5f652a08d7 100644--- a/spec/lib/s3_inventory_spec.rb+++ b/spec/lib/s3_inventory_spec.rb@@ -5,7 +5,7 @@ RSpec.describe S3Inventory doS3Inventory.new(:upload, s3_inventory_bucket: "some-inventory-bucket/inventoried-bucket/prefix")end- let(:csv_filename) { "#{Rails.root}/spec/fixtures/csv/s3_inventory.csv" }+ let(:csv_filename) { "#{Rails.root.join("spec/fixtures/csv/s3_inventory.csv")}" }let(:system_themes_screenshots) doUploadReferencediff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rbindex e1e735b191d..bdd15a8da27 100644--- a/spec/lib/site_setting_extension_spec.rb+++ b/spec/lib/site_setting_extension_spec.rb@@ -1659,7 +1659,7 @@ RSpec.describe SiteSettingExtension doit "publishes the right MessageBus message when a theme site setting is updated" dosettings_tss_instance_1 = new_settings(provider_local)- settings_tss_instance_1.load_settings(File.join(Rails.root, "config", "site_settings.yml"))+ settings_tss_instance_1.load_settings(Rails.root.join("config/site_settings.yml").to_s)settings_tss_instance_1.refresh!expect(settings_tss_instance_1.enable_welcome_banner(theme_id: theme_1.id)).to eq(false)diff --git a/spec/lib/site_settings/yaml_loader_spec.rb b/spec/lib/site_settings/yaml_loader_spec.rbindex 6e72942dc3c..8218f861599 100644--- a/spec/lib/site_settings/yaml_loader_spec.rb+++ b/spec/lib/site_settings/yaml_loader_spec.rb@@ -24,14 +24,16 @@ RSpec.describe SiteSettings::YamlLoader doendlet!(:receiver) { Receiver.new }- let(:simple) { "#{Rails.root}/spec/fixtures/site_settings/simple.yml" }- let(:client) { "#{Rails.root}/spec/fixtures/site_settings/client.yml" }- let(:enum) { "#{Rails.root}/spec/fixtures/site_settings/enum.yml" }- let(:enum_client) { "#{Rails.root}/spec/fixtures/site_settings/enum_client.yml" }- let(:deprecated_env) { "#{Rails.root}/spec/fixtures/site_settings/deprecated_env.yml" }- let(:deprecated_hidden) { "#{Rails.root}/spec/fixtures/site_settings/deprecated_hidden.yml" }- let(:locale_default) { "#{Rails.root}/spec/fixtures/site_settings/locale_default.yml" }- let(:nil_default) { "#{Rails.root}/spec/fixtures/site_settings/nil_default.yml" }+ let(:simple) { "#{Rails.root.join("spec/fixtures/site_settings/simple.yml")}" }+ let(:client) { "#{Rails.root.join("spec/fixtures/site_settings/client.yml")}" }+ let(:enum) { "#{Rails.root.join("spec/fixtures/site_settings/enum.yml")}" }+ let(:enum_client) { "#{Rails.root.join("spec/fixtures/site_settings/enum_client.yml")}" }+ let(:deprecated_env) { "#{Rails.root.join("spec/fixtures/site_settings/deprecated_env.yml")}" }+ let(:deprecated_hidden) do+ "#{Rails.root.join("spec/fixtures/site_settings/deprecated_hidden.yml")}"+ end+ let(:locale_default) { "#{Rails.root.join("spec/fixtures/site_settings/locale_default.yml")}" }+ let(:nil_default) { "#{Rails.root.join("spec/fixtures/site_settings/nil_default.yml")}" }it "loads simple settings" doreceiver.expects(:setting).with("category1", "title", "My Site", {}).oncediff --git a/spec/lib/stylesheet/compiler_spec.rb b/spec/lib/stylesheet/compiler_spec.rbindex 84a383c0f17..425b8238756 100644--- a/spec/lib/stylesheet/compiler_spec.rb+++ b/spec/lib/stylesheet/compiler_spec.rb@@ -4,7 +4,7 @@ require "stylesheet/compiler"RSpec.describe Stylesheet::Compiler dodescribe "compilation" do- Dir["#{Rails.root.join("app/assets/stylesheets")}/*.scss"].each do |path|+ Dir["#{Rails.root.join("app/assets/stylesheets/*.scss")}"].each do |path|next if path =~ /ember_cli/path = File.basename(path, ".scss")diff --git a/spec/lib/stylesheet/manager_spec.rb b/spec/lib/stylesheet/manager_spec.rbindex 36f51005f39..96ed893272a 100644--- a/spec/lib/stylesheet/manager_spec.rb+++ b/spec/lib/stylesheet/manager_spec.rb@@ -1103,7 +1103,7 @@ RSpec.describe Stylesheet::Manager doinitial_cachebuster = Stylesheet::Manager.recalculate_fs_asset_cachebuster!additional_file_path =- "#{Rails.root}/spec/fixtures/plugins/scss_plugin/assets/stylesheets/colors.scss"+ "#{Rails.root.join("spec/fixtures/plugins/scss_plugin/assets/stylesheets/colors.scss")}"Stylesheet::Manager.stubs(:list_files).returns(original_files + [additional_file_path])new_cachebuster = Stylesheet::Manager.recalculate_fs_asset_cachebuster!diff --git a/spec/lib/theme_settings_manager/objects_spec.rb b/spec/lib/theme_settings_manager/objects_spec.rbindex 0fcb07abfc7..8bea731b077 100644--- a/spec/lib/theme_settings_manager/objects_spec.rb+++ b/spec/lib/theme_settings_manager/objects_spec.rb@@ -4,7 +4,7 @@ RSpec.describe ThemeSettingsManager::Objects dofab!(:theme)let(:theme_setting) do- yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/objects_settings.yaml")+ yaml = File.read("#{Rails.root.join("spec/fixtures/theme_settings/objects_settings.yaml")}")field = theme.set_field(target: :settings, name: "yaml", value: yaml)theme.save!theme.settingsdiff --git a/spec/lib/theme_settings_manager_spec.rb b/spec/lib/theme_settings_manager_spec.rbindex 944c0b59891..48fd87c12cc 100644--- a/spec/lib/theme_settings_manager_spec.rb+++ b/spec/lib/theme_settings_manager_spec.rb@@ -4,7 +4,7 @@ RSpec.describe ThemeSettingsManager dolet!(:theme) { Fabricate(:theme) }let(:theme_settings) do- yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/valid_settings.yaml")+ yaml = File.read("#{Rails.root.join("spec/fixtures/theme_settings/valid_settings.yaml")}")theme.set_field(target: :settings, name: "yaml", value: yaml)theme.save!theme.settingsdiff --git a/spec/lib/theme_settings_parser_spec.rb b/spec/lib/theme_settings_parser_spec.rbindex 9351e45e0fe..fa0414a29be 100644--- a/spec/lib/theme_settings_parser_spec.rb+++ b/spec/lib/theme_settings_parser_spec.rb@@ -16,7 +16,7 @@ RSpec.describe ThemeSettingsParser doenddef load_settings- yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/valid_settings.yaml")+ yaml = File.read("#{Rails.root.join("spec/fixtures/theme_settings/valid_settings.yaml")}")field = ThemeField.create!(theme_id: -1, target_id: 3, name: "yaml", value: yaml)ThemeSettingsParserdiff --git a/spec/lib/upcoming_changes_spec.rb b/spec/lib/upcoming_changes_spec.rbindex 5c93b2327d5..d03646e312b 100644--- a/spec/lib/upcoming_changes_spec.rb+++ b/spec/lib/upcoming_changes_spec.rb@@ -32,7 +32,7 @@ RSpec.describe UpcomingChanges do# There is a fixture image at spec/fixtures/images/upcoming_changes/enable_upload_debug_mode.png,# but normally upcoming change images are at Rails.public_path + /images/upcoming_changes/- Rails.stubs(:public_path).returns(File.join(Rails.root, "spec", "fixtures"))+ Rails.stubs(:public_path).returns(Rails.root.join("spec/fixtures").to_s)enddescribe ".image_exists?" do@@ -77,14 +77,10 @@ RSpec.describe UpcomingChanges doresult = described_class.image_data(setting_name, include_file_path: true)expect(result[:file_path]).to eq(- File.join(- Rails.root,- "spec",- "fixtures",- "images",- "upcoming_changes",- "#{setting_name}.png",- ),+ Rails+ .root+ .join("spec", "fixtures", "images", "upcoming_changes", "#{setting_name}.png")+ .to_s,)endenddiff --git a/spec/models/locale_site_setting_spec.rb b/spec/models/locale_site_setting_spec.rbindex 38ecffb1d1f..91c19f48bcc 100644--- a/spec/models/locale_site_setting_spec.rb+++ b/spec/models/locale_site_setting_spec.rb@@ -2,7 +2,7 @@RSpec.describe LocaleSiteSetting dodef core_locales- pattern = File.join(Rails.root, "config", "locales", "client.*.yml")+ pattern = Rails.root.join("config/locales/client.*.yml").to_sDir.glob(pattern).map { |x| x.split(".")[-2] }enddiff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rbindex aa5ec990ec2..8fd9a424e18 100644--- a/spec/models/optimized_image_spec.rb+++ b/spec/models/optimized_image_spec.rb@@ -12,7 +12,7 @@ RSpec.describe OptimizedImage dobeginOptimizedImage.crop(- "#{Rails.root}/spec/fixtures/images/logo.png",+ "#{Rails.root.join("spec/fixtures/images/logo.png")}",tmp_path,desired_width,desired_height,@@ -37,7 +37,7 @@ RSpec.describe OptimizedImage dobeginOptimizedImage.crop(- "#{Rails.root}/spec/fixtures/images/logo.png", # 244x66px+ "#{Rails.root.join("spec/fixtures/images/logo.png")}", # 244x66pxtmp_path,desired_width,desired_height,@@ -59,7 +59,7 @@ RSpec.describe OptimizedImage dobeginOptimizedImage.crop(- "#{Rails.root}/spec/fixtures/images/logo.png", # 244x66px+ "#{Rails.root.join("spec/fixtures/images/logo.png")}", # 244x66pxtmp_path,desired_width,desired_height,@@ -75,7 +75,7 @@ RSpec.describe OptimizedImage doenddescribe ".resize_instructions" do- let(:image) { "#{Rails.root}/spec/fixtures/images/logo.png" }+ let(:image) { "#{Rails.root.join("spec/fixtures/images/logo.png")}" }it "doesn't return any color options by default" doinstructions = described_class.resize_instructions(image, image, "50x50")@@ -93,7 +93,7 @@ RSpec.describe OptimizedImage dooriginal_path = Dir::Tmpname.create(%w[origin .bin]) { nil }begin- FileUtils.cp "#{Rails.root}/spec/fixtures/images/logo.png", original_path+ FileUtils.cp "#{Rails.root.join("spec/fixtures/images/logo.png")}", original_path# we use "filename" to get the correct extension here, it is more important# then any other param@@ -111,7 +111,7 @@ RSpec.describe OptimizedImage doendit "should work correctly" do- file = File.open("#{Rails.root}/spec/fixtures/images/resized.png")+ file = File.open("#{Rails.root.join("spec/fixtures/images/resized.png")}")upload = UploadCreator.new(file, "test.bin").create_for(-1)expect(upload.filesize).to eq(199)@@ -148,7 +148,7 @@ RSpec.describe OptimizedImage dobeginexpect doOptimizedImage.resize(- "#{Rails.root}/spec/fixtures/images/svg.png",+ "#{Rails.root.join("spec/fixtures/images/svg.png")}",tmp_path,5,5,@@ -168,7 +168,7 @@ RSpec.describe OptimizedImage dobeginOptimizedImage.downsize(- "#{Rails.root}/spec/fixtures/images/logo.png",+ "#{Rails.root.join("spec/fixtures/images/logo.png")}",tmp_path,"100x100\>",)diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rbindex 71198f5a4e2..109e6b8c562 100644--- a/spec/models/remote_theme_spec.rb+++ b/spec/models/remote_theme_spec.rb@@ -744,7 +744,7 @@ RSpec.describe RemoteTheme doenddescribe ".import_theme_from_directory" do- let(:theme_dir) { "#{Rails.root}/spec/fixtures/themes/discourse-test-theme" }+ let(:theme_dir) { "#{Rails.root.join("spec/fixtures/themes/discourse-test-theme")}" }it "imports a theme from a directory" dotheme = RemoteTheme.import_theme_from_directory(theme_dir)diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rbindex 1120049ccd0..a75fb56b7bb 100644--- a/spec/models/report_spec.rb+++ b/spec/models/report_spec.rb@@ -1363,7 +1363,7 @@ RSpec.describe Report doip = [81, 2, 69, 142]- DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb"))+ DiscourseIpInfo.open_db(Rails.root.join("spec/fixtures/mmdb").to_s)Resolv::DNS.any_instance.stubs(:getname)diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rbindex adea6782b93..f0d5eb3a53e 100644--- a/spec/models/theme_field_spec.rb+++ b/spec/models/theme_field_spec.rb@@ -264,7 +264,7 @@ RSpec.describe ThemeField doenddef get_fixture(type)- File.read("#{Rails.root}/spec/fixtures/theme_settings/#{type}_settings.yaml")+ File.read("#{Rails.root.join("spec/fixtures/theme_settings/#{type}_settings.yaml")}")enddef create_yaml_field(value)diff --git a/spec/multisite/upcoming_changes_spec.rb b/spec/multisite/upcoming_changes_spec.rbindex 8b08f45ef84..938162e4f60 100644--- a/spec/multisite/upcoming_changes_spec.rb+++ b/spec/multisite/upcoming_changes_spec.rb@@ -12,7 +12,7 @@ RSpec.describe "Multisite UpcomingChanges cache", type: :multisite do},},)- Rails.stubs(:public_path).returns(File.join(Rails.root, "spec", "fixtures"))+ Rails.stubs(:public_path).returns(Rails.root.join("spec/fixtures").to_s)endafter dodiff --git a/spec/rails_helper.rb b/spec/rails_helper.rbindex 3ba9976837b..f04e3898626 100644--- a/spec/rails_helper.rb+++ b/spec/rails_helper.rb@@ -411,7 +411,7 @@ RSpec.configure do |config|test_i = ENV["TEST_ENV_NUMBER"].to_i- data_dir = "#{Rails.root}/tmp/test_data_#{test_i}/minio"+ data_dir = "#{Rails.root.join("tmp/test_data_#{test_i}/minio")}"FileUtils.rm_rf(data_dir)FileUtils.mkdir_p(data_dir)minio_runner_config.minio_data_directory = data_dir@@ -1203,7 +1203,11 @@ def unfreeze_timeTrackTimeStub.unstub(:stubbed)end-def file_from_fixtures(filename, directory = "images", root_path = "#{Rails.root}/spec/fixtures")+def file_from_fixtures(+ filename,+ directory = "images",+ root_path = "#{Rails.root.join("spec/fixtures")}"+)tmp_file_path = File.join(concurrency_safe_tmp_dir, SecureRandom.hex << filename)FileUtils.cp("#{root_path}/#{directory}/#{filename}", tmp_file_path)File.new(tmp_file_path)@@ -1247,7 +1251,7 @@ def plugin_from_fixtures(plugin_name)tmp_plugins_dir = File.join(concurrency_safe_tmp_dir, "plugins")FileUtils.mkdir(tmp_plugins_dir) if !Dir.exist?(tmp_plugins_dir)- FileUtils.cp_r("#{Rails.root}/spec/fixtures/plugins/#{plugin_name}", tmp_plugins_dir)+ FileUtils.cp_r("#{Rails.root.join("spec/fixtures/plugins/#{plugin_name}")}", tmp_plugins_dir)Plugin::Instance.parse_from_source(File.join(tmp_plugins_dir, plugin_name, "plugin.rb"))end@@ -1268,7 +1272,7 @@ def has_trigger?(trigger_name)enddef stub_deprecated_settings!(override:)- SiteSetting.load_settings("#{Rails.root}/spec/fixtures/site_settings/deprecated_test.yml")+ SiteSetting.load_settings("#{Rails.root.join("spec/fixtures/site_settings/deprecated_test.yml")}")stub_const(SiteSettings::DeprecatedSettings,diff --git a/spec/requests/admin/email_styles_controller_spec.rb b/spec/requests/admin/email_styles_controller_spec.rbindex 5465a8a32fa..fe9fdc03c79 100644--- a/spec/requests/admin/email_styles_controller_spec.rb+++ b/spec/requests/admin/email_styles_controller_spec.rb@@ -5,7 +5,7 @@ RSpec.describe Admin::EmailStylesController dofab!(:moderator)fab!(:user)- let(:default_html) { File.read("#{Rails.root}/app/views/email/default_template.html") }+ let(:default_html) { File.read("#{Rails.root.join("app/views/email/default_template.html")}") }let(:default_css) { "" }after dodiff --git a/spec/requests/admin/emojis_controller_spec.rb b/spec/requests/admin/emojis_controller_spec.rbindex 2142a60185e..e2670319c56 100644--- a/spec/requests/admin/emojis_controller_spec.rb+++ b/spec/requests/admin/emojis_controller_spec.rb@@ -55,7 +55,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "test",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/fake.jpg"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/fake.jpg")}"),}expect(response.status).to eq(422)@@ -71,7 +71,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "test",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/logo.png")}"),}expect(response.status).to eq(422)@@ -88,7 +88,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "test",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/logo.png")}"),}custom_emoji = CustomEmoji.last@@ -111,7 +111,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "test",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/logo.png")}"),}last_log = UserHistory.last@@ -128,7 +128,7 @@ RSpec.describe Admin::EmojiController doparams: {name: "test",group: "Foo",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/logo.png")}"),}custom_emoji = CustomEmoji.last@@ -143,7 +143,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "test_svg",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/image.svg"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/image.svg")}"),}expect(response.status).to eq(200)@@ -161,7 +161,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "test_gif",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/animated.gif"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/animated.gif")}"),}expect(response.status).to eq(200)@@ -179,7 +179,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "test.png",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/logo.png")}"),}custom_emoji = CustomEmoji.last@@ -192,7 +192,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "st&#* onk$",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/logo.png")}"),}custom_emoji = CustomEmoji.last@@ -202,7 +202,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "PaRTYpaRrot",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/logo.png")}"),}custom_emoji = CustomEmoji.last@@ -216,7 +216,7 @@ RSpec.describe Admin::EmojiController dopost "/admin/config/emoji.json",params: {name: "test",- file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"),+ file: fixture_file_upload("#{Rails.root.join("spec/fixtures/images/logo.png")}"),}expect(response.status).to eq(404)diff --git a/spec/requests/admin/plugins_controller_spec.rb b/spec/requests/admin/plugins_controller_spec.rbindex 021c4d066c4..702441a8aa0 100644--- a/spec/requests/admin/plugins_controller_spec.rb+++ b/spec/requests/admin/plugins_controller_spec.rb@@ -43,11 +43,8 @@ RSpec.describe Admin::PluginsController dodescribe "#show" dobefore dospoiler_alert =- Plugin::Instance.parse_from_source(- File.join(Rails.root, "plugins", "spoiler-alert", "plugin.rb"),- )- poll =- Plugin::Instance.parse_from_source(File.join(Rails.root, "plugins", "poll", "plugin.rb"))+ Plugin::Instance.parse_from_source(Rails.root.join("plugins/spoiler-alert/plugin.rb").to_s)+ poll = Plugin::Instance.parse_from_source(Rails.root.join("plugins/poll/plugin.rb").to_s)Discourse.stubs(:plugins_by_name).returns({ "discourse-spoiler-alert" => spoiler_alert, "poll" => poll },diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rbindex 2e50f2ad3f2..6b42c077330 100644--- a/spec/requests/admin/themes_controller_spec.rb+++ b/spec/requests/admin/themes_controller_spec.rb@@ -1282,7 +1282,8 @@ RSpec.describe Admin::ThemesController dotheme.set_field(target: :settings,name: "yaml",- value: File.read("#{Rails.root}/spec/fixtures/theme_settings/objects_settings.yaml"),+ value:+ File.read("#{Rails.root.join("spec/fixtures/theme_settings/objects_settings.yaml")}"),)theme.save!@@ -1306,7 +1307,8 @@ RSpec.describe Admin::ThemesController dotheme.set_field(target: :settings,name: "yaml",- value: File.read("#{Rails.root}/spec/fixtures/theme_settings/objects_settings.yaml"),+ value:+ File.read("#{Rails.root.join("spec/fixtures/theme_settings/objects_settings.yaml")}"),)theme.save!@@ -1567,7 +1569,7 @@ RSpec.describe Admin::ThemesController dofab!(:theme)let(:theme_setting) do- yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/objects_settings.yaml")+ yaml = File.read("#{Rails.root.join("spec/fixtures/theme_settings/objects_settings.yaml")}")theme.set_field(target: :settings, name: "yaml", value: yaml)theme.save!theme.settings@@ -1610,7 +1612,8 @@ RSpec.describe Admin::ThemesController dotheme.set_field(target: :translations,name: "en",- value: File.read("#{Rails.root}/spec/fixtures/theme_locales/objects_settings/en.yaml"),+ value:+ File.read("#{Rails.root.join("spec/fixtures/theme_locales/objects_settings/en.yaml")}"),)theme.save!diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rbindex df1da27d2e9..ae6640811a3 100644--- a/spec/requests/admin/users_controller_spec.rb+++ b/spec/requests/admin/users_controller_spec.rb@@ -2192,7 +2192,7 @@ RSpec.describe Admin::UsersController doit "retrieves IP info" doip = "81.2.69.142"- DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb"))+ DiscourseIpInfo.open_db(Rails.root.join("spec/fixtures/mmdb").to_s)Resolv::DNS.any_instance.stubs(:getname).with(ip).returns("ip-81-2-69-142.example.com")get "/admin/users/ip-info.json", params: { ip: ip }@@ -2229,7 +2229,7 @@ RSpec.describe Admin::UsersController doit "prevents retrieval of IP info with a 404 response" doip = "81.2.69.142"- DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb"))+ DiscourseIpInfo.open_db(Rails.root.join("spec/fixtures/mmdb").to_s)Resolv::DNS.any_instance.stubs(:getname).with(ip).returns("ip-81-2-69-142.example.com")get "/admin/users/ip-info.json", params: { ip: ip }diff --git a/spec/requests/home_page_controller_spec.rb b/spec/requests/home_page_controller_spec.rbindex 3bfb65738c4..66107395373 100644--- a/spec/requests/home_page_controller_spec.rb+++ b/spec/requests/home_page_controller_spec.rb@@ -28,7 +28,10 @@ RSpec.describe HomePageController doit "should allow plugin to override output" doplugin =- plugin_class.new(nil, "#{Rails.root}/spec/fixtures/plugins/csp_extension/plugin.rb")+ plugin_class.new(+ nil,+ "#{Rails.root.join("spec/fixtures/plugins/csp_extension/plugin.rb")}",+ )plugin.register_html_builder("server:custom-homepage-crawler-view") do |c|"<div>override</div>"diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rbindex c16e7924fac..2ec62627bba 100644--- a/spec/requests/invites_controller_spec.rb+++ b/spec/requests/invites_controller_spec.rb@@ -1895,25 +1895,25 @@ RSpec.describe InvitesController doendcontext "while logged in" do- let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/discourse.csv") }+ let(:csv_file) { File.new("#{Rails.root.join("spec/fixtures/csv/discourse.csv")}") }let(:file) { Rack::Test::UploadedFile.new(File.open(csv_file)) }let(:csv_file_with_headers) do- File.new("#{Rails.root}/spec/fixtures/csv/discourse_headers.csv")+ File.new("#{Rails.root.join("spec/fixtures/csv/discourse_headers.csv")}")endlet(:file_with_headers) { Rack::Test::UploadedFile.new(File.open(csv_file_with_headers)) }let(:csv_file_with_locales) do- File.new("#{Rails.root}/spec/fixtures/csv/invites_with_locales.csv")+ File.new("#{Rails.root.join("spec/fixtures/csv/invites_with_locales.csv")}")endlet(:file_with_locales) { Rack::Test::UploadedFile.new(File.open(csv_file_with_locales)) }let(:csv_file_with_malicious_headers) do- File.new("#{Rails.root}/spec/fixtures/csv/invite_malicious_headers.csv")+ File.new("#{Rails.root.join("spec/fixtures/csv/invite_malicious_headers.csv")}")endlet(:file_with_malicious_headers) doRack::Test::UploadedFile.new(File.open(csv_file_with_malicious_headers))endlet(:csv_file_with_valid_and_invalid_headers) do- File.new("#{Rails.root}/spec/fixtures/csv/invite_valid_and_invalid_headers.csv")+ File.new("#{Rails.root.join("spec/fixtures/csv/invite_valid_and_invalid_headers.csv")}")endlet(:file_with_valid_and_invalid_headers) doRack::Test::UploadedFile.new(File.open(csv_file_with_valid_and_invalid_headers))diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rbindex 32c186d29f5..bc581890107 100644--- a/spec/requests/tags_controller_spec.rb+++ b/spec/requests/tags_controller_spec.rb@@ -2099,8 +2099,10 @@ RSpec.describe TagsController doendcontext "while logged in" do- let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/tags.csv") }- let(:invalid_csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/tags_invalid.csv") }+ let(:csv_file) { File.new("#{Rails.root.join("spec/fixtures/csv/tags.csv")}") }+ let(:invalid_csv_file) do+ File.new("#{Rails.root.join("spec/fixtures/csv/tags_invalid.csv")}")+ endlet(:file) { Rack::Test::UploadedFile.new(File.open(csv_file)) }diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rbindex 14489dc71a9..034c5d5516e 100644--- a/spec/requests/uploads_controller_spec.rb+++ b/spec/requests/uploads_controller_spec.rb@@ -18,7 +18,9 @@ RSpec.describe UploadsController dolet(:logo) { Rack::Test::UploadedFile.new(logo_file) }let(:fake_jpg) { Rack::Test::UploadedFile.new(file_from_fixtures("fake.jpg")) }- let(:text_file) { Rack::Test::UploadedFile.new(File.new("#{Rails.root}/LICENSE.txt")) }+ let(:text_file) do+ Rack::Test::UploadedFile.new(File.new("#{Rails.root.join("LICENSE.txt")}"))+ endcontext "when rate limited" dobefore { RateLimiter.enable }@@ -277,7 +279,9 @@ RSpec.describe UploadsController docontext "when system user is logged in" dobefore { sign_in(system_user) }- let(:text_file) { Rack::Test::UploadedFile.new(File.new("#{Rails.root}/LICENSE.txt")) }+ let(:text_file) do+ Rack::Test::UploadedFile.new(File.new("#{Rails.root.join("LICENSE.txt")}"))+ endit "properly returns errors if system_user_max_attachment_size_kb is not set" doSiteSetting.authorized_extensions = "*"diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex 060d80a76ce..0973713ad4c 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -5201,7 +5201,7 @@ RSpec.describe UsersController doenddescribe "auth token IP visibility" do- before { DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb")) }+ before { DiscourseIpInfo.open_db(Rails.root.join("spec/fixtures/mmdb").to_s) }let!(:token) doUserAuthToken.generate!(diff --git a/spec/serializers/admin_plugin_serializer_spec.rb b/spec/serializers/admin_plugin_serializer_spec.rbindex b0e4d88de71..b6f0691d7c6 100644--- a/spec/serializers/admin_plugin_serializer_spec.rb+++ b/spec/serializers/admin_plugin_serializer_spec.rb@@ -3,7 +3,9 @@RSpec.describe AdminPluginSerializer dosubject(:serializer) { described_class.new(instance) }- let(:all_test_plugins) { Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins") }+ let(:all_test_plugins) do+ Plugin::Instance.find_all("#{Rails.root.join("spec/fixtures/plugins")}")+ endlet(:instance) { all_test_plugins.find { |plugin| plugin.name == "color_definition" } }describe "admin_route" dodiff --git a/spec/serializers/theme_objects_setting_metadata_serializer_spec.rb b/spec/serializers/theme_objects_setting_metadata_serializer_spec.rbindex e6a270cdb30..fa8e8b6655b 100644--- a/spec/serializers/theme_objects_setting_metadata_serializer_spec.rb+++ b/spec/serializers/theme_objects_setting_metadata_serializer_spec.rb@@ -4,7 +4,7 @@ RSpec.describe ThemeObjectsSettingMetadataSerializer dofab!(:theme)let(:theme_setting) do- yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/objects_settings.yaml")+ yaml = File.read("#{Rails.root.join("spec/fixtures/theme_settings/objects_settings.yaml")}")theme.set_field(target: :settings, name: "yaml", value: yaml)theme.save!theme.settings@@ -15,7 +15,8 @@ RSpec.describe ThemeObjectsSettingMetadataSerializer dotheme.set_field(target: :translations,name: "en",- value: File.read("#{Rails.root}/spec/fixtures/theme_locales/objects_settings/en.yaml"),+ value:+ File.read("#{Rails.root.join("spec/fixtures/theme_locales/objects_settings/en.yaml")}"),)theme.save!diff --git a/spec/serializers/theme_settings_serializer_spec.rb b/spec/serializers/theme_settings_serializer_spec.rbindex 5f5a6d976f4..5fec6b55ccd 100644--- a/spec/serializers/theme_settings_serializer_spec.rb+++ b/spec/serializers/theme_settings_serializer_spec.rb@@ -4,7 +4,7 @@ RSpec.describe ThemeSettingsSerializer dofab!(:theme)let(:theme_setting) do- yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/objects_settings.yaml")+ yaml = File.read("#{Rails.root.join("spec/fixtures/theme_settings/objects_settings.yaml")}")theme.set_field(target: :settings, name: "yaml", value: yaml)theme.save!theme.settingsdiff --git a/spec/serializers/user_auth_token_serializer_spec.rb b/spec/serializers/user_auth_token_serializer_spec.rbindex 686310d37d1..50de5f6482b 100644--- a/spec/serializers/user_auth_token_serializer_spec.rb+++ b/spec/serializers/user_auth_token_serializer_spec.rb@@ -4,7 +4,7 @@ RSpec.describe UserAuthTokenSerializer dofab!(:user, :moderator)let(:token) { UserAuthToken.generate!(user_id: user.id, client_ip: "2a02:ea00::", staff: true) }- before(:each) { DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb")) }+ before(:each) { DiscourseIpInfo.open_db(Rails.root.join("spec/fixtures/mmdb").to_s) }it "serializes user auth tokens with respect to user locale" doI18n.locale = "de"diff --git a/spec/services/email_style_updater_spec.rb b/spec/services/email_style_updater_spec.rbindex 3f300a5f0bb..674f7a2680f 100644--- a/spec/services/email_style_updater_spec.rb+++ b/spec/services/email_style_updater_spec.rb@@ -2,7 +2,7 @@RSpec.describe EmailStyleUpdater dofab!(:admin)- let(:default_html) { File.read("#{Rails.root}/app/views/email/default_template.html") }+ let(:default_html) { File.read("#{Rails.root.join("app/views/email/default_template.html")}") }let(:updater) { EmailStyleUpdater.new(admin) }def expect_settings_to_be_unsetdiff --git a/spec/services/upcoming_changes/list_spec.rb b/spec/services/upcoming_changes/list_spec.rbindex 33808c52350..f920eab507a 100644--- a/spec/services/upcoming_changes/list_spec.rb+++ b/spec/services/upcoming_changes/list_spec.rb@@ -58,7 +58,7 @@ RSpec.describe UpcomingChanges::List doendit "includes the image_url if there is an image for the change in public/images" do- Rails.stubs(:public_path).returns(File.join(Rails.root, "spec", "fixtures"))+ Rails.stubs(:public_path).returns(Rails.root.join("spec/fixtures").to_s)results = result.upcoming_changesmock_setting = results.find { |change| change[:setting] == :enable_upload_debug_mode }diff --git a/spec/system/admin_editing_objects_typed_theme_setting_spec.rb b/spec/system/admin_editing_objects_typed_theme_setting_spec.rbindex 9ad49337e85..609eaf12e78 100644--- a/spec/system/admin_editing_objects_typed_theme_setting_spec.rb+++ b/spec/system/admin_editing_objects_typed_theme_setting_spec.rb@@ -13,7 +13,8 @@ RSpec.describe "Admin editing objects type" dotheme.set_field(target: :settings,name: "yaml",- value: File.read("#{Rails.root}/spec/fixtures/theme_settings/objects_settings.yaml"),+ value:+ File.read("#{Rails.root.join("spec/fixtures/theme_settings/objects_settings.yaml")}"),)theme.save!@@ -28,7 +29,8 @@ RSpec.describe "Admin editing objects type" dotheme.set_field(target: :translations,name: "en",- value: File.read("#{Rails.root}/spec/fixtures/theme_locales/objects_settings/en.yaml"),+ value:+ File.read("#{Rails.root.join("spec/fixtures/theme_locales/objects_settings/en.yaml")}"),)theme.save!@@ -160,7 +162,7 @@ RSpec.describe "Admin editing objects type" dodescribe "when editing a site setting of objects type" dobefore doSiteSetting.load_settings(- File.join("#{Rails.root}/spec/fixtures/site_settings/object_settings.yml"),+ Rails.root.join("spec/fixtures/site_settings/object_settings.yml").to_s,)enddiff --git a/spec/system/admin_filter_controls_spec.rb b/spec/system/admin_filter_controls_spec.rbindex ed7cd0521bb..4ce6d351b0a 100644--- a/spec/system/admin_filter_controls_spec.rb+++ b/spec/system/admin_filter_controls_spec.rb@@ -10,13 +10,10 @@ describe "AdminFilterControls" dobefore dosign_in(admin)- poll_plugin =- Plugin::Instance.parse_from_source(File.join(Rails.root, "plugins", "poll", "plugin.rb"))+ poll_plugin = Plugin::Instance.parse_from_source(Rails.root.join("plugins/poll/plugin.rb").to_s)spoiler_alert_plugin =- Plugin::Instance.parse_from_source(- File.join(Rails.root, "plugins", "spoiler-alert", "plugin.rb"),- )+ Plugin::Instance.parse_from_source(Rails.root.join("plugins/spoiler-alert/plugin.rb").to_s)Discourse.stubs(:plugins_sorted_by_name).returns([poll_plugin, spoiler_alert_plugin])enddiff --git a/spec/system/blocks_spec.rb b/spec/system/blocks_spec.rbindex 1b583e51092..e466536b37d 100644--- a/spec/system/blocks_spec.rb+++ b/spec/system/blocks_spec.rb@@ -2,7 +2,7 @@describe "Block conditions" dofab!(:theme) do- theme_dir = "#{Rails.root}/spec/fixtures/themes/dev-tools-test-theme"+ theme_dir = "#{Rails.root.join("spec/fixtures/themes/dev-tools-test-theme")}"theme = RemoteTheme.import_theme_from_directory(theme_dir)Theme.find(SiteSetting.default_theme_id).child_themes << themethemediff --git a/spec/system/composer/category_templates_spec.rb b/spec/system/composer/category_templates_spec.rbindex be23196e866..7ca6b70dab4 100644--- a/spec/system/composer/category_templates_spec.rb+++ b/spec/system/composer/category_templates_spec.rb@@ -438,7 +438,7 @@ describe "Composer Form Templates" docategory_page.visit(category_with_upload_template)category_page.new_topic_button.clickattach_file "prescription-uploader",- "#{Rails.root}/spec/fixtures/images/logo.png",+ "#{Rails.root.join("spec/fixtures/images/logo.png")}",make_visible: trueexpect(page).to have_css(".d-editor-preview img[alt='logo.png']")@@ -454,7 +454,7 @@ describe "Composer Form Templates" docategory_page.visit(category_with_upload_template)category_page.new_topic_button.clickattach_file "prescription-uploader",- "#{Rails.root}/spec/fixtures/images/animated.gif",+ "#{Rails.root.join("spec/fixtures/images/animated.gif")}",make_visible: trueexpect(page).to have_css(@@ -472,13 +472,13 @@ describe "Composer Form Templates" docategory_page.visit(category_with_upload_template)category_page.new_topic_button.clickattach_file "prescription-uploader",- "#{Rails.root}/spec/fixtures/images/logo.png",+ "#{Rails.root.join("spec/fixtures/images/logo.png")}",make_visible: trueattach_file "additional-docs-uploader",[- "#{Rails.root}/spec/fixtures/media/small.mp3",- "#{Rails.root}/spec/fixtures/media/small.mp4",- "#{Rails.root}/spec/fixtures/pdf/small.pdf",+ "#{Rails.root.join("spec/fixtures/media/small.mp3")}",+ "#{Rails.root.join("spec/fixtures/media/small.mp4")}",+ "#{Rails.root.join("spec/fixtures/pdf/small.pdf")}",],make_visible: truecomposer.fill_title(topic_title)@@ -499,11 +499,11 @@ describe "Composer Form Templates" docategory_page.visit(category_with_upload_template)category_page.new_topic_button.clickattach_file "prescription-uploader",- "#{Rails.root}/spec/fixtures/images/logo.png",+ "#{Rails.root.join("spec/fixtures/images/logo.png")}",make_visible: truecomposer.fill_title(topic_title)attach_file "prescription-uploader",- "#{Rails.root}/spec/fixtures/images/fake.jpg",+ "#{Rails.root.join("spec/fixtures/images/fake.jpg")}",make_visible: trueexpect(page).to have_css(".form-template-field__uploaded-files li", count: 1)@@ -547,7 +547,11 @@ describe "Composer Form Templates" doexpect(page).to have_css(".d-editor-preview", text: message)- attach_file("5-uploader", "#{Rails.root}/spec/fixtures/images/logo.png", make_visible: true)+ attach_file(+ "5-uploader",+ "#{Rails.root.join("spec/fixtures/images/logo.png")}",+ make_visible: true,+ )expect(page).to have_css(".d-editor-preview img")composer_message = "This is **bold** composer content"diff --git a/spec/system/content_security_policy_spec.rb b/spec/system/content_security_policy_spec.rbindex 2d8738d6020..9bedb09788b 100644--- a/spec/system/content_security_policy_spec.rb+++ b/spec/system/content_security_policy_spec.rb@@ -12,7 +12,8 @@ describe "Content security policy" doendit "can boot the application in strict_dynamic mode even with invalid directives from CSP extensions" do- plugin = plugin_class.new(nil, "#{Rails.root}/spec/fixtures/plugins/csp_extension/plugin.rb")+ plugin =+ plugin_class.new(nil, "#{Rails.root.join("spec/fixtures/plugins/csp_extension/plugin.rb")}")plugin.activate!Discourse.plugins << plugindiff --git a/spec/system/dev_tools_spec.rb b/spec/system/dev_tools_spec.rbindex bcefbbdf4c7..d0db771f937 100644--- a/spec/system/dev_tools_spec.rb+++ b/spec/system/dev_tools_spec.rb@@ -88,7 +88,7 @@ describe "Discourse dev tools" docontext "with test theme blocks" dofab!(:theme) do- theme_dir = "#{Rails.root}/spec/fixtures/themes/dev-tools-test-theme"+ theme_dir = "#{Rails.root.join("spec/fixtures/themes/dev-tools-test-theme")}"theme = RemoteTheme.import_theme_from_directory(theme_dir)Theme.find(SiteSetting.default_theme_id).child_themes << themethemediff --git a/spec/system/edit_category_images_spec.rb b/spec/system/edit_category_images_spec.rbindex 6729f9efc70..1397b5b6acc 100644--- a/spec/system/edit_category_images_spec.rb+++ b/spec/system/edit_category_images_spec.rb@@ -21,7 +21,7 @@ describe "Edit Category Images" dofind("#category-logo-uploader .file-uploader__controls").clickattach_file("category-logo-uploader__input",- "#{Rails.root}/spec/fixtures/images/logo.png",+ "#{Rails.root.join("spec/fixtures/images/logo.png")}",make_visible: true,)diff --git a/spec/system/viewing_reviewable_spec.rb b/spec/system/viewing_reviewable_spec.rbindex 6d7e1319835..6e40f041eb4 100644--- a/spec/system/viewing_reviewable_spec.rb+++ b/spec/system/viewing_reviewable_spec.rb@@ -208,7 +208,7 @@ describe "Viewing reviewable item" dobefore doreviewable_flagged_post.target_created_by.update!(ip_address: "81.2.69.142")- DiscourseIpInfo.open_db(File.join(Rails.root, "spec", "fixtures", "mmdb"))+ DiscourseIpInfo.open_db(Rails.root.join("spec/fixtures/mmdb").to_s)Resolv::DNS.any_instance.stubs(:getname)diff --git a/spec/tasks/qunit_cli_spec.rb b/spec/tasks/qunit_cli_spec.rbindex 0e745609be4..a782a673a14 100644--- a/spec/tasks/qunit_cli_spec.rb+++ b/spec/tasks/qunit_cli_spec.rb@@ -20,10 +20,10 @@ describe "bin/qunit" doendlet(:core_test_file) do- Dir.glob("#{Rails.root}/frontend/discourse/tests/integration/**/*-test.js").first+ Dir.glob("#{Rails.root.join("frontend/discourse/tests/integration/**/*-test.js")}").firstend- let(:chat_test_file) { Dir.glob("#{Rails.root}/plugins/chat/test/**/*-test.js").first }+ let(:chat_test_file) { Dir.glob("#{Rails.root.join("plugins/chat/test/**/*-test.js")}").first }it "runs all core tests by default" doresult = run@@ -63,7 +63,7 @@ describe "bin/qunit" do"--query","target=core","--file-path",- core_test_file.sub("#{Rails.root}/frontend/discourse/", ""),+ core_test_file.sub("#{Rails.root.join("frontend/discourse/")}", ""),"--random",a_string_matching(/\A[a-zA-Z0-9]{8}\z/),"--path",@@ -139,7 +139,7 @@ describe "bin/qunit" do"target=chat","--file-path",chat_test_file.sub(- "#{Rails.root}/plugins/chat/test/javascripts/",+ "#{Rails.root.join("plugins/chat/test/javascripts/")}","discourse/plugins/chat/",),"--random",diff --git a/spec/tasks/release_spec.rb b/spec/tasks/release_spec.rbindex 8a739e94e8c..ed552d30e44 100644--- a/spec/tasks/release_spec.rb+++ b/spec/tasks/release_spec.rb@@ -13,7 +13,10 @@ RSpec.describe "tasks/release" doenddef fake_version_rb(version)- File.read("#{Rails.root}/lib/version.rb").sub(/STRING = ".*"/, "STRING = \"#{version}\"")+ File.read("#{Rails.root.join("lib/version.rb")}").sub(+ /STRING = ".*"/,+ "STRING = \"#{version}\"",+ )enddef commit_version(version)