diff --git a/lib/onebox/engine/flickr_onebox.rb b/lib/onebox/engine/flickr_onebox.rb index e1675eee87d..a105bd0a169 100644 --- a/lib/onebox/engine/flickr_onebox.rb +++ b/lib/onebox/engine/flickr_onebox.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./opengraph_image" +require_relative "opengraph_image" module Onebox module Engine diff --git a/lib/onebox/engine/flickr_shortened_onebox.rb b/lib/onebox/engine/flickr_shortened_onebox.rb index b988fb4f7b8..2a95bda5e05 100644 --- a/lib/onebox/engine/flickr_shortened_onebox.rb +++ b/lib/onebox/engine/flickr_shortened_onebox.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./opengraph_image" +require_relative "opengraph_image" module Onebox module Engine diff --git a/plugins/discourse-affiliate/plugin.rb b/plugins/discourse-affiliate/plugin.rb index 7a6d43e14b4..86df2973566 100644 --- a/plugins/discourse-affiliate/plugin.rb +++ b/plugins/discourse-affiliate/plugin.rb @@ -10,7 +10,7 @@ enabled_site_setting :affiliate_enabled after_initialize do - require File.expand_path(File.dirname(__FILE__) + "/lib/affiliate_processor") + require_relative "lib/affiliate_processor" on(:post_process_cooked) do |doc, post| doc.css("a[href]").each { |a| a["href"] = AffiliateProcessor.apply(a["href"]) } diff --git a/plugins/discourse-assign/spec/integration/assign_spec.rb b/plugins/discourse-assign/spec/integration/assign_spec.rb index e4b5784ed4d..b4afa6d0827 100644 --- a/plugins/discourse-assign/spec/integration/assign_spec.rb +++ b/plugins/discourse-assign/spec/integration/assign_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require_relative "../support/assign_allowed_group" -require_relative "../fabricators/assign_hook_fabricator.rb" +require_relative "../fabricators/assign_hook_fabricator" describe "integration tests" do before { SiteSetting.assign_enabled = true } diff --git a/plugins/discourse-calendar/plugin.rb b/plugins/discourse-calendar/plugin.rb index b052fecaf78..99d158d6627 100644 --- a/plugins/discourse-calendar/plugin.rb +++ b/plugins/discourse-calendar/plugin.rb @@ -10,8 +10,8 @@ libdir = File.join(File.dirname(__FILE__), "vendor/holidays/lib") $LOAD_PATH.unshift(libdir) if $LOAD_PATH.exclude?(libdir) -require_relative "lib/calendar_settings_validator.rb" -require_relative "lib/calendar_first_day_of_week.rb" +require_relative "lib/calendar_settings_validator" +require_relative "lib/calendar_first_day_of_week" enabled_site_setting :calendar_enabled diff --git a/plugins/discourse-chat-integration/app/serializers/channel_serializer.rb b/plugins/discourse-chat-integration/app/serializers/channel_serializer.rb index 15688c870db..a3e8ac7283a 100644 --- a/plugins/discourse-chat-integration/app/serializers/channel_serializer.rb +++ b/plugins/discourse-chat-integration/app/serializers/channel_serializer.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./rule_serializer" +require_relative "rule_serializer" class DiscourseChatIntegration::ChannelSerializer < ApplicationSerializer attributes :id, :provider, :error_key, :error_info, :data, :rules diff --git a/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/mattermost/mattermost_provider.rb b/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/mattermost/mattermost_provider.rb index b378c33956d..387b5e81f09 100644 --- a/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/mattermost/mattermost_provider.rb +++ b/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/mattermost/mattermost_provider.rb @@ -105,4 +105,4 @@ module DiscourseChatIntegration end end -require_relative "mattermost_command_controller.rb" +require_relative "mattermost_command_controller" diff --git a/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/telegram/telegram_provider.rb b/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/telegram/telegram_provider.rb index 46e69c61d5b..9bb56a5fa31 100644 --- a/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/telegram/telegram_provider.rb +++ b/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/telegram/telegram_provider.rb @@ -122,4 +122,4 @@ module DiscourseChatIntegration end end -require_relative "telegram_command_controller.rb" +require_relative "telegram_command_controller" diff --git a/plugins/discourse-github/plugin.rb b/plugins/discourse-github/plugin.rb index 5770fdd4942..2b9b94d14fa 100644 --- a/plugins/discourse-github/plugin.rb +++ b/plugins/discourse-github/plugin.rb @@ -11,8 +11,8 @@ require "sawyer" require "octokit" # Site setting validators must be loaded before initialize -require_relative "app/lib/github_badges_repo_setting_validator.rb" -require_relative "app/lib/github_linkback_access_token_setting_validator.rb" +require_relative "app/lib/github_badges_repo_setting_validator" +require_relative "app/lib/github_linkback_access_token_setting_validator" enabled_site_setting :enable_discourse_github_plugin diff --git a/plugins/discourse-hcaptcha/plugin.rb b/plugins/discourse-hcaptcha/plugin.rb index a6548942415..e0a2cab6549 100644 --- a/plugins/discourse-hcaptcha/plugin.rb +++ b/plugins/discourse-hcaptcha/plugin.rb @@ -22,6 +22,6 @@ require_relative "lib/discourse_hcaptcha/engine" after_initialize do reloadable_patch { UsersController.include(DiscourseHcaptcha::CreateUsersControllerPatch) } - require_relative "app/services/problem_check/hcaptcha_configuration.rb" + require_relative "app/services/problem_check/hcaptcha_configuration" register_problem_check ProblemCheck::HcaptchaConfiguration end diff --git a/plugins/discourse-reactions/plugin.rb b/plugins/discourse-reactions/plugin.rb index 0d60609bb4f..c2eeb09de4b 100644 --- a/plugins/discourse-reactions/plugin.rb +++ b/plugins/discourse-reactions/plugin.rb @@ -16,8 +16,8 @@ register_asset "stylesheets/mobile/discourse-reactions.scss", :mobile register_svg_icon "star" register_svg_icon "far-star" -require_relative "lib/reaction_for_like_site_setting_enum.rb" -require_relative "lib/reactions_excluded_from_like_site_setting_validator.rb" +require_relative "lib/reaction_for_like_site_setting_enum" +require_relative "lib/reactions_excluded_from_like_site_setting_validator" after_initialize do SeedFu.fixture_paths << Rails.root.join("plugins", "discourse-reactions", "db", "fixtures").to_s diff --git a/plugins/discourse-reactions/spec/models/reaction_spec.rb b/plugins/discourse-reactions/spec/models/reaction_spec.rb index ba2eea44cc4..0cbd7fa5e02 100644 --- a/plugins/discourse-reactions/spec/models/reaction_spec.rb +++ b/plugins/discourse-reactions/spec/models/reaction_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "../fabricators/reaction_fabricator.rb" +require_relative "../fabricators/reaction_fabricator" describe DiscourseReactions::Reaction do before { SiteSetting.discourse_reactions_enabled = true } diff --git a/plugins/discourse-reactions/spec/models/reaction_user_spec.rb b/plugins/discourse-reactions/spec/models/reaction_user_spec.rb index 6310993574a..f1c79a01829 100644 --- a/plugins/discourse-reactions/spec/models/reaction_user_spec.rb +++ b/plugins/discourse-reactions/spec/models/reaction_user_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require_relative "../fabricators/reaction_fabricator.rb" -require_relative "../fabricators/reaction_user_fabricator.rb" +require_relative "../fabricators/reaction_fabricator" +require_relative "../fabricators/reaction_user_fabricator" describe DiscourseReactions::ReactionUser do before { SiteSetting.discourse_reactions_enabled = true } diff --git a/plugins/discourse-reactions/spec/serializers/post_serializer_spec.rb b/plugins/discourse-reactions/spec/serializers/post_serializer_spec.rb index b7b7e453fe1..223edecb16b 100644 --- a/plugins/discourse-reactions/spec/serializers/post_serializer_spec.rb +++ b/plugins/discourse-reactions/spec/serializers/post_serializer_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require_relative "../fabricators/reaction_fabricator.rb" -require_relative "../fabricators/reaction_user_fabricator.rb" +require_relative "../fabricators/reaction_fabricator" +require_relative "../fabricators/reaction_user_fabricator" describe PostSerializer do fab!(:user_1, :user) diff --git a/plugins/discourse-reactions/spec/serializers/topic_view_serializer_spec.rb b/plugins/discourse-reactions/spec/serializers/topic_view_serializer_spec.rb index a1c656fbfa2..3c2213611fa 100644 --- a/plugins/discourse-reactions/spec/serializers/topic_view_serializer_spec.rb +++ b/plugins/discourse-reactions/spec/serializers/topic_view_serializer_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require_relative "../fabricators/reaction_fabricator.rb" -require_relative "../fabricators/reaction_user_fabricator.rb" +require_relative "../fabricators/reaction_fabricator" +require_relative "../fabricators/reaction_user_fabricator" describe TopicViewSerializer do before { SiteSetting.discourse_reactions_enabled = true } diff --git a/plugins/discourse-reactions/spec/services/badge_granter_spec.rb b/plugins/discourse-reactions/spec/services/badge_granter_spec.rb index 9275ce44b5b..44ce40a838c 100644 --- a/plugins/discourse-reactions/spec/services/badge_granter_spec.rb +++ b/plugins/discourse-reactions/spec/services/badge_granter_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require_relative "../fabricators/reaction_fabricator.rb" -require_relative "../fabricators/reaction_user_fabricator.rb" +require_relative "../fabricators/reaction_fabricator" +require_relative "../fabricators/reaction_user_fabricator" describe BadgeGranter do fab!(:user) diff --git a/plugins/discourse-reactions/spec/services/reaction_notification_spec.rb b/plugins/discourse-reactions/spec/services/reaction_notification_spec.rb index 261555031d7..6b0a848dce4 100644 --- a/plugins/discourse-reactions/spec/services/reaction_notification_spec.rb +++ b/plugins/discourse-reactions/spec/services/reaction_notification_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require_relative "../fabricators/reaction_fabricator.rb" -require_relative "../fabricators/reaction_user_fabricator.rb" +require_relative "../fabricators/reaction_fabricator" +require_relative "../fabricators/reaction_user_fabricator" describe DiscourseReactions::ReactionNotification do before do diff --git a/plugins/discourse-solved/plugin.rb b/plugins/discourse-solved/plugin.rb index 362562ccf7c..09b7835d318 100644 --- a/plugins/discourse-solved/plugin.rb +++ b/plugins/discourse-solved/plugin.rb @@ -21,7 +21,7 @@ module ::DiscourseSolved ENABLE_ACCEPTED_ANSWERS_CUSTOM_FIELD = "enable_accepted_answers" end -require_relative "lib/discourse_solved/engine.rb" +require_relative "lib/discourse_solved/engine" after_initialize do SeedFu.fixture_paths << Rails.root.join("plugins", "discourse-solved", "db", "fixtures").to_s diff --git a/plugins/discourse-user-notes/plugin.rb b/plugins/discourse-user-notes/plugin.rb index 913bb4059bf..dcf1ec5575a 100644 --- a/plugins/discourse-user-notes/plugin.rb +++ b/plugins/discourse-user-notes/plugin.rb @@ -22,8 +22,8 @@ require_relative "lib/discourse_user_notes/engine" after_initialize do require_dependency "user" - require_relative "app/serializers/user_note_serializer.rb" - require_relative "app/controllers/discourse_user_notes/user_notes_controller.rb" + require_relative "app/serializers/user_note_serializer" + require_relative "app/controllers/discourse_user_notes/user_notes_controller" Discourse::Application.routes.append { mount ::DiscourseUserNotes::Engine, at: "/user_notes" } diff --git a/script/import_scripts/askbot.rb b/script/import_scripts/askbot.rb index a8ff40bcddd..53984f62c42 100644 --- a/script/import_scripts/askbot.rb +++ b/script/import_scripts/askbot.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "pg" class ImportScripts::MyAskBot < ImportScripts::Base diff --git a/script/import_scripts/bbpress.rb b/script/import_scripts/bbpress.rb index 064da4e560e..e83276faca5 100644 --- a/script/import_scripts/bbpress.rb +++ b/script/import_scripts/bbpress.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::Bbpress < ImportScripts::Base BB_PRESS_HOST = ENV["BBPRESS_HOST"] || "localhost" diff --git a/script/import_scripts/bespoke_1.rb b/script/import_scripts/bespoke_1.rb index dd4290fbcbc..f062e461acc 100644 --- a/script/import_scripts/bespoke_1.rb +++ b/script/import_scripts/bespoke_1.rb @@ -3,7 +3,7 @@ # bespoke importer for a customer, feel free to borrow ideas require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Call it like this: # RAILS_ENV=production bundle exec ruby script/import_scripts/bespoke_1.rb diff --git a/script/import_scripts/csv_importer.rb b/script/import_scripts/csv_importer.rb index 626645f5303..08d8230f063 100644 --- a/script/import_scripts/csv_importer.rb +++ b/script/import_scripts/csv_importer.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Edit the constants and initialize method for your import data. # Make sure to follow the right format in your CSV files. diff --git a/script/import_scripts/csv_restore_staged_users.rb b/script/import_scripts/csv_restore_staged_users.rb index 09ae974508e..5e266f2676d 100755 --- a/script/import_scripts/csv_restore_staged_users.rb +++ b/script/import_scripts/csv_restore_staged_users.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Edit the constants and initialize method for your import data. diff --git a/script/import_scripts/discuz_x.rb b/script/import_scripts/discuz_x.rb index 274431f9f13..211578e9369 100644 --- a/script/import_scripts/discuz_x.rb +++ b/script/import_scripts/discuz_x.rb @@ -12,7 +12,7 @@ require "php_serialize" require "miro" require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::DiscuzX < ImportScripts::Base DISCUZX_DB = "ultrax" diff --git a/script/import_scripts/disqus.rb b/script/import_scripts/disqus.rb index 646200fe332..02f0677802c 100644 --- a/script/import_scripts/disqus.rb +++ b/script/import_scripts/disqus.rb @@ -2,7 +2,7 @@ require "nokogiri" require "optparse" -require File.expand_path(File.dirname(__FILE__) + "/base") +require_relative "base" class ImportScripts::Disqus < ImportScripts::Base # CHANGE THESE BEFORE RUNNING THE IMPORTER diff --git a/script/import_scripts/drupal-6.rb b/script/import_scripts/drupal-6.rb index 3e27c0becd3..518f3c50a7d 100644 --- a/script/import_scripts/drupal-6.rb +++ b/script/import_scripts/drupal-6.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::Drupal < ImportScripts::Base DRUPAL_DB = ENV["DRUPAL_DB"] || "newsite3" diff --git a/script/import_scripts/drupal.rb b/script/import_scripts/drupal.rb index b1ec58d3953..98225f106a7 100644 --- a/script/import_scripts/drupal.rb +++ b/script/import_scripts/drupal.rb @@ -2,7 +2,7 @@ require "mysql2" require "htmlentities" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::Drupal < ImportScripts::Base DRUPAL_DB = ENV["DRUPAL_DB"] || "drupal" diff --git a/script/import_scripts/drupal_json.rb b/script/import_scripts/drupal_json.rb index f97ae683e11..7f9aa099f07 100644 --- a/script/import_scripts/drupal_json.rb +++ b/script/import_scripts/drupal_json.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Edit the constants and initialize method for your import data. diff --git a/script/import_scripts/drupal_qa.rb b/script/import_scripts/drupal_qa.rb index 948b04590dd..b66358d6d9b 100644 --- a/script/import_scripts/drupal_qa.rb +++ b/script/import_scripts/drupal_qa.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") -require File.expand_path(File.dirname(__FILE__) + "/drupal.rb") +require_relative "base" +require_relative "drupal" class ImportScripts::DrupalQA < ImportScripts::Drupal def categories_query diff --git a/script/import_scripts/elgg.rb b/script/import_scripts/elgg.rb index a720ea1ce49..9daed2f33b6 100644 --- a/script/import_scripts/elgg.rb +++ b/script/import_scripts/elgg.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::Elgg < ImportScripts::Base BATCH_SIZE = 1000 diff --git a/script/import_scripts/flarum_import.rb b/script/import_scripts/flarum_import.rb index 3ca83dd8c3e..ed6d01ba18e 100644 --- a/script/import_scripts/flarum_import.rb +++ b/script/import_scripts/flarum_import.rb @@ -4,7 +4,7 @@ require "mysql2" require "time" require "date" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::FLARUM < ImportScripts::Base #SET THE APPROPRIATE VALUES FOR YOUR MYSQL CONNECTION diff --git a/script/import_scripts/fluxbb.rb b/script/import_scripts/fluxbb.rb index f34132afd6b..0d7c1f5c2ab 100644 --- a/script/import_scripts/fluxbb.rb +++ b/script/import_scripts/fluxbb.rb @@ -2,7 +2,7 @@ require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Before running this script, paste these lines into your shell, # then use arrow keys to edit the values diff --git a/script/import_scripts/friendsmegplus.rb b/script/import_scripts/friendsmegplus.rb index 26b02e9290f..ee09ad8571a 100644 --- a/script/import_scripts/friendsmegplus.rb +++ b/script/import_scripts/friendsmegplus.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "csv" diff --git a/script/import_scripts/fusionforge.rb b/script/import_scripts/fusionforge.rb index 8fc368ed9f8..47ee6590654 100644 --- a/script/import_scripts/fusionforge.rb +++ b/script/import_scripts/fusionforge.rb @@ -2,7 +2,7 @@ require "pg" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Call it like this: # RAILS_ENV=production bundle exec ruby script/import_scripts/fusionforge.rb diff --git a/script/import_scripts/getsatisfaction.rb b/script/import_scripts/getsatisfaction.rb index 2bc6585f86e..0f9bb01c4a3 100644 --- a/script/import_scripts/getsatisfaction.rb +++ b/script/import_scripts/getsatisfaction.rb @@ -23,7 +23,7 @@ # You should run `rake posts:reorder_posts` after the import. require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "reverse_markdown" # gem 'reverse_markdown' # Call it like this: diff --git a/script/import_scripts/higher_logic.rb b/script/import_scripts/higher_logic.rb index 2090d03d0f8..b6bccc64c04 100644 --- a/script/import_scripts/higher_logic.rb +++ b/script/import_scripts/higher_logic.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::HigherLogic < ImportScripts::Base HIGHERLOGIC_DB = "higherlogic" diff --git a/script/import_scripts/ipboard.rb b/script/import_scripts/ipboard.rb index 8fe7e224dc2..012404cedc5 100644 --- a/script/import_scripts/ipboard.rb +++ b/script/import_scripts/ipboard.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" begin require "reverse_markdown" # https://github.com/jqr/php-serialize diff --git a/script/import_scripts/ipboard3.rb b/script/import_scripts/ipboard3.rb index 29ef5001b96..40c47dd8589 100644 --- a/script/import_scripts/ipboard3.rb +++ b/script/import_scripts/ipboard3.rb @@ -2,7 +2,7 @@ require "mysql2" require "reverse_markdown" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::IPBoard3 < ImportScripts::Base BATCH_SIZE = 5000 diff --git a/script/import_scripts/jive.rb b/script/import_scripts/jive.rb index bd44a27af6d..1c8b34cdc30 100644 --- a/script/import_scripts/jive.rb +++ b/script/import_scripts/jive.rb @@ -3,7 +3,7 @@ # Jive importer require "nokogiri" require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::Jive < ImportScripts::Base BATCH_SIZE = 1000 diff --git a/script/import_scripts/jive_api.rb b/script/import_scripts/jive_api.rb index 64b3e6f00a7..61d45c1b46a 100644 --- a/script/import_scripts/jive_api.rb +++ b/script/import_scripts/jive_api.rb @@ -2,7 +2,7 @@ require "nokogiri" require "htmlentities" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # https://developers.jivesoftware.com/api/v3/cloud/rest/index.html diff --git a/script/import_scripts/json_generic.rb b/script/import_scripts/json_generic.rb index d52d0bf665d..f064174cf5a 100755 --- a/script/import_scripts/json_generic.rb +++ b/script/import_scripts/json_generic.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Edit the constants and initialize method for your import data. diff --git a/script/import_scripts/kunena.rb b/script/import_scripts/kunena.rb index b6ec7582fbb..a04f6082c34 100644 --- a/script/import_scripts/kunena.rb +++ b/script/import_scripts/kunena.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::Kunena < ImportScripts::Base KUNENA_DB = "kunena" diff --git a/script/import_scripts/kunena3.rb b/script/import_scripts/kunena3.rb index bc99486078b..f2b77bfc138 100644 --- a/script/import_scripts/kunena3.rb +++ b/script/import_scripts/kunena3.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # If you change this script's functionality, please consider making a note here: # https://meta.discourse.org/t/importing-from-kunena-3/43776 diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb index 35c6785c21c..f16b275e5b9 100644 --- a/script/import_scripts/lithium.rb +++ b/script/import_scripts/lithium.rb @@ -15,7 +15,7 @@ require "mysql2" require "csv" require "reverse_markdown" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" # remove table conversion diff --git a/script/import_scripts/modx.rb b/script/import_scripts/modx.rb index eac48ac5eb6..2beb481a7d9 100644 --- a/script/import_scripts/modx.rb +++ b/script/import_scripts/modx.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" class ImportScripts::Modx < ImportScripts::Base diff --git a/script/import_scripts/muut.rb b/script/import_scripts/muut.rb index 32c780f3fce..079f0ca3354 100644 --- a/script/import_scripts/muut.rb +++ b/script/import_scripts/muut.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Edit the constants and initialize method for your import data. diff --git a/script/import_scripts/mybb.rb b/script/import_scripts/mybb.rb index 5357b6b9c4c..1e043d37a74 100644 --- a/script/import_scripts/mybb.rb +++ b/script/import_scripts/mybb.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Before running this script, paste these lines into your shell, # then use arrow keys to edit the values diff --git a/script/import_scripts/mybbru.rb b/script/import_scripts/mybbru.rb index 756f643e981..fcf1da62783 100755 --- a/script/import_scripts/mybbru.rb +++ b/script/import_scripts/mybbru.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Import script for forums created via mybb.ru service (or anything else that uses this simple JSON format), # using export format produced by https://github.com/AlexP11223/MybbRuUserscripts diff --git a/script/import_scripts/mylittleforum.rb b/script/import_scripts/mylittleforum.rb index 81e0fc24860..b33c7515ab6 100644 --- a/script/import_scripts/mylittleforum.rb +++ b/script/import_scripts/mylittleforum.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" # Before running this script, paste these lines into your shell, diff --git a/script/import_scripts/nabble.rb b/script/import_scripts/nabble.rb index c43efe8e5c5..20c28b01918 100644 --- a/script/import_scripts/nabble.rb +++ b/script/import_scripts/nabble.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "pg" require_relative "base/uploader" diff --git a/script/import_scripts/ning.rb b/script/import_scripts/ning.rb index 3af9b080d1b..7f5d5a1942f 100644 --- a/script/import_scripts/ning.rb +++ b/script/import_scripts/ning.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Edit the constants and initialize method for your import data. diff --git a/script/import_scripts/nodebb/nodebb.rb b/script/import_scripts/nodebb/nodebb.rb index df575f78d37..f6db2b0e41f 100644 --- a/script/import_scripts/nodebb/nodebb.rb +++ b/script/import_scripts/nodebb/nodebb.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true require_relative "../base" -require_relative "./redis" -require_relative "./mongo" +require_relative "redis" +require_relative "mongo" class ImportScripts::NodeBB < ImportScripts::Base # CHANGE THESE BEFORE RUNNING THE IMPORTER diff --git a/script/import_scripts/phorum.rb b/script/import_scripts/phorum.rb index d76393fc014..95b35dfcab5 100644 --- a/script/import_scripts/phorum.rb +++ b/script/import_scripts/phorum.rb @@ -2,7 +2,7 @@ require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::Phorum < ImportScripts::Base PHORUM_DB = "piwik" diff --git a/script/import_scripts/punbb.rb b/script/import_scripts/punbb.rb index b73e4f71281..524621c12af 100644 --- a/script/import_scripts/punbb.rb +++ b/script/import_scripts/punbb.rb @@ -2,7 +2,7 @@ require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # Call it like this: # RAILS_ENV=production bundle exec ruby script/import_scripts/punbb.rb diff --git a/script/import_scripts/quandora/import.rb b/script/import_scripts/quandora/import.rb index a3dc5dfe290..ec2cbdcd279 100644 --- a/script/import_scripts/quandora/import.rb +++ b/script/import_scripts/quandora/import.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require_relative "./quandora_question.rb" -require File.expand_path(File.dirname(__FILE__) + "/../base.rb") +require_relative "quandora_question" +require_relative "../base" class ImportScripts::Quandora < ImportScripts::Base JSON_FILES_DIR = "output" diff --git a/script/import_scripts/quandora/test/test_quandora_api.rb b/script/import_scripts/quandora/test/test_quandora_api.rb index a167ca9ad7a..6eade73bd5a 100644 --- a/script/import_scripts/quandora/test/test_quandora_api.rb +++ b/script/import_scripts/quandora/test/test_quandora_api.rb @@ -2,8 +2,8 @@ require "minitest/autorun" require "yaml" -require_relative "../quandora_api.rb" -require_relative "./test_data.rb" +require_relative "../quandora_api" +require_relative "test_data" class TestQuandoraApi < Minitest::Test DEBUG = false diff --git a/script/import_scripts/quandora/test/test_quandora_question.rb b/script/import_scripts/quandora/test/test_quandora_question.rb index 6044951c5b8..72317c102dd 100644 --- a/script/import_scripts/quandora/test/test_quandora_question.rb +++ b/script/import_scripts/quandora/test/test_quandora_question.rb @@ -3,8 +3,8 @@ require "minitest/autorun" require "cgi" require "time" -require_relative "../quandora_question.rb" -require_relative "./test_data.rb" +require_relative "../quandora_question" +require_relative "test_data" class TestQuandoraQuestion < Minitest::Test def setup diff --git a/script/import_scripts/question2answer.rb b/script/import_scripts/question2answer.rb index de9b656966f..8a0170a9d71 100644 --- a/script/import_scripts/question2answer.rb +++ b/script/import_scripts/question2answer.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" require "php_serialize" # https://github.com/jqr/php-serialize diff --git a/script/import_scripts/sfn.rb b/script/import_scripts/sfn.rb index dae0f4dff7c..400452c65fd 100644 --- a/script/import_scripts/sfn.rb +++ b/script/import_scripts/sfn.rb @@ -5,7 +5,7 @@ require "csv" require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::Sfn < ImportScripts::Base BATCH_SIZE = 100_000 diff --git a/script/import_scripts/simplepress.rb b/script/import_scripts/simplepress.rb index aeac6253fd8..53c9c1a0080 100644 --- a/script/import_scripts/simplepress.rb +++ b/script/import_scripts/simplepress.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::SimplePress < ImportScripts::Base SIMPLE_PRESS_DB = ENV["SIMPLEPRESS_DB"] || "simplepress" diff --git a/script/import_scripts/smf1.rb b/script/import_scripts/smf1.rb index b2229317c84..f1dc40a6bf6 100644 --- a/script/import_scripts/smf1.rb +++ b/script/import_scripts/smf1.rb @@ -2,7 +2,7 @@ require "mysql2" require "htmlentities" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::Smf1 < ImportScripts::Base BATCH_SIZE = 5000 diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index dd56294ac67..6dd2d9b3bf1 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" require "tsort" diff --git a/script/import_scripts/socialcast/import.rb b/script/import_scripts/socialcast/import.rb index da36461a54f..9fcd70b6962 100644 --- a/script/import_scripts/socialcast/import.rb +++ b/script/import_scripts/socialcast/import.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require_relative "./socialcast_message.rb" -require_relative "./socialcast_user.rb" -require File.expand_path(File.dirname(__FILE__) + "/../base.rb") +require_relative "socialcast_message" +require_relative "socialcast_user" +require_relative "../base" class ImportScripts::Socialcast < ImportScripts::Base MESSAGES_DIR = "output/messages" diff --git a/script/import_scripts/socialcast/socialcast_message.rb b/script/import_scripts/socialcast/socialcast_message.rb index 457713983a5..db7b5a6c25e 100644 --- a/script/import_scripts/socialcast/socialcast_message.rb +++ b/script/import_scripts/socialcast/socialcast_message.rb @@ -3,7 +3,7 @@ require "json" require "cgi" require "time" -require_relative "create_title.rb" +require_relative "create_title" class SocialcastMessage DEFAULT_CATEGORY = "Socialcast Import" diff --git a/script/import_scripts/socialcast/test/test_create_title.rb b/script/import_scripts/socialcast/test/test_create_title.rb index 0dac092550f..7b2d113c0ac 100644 --- a/script/import_scripts/socialcast/test/test_create_title.rb +++ b/script/import_scripts/socialcast/test/test_create_title.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "minitest/autorun" -require_relative "../create_title.rb" +require_relative "../create_title" class TestCreateTitle < Minitest::Test def test_create_title_1 diff --git a/script/import_scripts/socialcast/test/test_socialcast_api.rb b/script/import_scripts/socialcast/test/test_socialcast_api.rb index f46e0fefd55..4fb9f8af008 100644 --- a/script/import_scripts/socialcast/test/test_socialcast_api.rb +++ b/script/import_scripts/socialcast/test/test_socialcast_api.rb @@ -2,8 +2,8 @@ require "minitest/autorun" require "yaml" -require_relative "../socialcast_api.rb" -require_relative "./test_data.rb" +require_relative "../socialcast_api" +require_relative "test_data" class TestSocialcastApi < Minitest::Test DEBUG = false diff --git a/script/import_scripts/socialcast/title.rb b/script/import_scripts/socialcast/title.rb index e24b3f4519a..977aa712c26 100644 --- a/script/import_scripts/socialcast/title.rb +++ b/script/import_scripts/socialcast/title.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require_relative "./socialcast_message.rb" -require_relative "./socialcast_user.rb" -require File.expand_path(File.dirname(__FILE__) + "/../base.rb") +require_relative "socialcast_message" +require_relative "socialcast_user" +require_relative "../base" MESSAGES_DIR = "output/messages" diff --git a/script/import_scripts/sourceforge.rb b/script/import_scripts/sourceforge.rb index 8d165a7fa0e..d9a56679a91 100644 --- a/script/import_scripts/sourceforge.rb +++ b/script/import_scripts/sourceforge.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "base.rb" +require_relative "base" # Import script for SourceForge discussions. # diff --git a/script/import_scripts/stack_overflow.rb b/script/import_scripts/stack_overflow.rb index 72ce3fca150..2b3750e3181 100644 --- a/script/import_scripts/stack_overflow.rb +++ b/script/import_scripts/stack_overflow.rb @@ -2,7 +2,7 @@ # cf. https://github.com/rails-sqlserver/tiny_tds#install require "tiny_tds" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" class ImportScripts::StackOverflow < ImportScripts::Base BATCH_SIZE = 1000 diff --git a/script/import_scripts/vanilla.rb b/script/import_scripts/vanilla.rb index c2e9cb85821..519cb6a206b 100644 --- a/script/import_scripts/vanilla.rb +++ b/script/import_scripts/vanilla.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" # NOTE: this importer expects a text file obtained through Vanilla Porter # user documentation: https://meta.discourse.org/t/how-to-migrate-import-from-vanilla-to-discourse/27273 diff --git a/script/import_scripts/vanilla_mysql.rb b/script/import_scripts/vanilla_mysql.rb index 5d337ea198e..a38a470c487 100644 --- a/script/import_scripts/vanilla_mysql.rb +++ b/script/import_scripts/vanilla_mysql.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" require "reverse_markdown" require_relative "vanilla_body_parser" diff --git a/script/import_scripts/vbulletin.rb b/script/import_scripts/vbulletin.rb index c53392d61bb..e49f5f0e9ac 100644 --- a/script/import_scripts/vbulletin.rb +++ b/script/import_scripts/vbulletin.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" begin require "php_serialize" # https://github.com/jqr/php-serialize diff --git a/script/import_scripts/vbulletin3.rb b/script/import_scripts/vbulletin3.rb index 278732190f1..71ec3ec8d59 100644 --- a/script/import_scripts/vbulletin3.rb +++ b/script/import_scripts/vbulletin3.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" begin require "php_serialize" # https://github.com/jqr/php-serialize @@ -504,7 +504,7 @@ LEFT OUTER JOIN #{TABLE_PREFIX}avatar a ON a.avatarid = u.avatarid (SELECT forumpermissions & 96 > 0 FROM #{TABLE_PREFIX}forumpermission fp WHERE fp.forumid = f.forumid AND usergroupid = 2) AS registered_reply, (SELECT max(forumpermissions & 524288 > 0) FROM #{TABLE_PREFIX}forumpermission fp WHERE fp.forumid = f.forumid AND usergroupid IN (5,6)) AS staff_access, (SELECT count(DISTINCT coalesce(fp.forumpermissions & 524288 > 0, 2)) > 1 FROM #{TABLE_PREFIX}usergroup ug LEFT OUTER JOIN #{TABLE_PREFIX}forumpermission fp ON fp.forumid = f.forumid AND fp.usergroupid = ug.usergroupid WHERE ug.ispublicgroup = 1) AS special_access - FROM #{TABLE_PREFIX}forum f + FROM #{TABLE_PREFIX}forum f ORDER BY forumid SQL diff --git a/script/import_scripts/vbulletin5.rb b/script/import_scripts/vbulletin5.rb index 46b3783ccda..6e7e39bd1c5 100644 --- a/script/import_scripts/vbulletin5.rb +++ b/script/import_scripts/vbulletin5.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "mysql2" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "htmlentities" class ImportScripts::VBulletin < ImportScripts::Base diff --git a/script/import_scripts/xenforo.rb b/script/import_scripts/xenforo.rb index 48bd9865db1..5f6541be985 100755 --- a/script/import_scripts/xenforo.rb +++ b/script/import_scripts/xenforo.rb @@ -14,7 +14,7 @@ rescue LoadError exit end -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" AVATAR_DIR = "/path/to/avatars" # Call it like this: # RAILS_ENV=production bundle exec ruby script/import_scripts/xenforo.rb diff --git a/script/import_scripts/yahoogroup.rb b/script/import_scripts/yahoogroup.rb index 4c307f506e6..b62101ed46a 100644 --- a/script/import_scripts/yahoogroup.rb +++ b/script/import_scripts/yahoogroup.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require File.expand_path(File.dirname(__FILE__) + "/base.rb") +require_relative "base" require "mongo" # Import YahooGroups data as exported into MongoDB by: diff --git a/script/import_scripts/zoho.rb b/script/import_scripts/zoho.rb index fecd28221c3..6770c2d2809 100644 --- a/script/import_scripts/zoho.rb +++ b/script/import_scripts/zoho.rb @@ -22,8 +22,8 @@ # usernames to be created. require "csv" -require File.expand_path(File.dirname(__FILE__) + "/base.rb") -require File.expand_path(File.dirname(__FILE__) + "/base/csv_helper.rb") +require_relative "base" +require_relative "base/csv_helper" # Call it like this: # bundle exec ruby script/import_scripts/zoho.rb diff --git a/script/profile_db_generator.rb b/script/profile_db_generator.rb index 8222c008096..b3b1e759b6d 100644 --- a/script/profile_db_generator.rb +++ b/script/profile_db_generator.rb @@ -58,7 +58,7 @@ def create_user(seq, admin: false, username: nil) end end -require File.expand_path(File.dirname(__FILE__) + "/../config/environment") +require_relative "../config/environment" Jobs.run_immediately! diff --git a/script/user_simulator.rb b/script/user_simulator.rb index 0688d4fd214..2f3992bbcf2 100644 --- a/script/user_simulator.rb +++ b/script/user_simulator.rb @@ -36,7 +36,7 @@ unless user_id exit end -require File.expand_path(File.dirname(__FILE__) + "/../config/environment") +require_relative "../config/environment" if %w[profile development].exclude? Rails.env puts "Bad idea to run a script that inserts random posts in any non development environment" diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 1fd7342ee6b..30ab4dcdc48 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -119,7 +119,7 @@ Dir[Rails.root.join("spec/system/page_objects/**/*_base.rb")].each { |f| require Dir[Rails.root.join("spec/system/page_objects/**/*.rb")].each { |f| require f } Dir[Rails.root.join("spec/fabricators/*.rb")].each { |f| require f } -require_relative "./helpers/redis_snapshot_helper" +require_relative "helpers/redis_snapshot_helper" # Require plugin helpers at plugin/[plugin]/spec/plugin_helper.rb (includes symlinked plugins). if ENV["LOAD_PLUGINS"] == "1" diff --git a/themes/horizon/spec/system/horizon_high_level_spec.rb b/themes/horizon/spec/system/horizon_high_level_spec.rb index 64b55e5a7e7..2c8652a7adc 100644 --- a/themes/horizon/spec/system/horizon_high_level_spec.rb +++ b/themes/horizon/spec/system/horizon_high_level_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./page_objects/components/user_color_palette_selector" +require_relative "page_objects/components/user_color_palette_selector" describe "Horizon theme | High level", type: :system do let!(:theme) do diff --git a/themes/horizon/spec/system/user_color_palette_selector_spec.rb b/themes/horizon/spec/system/user_color_palette_selector_spec.rb index c0237867349..8ba416cf94d 100644 --- a/themes/horizon/spec/system/user_color_palette_selector_spec.rb +++ b/themes/horizon/spec/system/user_color_palette_selector_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./page_objects/components/user_color_palette_selector" +require_relative "page_objects/components/user_color_palette_selector" describe "Horizon theme | User color palette selector", type: :system do let(:set_theme_as_default) { true }