From 3e50313fdc7874af6d8b18b8eee776d215cf56d9 Mon Sep 17 00:00:00 2001 From: Andy Waite Date: Sun, 11 Oct 2015 10:41:23 +0100 Subject: [PATCH] Prepare for separation of RSpec helper files Since rspec-rails 3, the default installation creates two helper files: * `spec_helper.rb` * `rails_helper.rb` `spec_helper.rb` is intended as a way of running specs that do not require Rails, whereas `rails_helper.rb` loads Rails (as Discourse's current `spec_helper.rb` does). For more information: https://www.relishapp.com/rspec/rspec-rails/docs/upgrade#default-helper-files In this commit, I've simply replaced all instances of `spec_helper` with `rails_helper`, and renamed the original `spec_helper.rb`. This brings the Discourse project closer to the standard usage of RSpec in a Rails app. At present, every spec relies on loading Rails, but there are likely many that don't need to. In a future pull request, I hope to introduce a separate, minimal `spec_helper.rb` which can be used in tests which don't rely on Rails. --- lib/autospec/rspec_runner.rb | 2 +- plugins/poll/spec/controllers/polls_controller_spec.rb | 2 +- plugins/poll/spec/controllers/posts_controller_spec.rb | 2 +- spec/components/admin_user_index_query_spec.rb | 2 +- spec/components/archetype_spec.rb | 2 +- spec/components/auth/default_current_user_provider_spec.rb | 2 +- spec/components/auth/facebook_authenticator_spec.rb | 2 +- spec/components/auth/google_oauth2_authenticator_spec.rb | 2 +- spec/components/auth/open_id_authenticator_spec.rb | 2 +- spec/components/avatar_lookup_spec.rb | 2 +- spec/components/cache_spec.rb | 2 +- spec/components/category_list_spec.rb | 2 +- spec/components/common_passwords/common_passwords_spec.rb | 2 +- spec/components/composer_messages_finder_spec.rb | 2 +- spec/components/concern/has_custom_fields_spec.rb | 2 +- spec/components/concern/positionable_spec.rb | 2 +- spec/components/content_buffer_spec.rb | 2 +- spec/components/cooked_post_processor_spec.rb | 2 +- spec/components/crawler_detection_spec.rb | 2 +- spec/components/current_user_spec.rb | 2 +- spec/components/demon/base_spec.rb | 2 +- spec/components/directory_helper_spec.rb | 2 +- spec/components/discourse_diff_spec.rb | 2 +- spec/components/discourse_event_spec.rb | 2 +- spec/components/discourse_hub_spec.rb | 2 +- spec/components/discourse_i18n_spec.rb | 2 +- spec/components/discourse_plugin_registry_spec.rb | 2 +- spec/components/discourse_plugin_spec.rb | 2 +- spec/components/discourse_sass_compiler_spec.rb | 2 +- spec/components/discourse_spec.rb | 2 +- spec/components/discourse_stylesheets_spec.rb | 2 +- spec/components/discourse_updates_spec.rb | 2 +- spec/components/distributed_cache_spec.rb | 2 +- spec/components/distributed_memoizer_spec.rb | 2 +- spec/components/distributed_mutex_spec.rb | 2 +- spec/components/email/email_spec.rb | 2 +- spec/components/email/message_builder_spec.rb | 2 +- spec/components/email/receiver_spec.rb | 2 +- spec/components/email/renderer_spec.rb | 2 +- spec/components/email/sender_spec.rb | 2 +- spec/components/email/styles_spec.rb | 2 +- spec/components/enum_spec.rb | 2 +- spec/components/file_store/local_store_spec.rb | 2 +- spec/components/file_store/s3_store_spec.rb | 2 +- spec/components/filter_best_posts_spec.rb | 2 +- spec/components/flag_query_spec.rb | 2 +- spec/components/freedom_patches/pool_drainer_spec.rb | 2 +- spec/components/freedom_patches/safe_buffer_spec.rb | 2 +- spec/components/gaps_spec.rb | 2 +- spec/components/guardian_spec.rb | 2 +- spec/components/has_errors_spec.rb | 2 +- spec/components/highlight_js/highlight_js_spec.rb | 2 +- spec/components/html_prettify_spec.rb | 2 +- spec/components/image_sizer_spec.rb | 2 +- spec/components/import/normalize_spec.rb | 2 +- spec/components/js_locale_helper_spec.rb | 2 +- spec/components/json_error_spec.rb | 2 +- spec/components/letter_avatar_spec.rb | 2 +- spec/components/middleware/anonymous_cache_spec.rb | 2 +- spec/components/middleware/request_tracker_spec.rb | 2 +- spec/components/new_post_manager_spec.rb | 2 +- spec/components/new_post_result_spec.rb | 2 +- spec/components/onebox/engine/discourse_local_onebox_spec.rb | 2 +- spec/components/onebox/engine/flash_video_onebox_spec.rb | 2 +- spec/components/oneboxer_spec.rb | 2 +- spec/components/onpdiff_spec.rb | 2 +- spec/components/pinned_check_spec.rb | 2 +- spec/components/plugin/filter_manager_spec.rb | 2 +- spec/components/plugin/instance_spec.rb | 2 +- spec/components/plugin/metadata_spec.rb | 2 +- spec/components/post_creator_spec.rb | 2 +- spec/components/post_destroyer_spec.rb | 2 +- spec/components/post_enqueuer_spec.rb | 2 +- spec/components/post_revisor_spec.rb | 2 +- spec/components/pretty_text_spec.rb | 2 +- spec/components/promotion_spec.rb | 2 +- spec/components/rate_limiter_spec.rb | 2 +- spec/components/redis_store_spec.rb | 2 +- spec/components/s3_helper_spec.rb | 2 +- spec/components/scheduler/defer_spec.rb | 2 +- spec/components/scheduler/manager_spec.rb | 2 +- spec/components/scheduler/schedule_info_spec.rb | 2 +- spec/components/score_calculator_spec.rb | 2 +- spec/components/search_spec.rb | 2 +- spec/components/sidekiq/pausable_spec.rb | 2 +- spec/components/site_setting_extension_spec.rb | 2 +- spec/components/site_settings/db_provider_spec.rb | 2 +- spec/components/site_settings/local_process_provider_spec.rb | 2 +- spec/components/site_settings/yaml_loader_spec.rb | 2 +- spec/components/slug_spec.rb | 2 +- spec/components/spam_handler_spec.rb | 2 +- spec/components/sql_builder_spec.rb | 2 +- spec/components/suggested_topics_builder_spec.rb | 2 +- spec/components/system_message_spec.rb | 2 +- spec/components/text_cleaner_spec.rb | 2 +- spec/components/text_sentinel_spec.rb | 2 +- spec/components/topic_creator_spec.rb | 2 +- spec/components/topic_query_spec.rb | 2 +- spec/components/topic_retriever_spec.rb | 2 +- spec/components/topic_view_spec.rb | 2 +- spec/components/topics_bulk_action_spec.rb | 2 +- spec/components/trashable_spec.rb | 2 +- spec/components/unread_spec.rb | 2 +- spec/components/url_helper_spec.rb | 2 +- spec/components/user_name_suggester_spec.rb | 2 +- spec/components/validators/allowed_ip_address_validator_spec.rb | 2 +- spec/components/validators/email_setting_validator_spec.rb | 2 +- spec/components/validators/email_validator_spec.rb | 2 +- spec/components/validators/integer_setting_validator_spec.rb | 2 +- spec/components/validators/ip_address_format_validator_spec.rb | 2 +- spec/components/validators/password_validator_spec.rb | 2 +- spec/components/validators/post_validator_spec.rb | 2 +- spec/components/validators/quality_title_validator_spec.rb | 2 +- .../validators/reply_by_email_address_validator_spec.rb | 2 +- spec/components/validators/string_setting_validator_spec.rb | 2 +- spec/components/validators/topic_title_length_validator_spec.rb | 2 +- spec/components/validators/user_full_name_validator_spec.rb | 2 +- spec/components/validators/username_setting_validator_spec.rb | 2 +- spec/components/version_spec.rb | 2 +- spec/controllers/admin/admin_controller_spec.rb | 2 +- spec/controllers/admin/api_controller_spec.rb | 2 +- spec/controllers/admin/backups_controller_spec.rb | 2 +- spec/controllers/admin/badges_controller_spec.rb | 2 +- spec/controllers/admin/color_schemes_controller_spec.rb | 2 +- spec/controllers/admin/dashboard_controller_spec.rb | 2 +- spec/controllers/admin/email_controller_spec.rb | 2 +- spec/controllers/admin/embeddable_hosts_controller_spec.rb | 2 +- spec/controllers/admin/embedding_controller_spec.rb | 2 +- spec/controllers/admin/emojis_controller_spec.rb | 2 +- spec/controllers/admin/flags_controller_spec.rb | 2 +- spec/controllers/admin/groups_controller_spec.rb | 2 +- spec/controllers/admin/impersonate_controller_spec.rb | 2 +- spec/controllers/admin/permalinks_controller_spec.rb | 2 +- spec/controllers/admin/plugins_controller_spec.rb | 2 +- spec/controllers/admin/reports_controller_spec.rb | 2 +- spec/controllers/admin/screened_emails_controller_spec.rb | 2 +- spec/controllers/admin/screened_ip_addresses_controller_spec.rb | 2 +- spec/controllers/admin/screened_urls_controller_spec.rb | 2 +- spec/controllers/admin/site_customizations_controller_spec.rb | 2 +- spec/controllers/admin/site_settings_controller_spec.rb | 2 +- spec/controllers/admin/site_texts_controller_spec.rb | 2 +- spec/controllers/admin/staff_action_logs_controller_spec.rb | 2 +- spec/controllers/admin/user_fields_controller_spec.rb | 2 +- spec/controllers/admin/users_controller_spec.rb | 2 +- spec/controllers/admin/versions_controller_spec.rb | 2 +- spec/controllers/application_controller_spec.rb | 2 +- spec/controllers/badges_controller_spec.rb | 2 +- spec/controllers/categories_controller_spec.rb | 2 +- spec/controllers/clicks_controller_spec.rb | 2 +- spec/controllers/composer_messages_controller_spec.rb | 2 +- spec/controllers/directory_items_controller_spec.rb | 2 +- spec/controllers/draft_controller_spec.rb | 2 +- spec/controllers/email_controller_spec.rb | 2 +- spec/controllers/embed_controller_spec.rb | 2 +- spec/controllers/export_csv_controller_spec.rb | 2 +- spec/controllers/groups_controller_spec.rb | 2 +- spec/controllers/invites_controller_spec.rb | 2 +- spec/controllers/list_controller_spec.rb | 2 +- spec/controllers/manifest_json_controller_spec.rb | 2 +- spec/controllers/notifications_controller_spec.rb | 2 +- spec/controllers/omniauth_callbacks_controller_spec.rb | 2 +- spec/controllers/onebox_controller_spec.rb | 2 +- spec/controllers/permalinks_controller_spec.rb | 2 +- spec/controllers/post_action_users_controller_spec.rb | 2 +- spec/controllers/post_actions_controller_spec.rb | 2 +- spec/controllers/posts_controller_spec.rb | 2 +- spec/controllers/queued_posts_controller_spec.rb | 2 +- spec/controllers/robots_txt_controller_spec.rb | 2 +- spec/controllers/search_controller_spec.rb | 2 +- spec/controllers/session_controller_spec.rb | 2 +- spec/controllers/similar_topics_controller_spec.rb | 2 +- spec/controllers/site_customizations_controller_spec.rb | 2 +- spec/controllers/static_controller_spec.rb | 2 +- spec/controllers/stylesheets_controller_spec.rb | 2 +- spec/controllers/topics_controller_spec.rb | 2 +- spec/controllers/uploads_controller_spec.rb | 2 +- spec/controllers/user_actions_controller_spec.rb | 2 +- spec/controllers/user_avatars_controller_spec.rb | 2 +- spec/controllers/user_badges_controller_spec.rb | 2 +- spec/controllers/users_controller_spec.rb | 2 +- spec/helpers/application_helper_spec.rb | 2 +- spec/integration/invite_only_registration_spec.rb | 2 +- spec/integration/same_ip_spammers_spec.rb | 2 +- spec/integration/spam_rules_spec.rb | 2 +- spec/integration/topic_auto_close_spec.rb | 2 +- spec/integrity/i18n_spec.rb | 2 +- spec/jobs/about_stats_spec.rb | 2 +- spec/jobs/automatic_group_membership_spec.rb | 2 +- spec/jobs/bulk_invite_spec.rb | 2 +- spec/jobs/clean_up_exports_spec.rb | 2 +- spec/jobs/clean_up_uploads_spec.rb | 2 +- spec/jobs/close_topic_spec.rb | 2 +- spec/jobs/crawl_topic_link_spec.rb | 2 +- spec/jobs/create_missing_avatars_spec.rb | 2 +- spec/jobs/dashboard_stats_spec.rb | 2 +- spec/jobs/enqueue_digest_emails_spec.rb | 2 +- spec/jobs/export_csv_file_spec.rb | 2 +- spec/jobs/feature_topic_users_spec.rb | 2 +- spec/jobs/invite_email_spec.rb | 2 +- spec/jobs/jobs_base_spec.rb | 2 +- spec/jobs/jobs_spec.rb | 2 +- spec/jobs/notify_mailing_list_subscribers_spec.rb | 2 +- spec/jobs/notify_moved_posts_spec.rb | 2 +- spec/jobs/pending_flags_reminder_spec.rb | 2 +- spec/jobs/pending_queued_posts_reminder_spec.rb | 2 +- spec/jobs/pending_users_reminder_spec.rb | 2 +- spec/jobs/periodical_updates_spec.rb | 2 +- spec/jobs/poll_feed_spec.rb | 2 +- spec/jobs/poll_mailbox_spec.rb | 2 +- spec/jobs/process_post_spec.rb | 2 +- spec/jobs/send_system_message_spec.rb | 2 +- spec/jobs/test_email_spec.rb | 2 +- spec/jobs/tl3_promotions_spec.rb | 2 +- spec/jobs/update_gravatar_spec.rb | 2 +- spec/jobs/user_email_spec.rb | 2 +- spec/mailers/invite_mailer_spec.rb | 2 +- spec/mailers/rejection_mailer_spec.rb | 2 +- spec/mailers/test_mailer_spec.rb | 2 +- spec/mailers/user_notifications_spec.rb | 2 +- spec/mailers/version_mailer_spec.rb | 2 +- spec/models/about_spec.rb | 2 +- spec/models/admin_dashboard_data_spec.rb | 2 +- spec/models/api_key_spec.rb | 2 +- spec/models/application_request_spec.rb | 2 +- spec/models/backup_spec.rb | 2 +- spec/models/badge_spec.rb | 2 +- spec/models/badge_type.rb | 2 +- spec/models/category_featured_topic_spec.rb | 2 +- spec/models/category_featured_user_spec.rb | 2 +- spec/models/category_spec.rb | 2 +- spec/models/category_user_spec.rb | 2 +- spec/models/color_scheme_color_spec.rb | 2 +- spec/models/color_scheme_spec.rb | 2 +- spec/models/digest_email_site_setting_spec.rb | 2 +- spec/models/digest_unsubscribe_key_spec.rb | 2 +- spec/models/directory_item_spec.rb | 2 +- spec/models/discourse_single_sign_on_spec.rb | 2 +- spec/models/draft_sequence_spec.rb | 2 +- spec/models/draft_spec.rb | 2 +- spec/models/email_log_spec.rb | 2 +- spec/models/email_token_spec.rb | 2 +- spec/models/embeddable_host_spec.rb | 2 +- spec/models/global_setting_spec.rb | 2 +- spec/models/group_spec.rb | 2 +- spec/models/incoming_link_spec.rb | 2 +- spec/models/incoming_links_report_spec.rb | 2 +- spec/models/invite_redeemer_spec.rb | 2 +- spec/models/invite_spec.rb | 2 +- spec/models/locale_site_setting_spec.rb | 2 +- spec/models/notification_spec.rb | 2 +- spec/models/optimized_image_spec.rb | 2 +- spec/models/permalink_spec.rb | 2 +- spec/models/plugin_store_spec.rb | 2 +- spec/models/post_action_spec.rb | 2 +- spec/models/post_alert_observer_spec.rb | 2 +- spec/models/post_analyzer_spec.rb | 2 +- spec/models/post_detail_spec.rb | 2 +- spec/models/post_mover_spec.rb | 2 +- spec/models/post_reply_spec.rb | 2 +- spec/models/post_spec.rb | 2 +- spec/models/post_timing_spec.rb | 2 +- spec/models/post_upload_spec.rb | 2 +- spec/models/queued_post_spec.rb | 2 +- spec/models/quoted_post_spec.rb | 2 +- spec/models/report_spec.rb | 2 +- spec/models/rtl_spec.rb | 2 +- spec/models/s3_region_site_setting_spec.rb | 2 +- spec/models/screened_email_spec.rb | 2 +- spec/models/screened_ip_address_spec.rb | 2 +- spec/models/screened_url_spec.rb | 2 +- spec/models/search_observer_spec.rb | 2 +- spec/models/site_customization_spec.rb | 2 +- spec/models/site_setting_spec.rb | 2 +- spec/models/site_spec.rb | 2 +- spec/models/stylesheet_cache_spec.rb | 2 +- spec/models/top_menu_item_spec.rb | 2 +- spec/models/top_topic_spec.rb | 2 +- spec/models/topic_allowed_user_spec.rb | 2 +- spec/models/topic_embed_spec.rb | 2 +- spec/models/topic_featured_users_spec.rb | 2 +- spec/models/topic_invite_spec.rb | 2 +- spec/models/topic_link_click_spec.rb | 2 +- spec/models/topic_link_spec.rb | 2 +- spec/models/topic_participants_summary_spec.rb | 2 +- spec/models/topic_posters_summary_spec.rb | 2 +- spec/models/topic_spec.rb | 2 +- spec/models/topic_status_update_spec.rb | 2 +- spec/models/topic_tracking_state_spec.rb | 2 +- spec/models/topic_user_spec.rb | 2 +- spec/models/topic_view_item_spec.rb | 2 +- spec/models/trust_level3_requirements_spec.rb | 2 +- spec/models/twitter_user_info_spec.rb | 2 +- spec/models/upload_spec.rb | 2 +- spec/models/user_action_spec.rb | 2 +- spec/models/user_avatar_spec.rb | 2 +- spec/models/user_badge.rb | 2 +- spec/models/user_email_observer_spec.rb | 2 +- spec/models/user_history_spec.rb | 2 +- spec/models/user_open_id_spec.rb | 2 +- spec/models/user_profile_spec.rb | 2 +- spec/models/user_profile_view_spec.rb | 2 +- spec/models/user_search_spec.rb | 2 +- spec/models/user_spec.rb | 2 +- spec/models/user_stat_spec.rb | 2 +- spec/models/user_visit_spec.rb | 2 +- spec/models/username_validator_spec.rb | 2 +- spec/{spec_helper.rb => rails_helper.rb} | 0 spec/serializers/basic_post_serializer_spec.rb | 2 +- spec/serializers/category_detailed_serializer_spec.rb | 2 +- spec/serializers/post_serializer_spec.rb | 2 +- spec/serializers/topic_list_item_serializer_spec.rb | 2 +- spec/serializers/user_serializer_spec.rb | 2 +- spec/services/anonymous_shadow_creator_spec.rb | 2 +- spec/services/auto_block_spec.rb | 2 +- spec/services/badge_granter_spec.rb | 2 +- spec/services/color_scheme_revisor_spec.rb | 2 +- spec/services/flag_sockpuppets_spec.rb | 2 +- spec/services/group_message_spec.rb | 2 +- spec/services/post_alerter_spec.rb | 2 +- spec/services/post_owner_changer_spec.rb | 2 +- spec/services/post_timestamp_changer_spec.rb | 2 +- spec/services/random_topic_selector_spec.rb | 2 +- spec/services/spam_rules_enforcer_spec.rb | 2 +- spec/services/staff_action_logger_spec.rb | 2 +- spec/services/user_activator_spec.rb | 2 +- spec/services/user_anonymizer_spec.rb | 2 +- spec/services/user_blocker_spec.rb | 2 +- spec/services/user_destroyer_spec.rb | 2 +- spec/services/user_updater_spec.rb | 2 +- spec/services/username_changer_spec.rb | 2 +- spec/services/username_checker_service_spec.rb | 2 +- spec/views/omniauth_callbacks/complete.html.erb_spec.rb | 2 +- spec/views/omniauth_callbacks/failure.html.erb_spec.rb | 2 +- 333 files changed, 332 insertions(+), 332 deletions(-) rename spec/{spec_helper.rb => rails_helper.rb} (100%) diff --git a/lib/autospec/rspec_runner.rb b/lib/autospec/rspec_runner.rb index 1ed1f86d64..cdef09e0b1 100644 --- a/lib/autospec/rspec_runner.rb +++ b/lib/autospec/rspec_runner.rb @@ -24,7 +24,7 @@ module Autospec def reloaders; RELOADERS; end # We need to reload the whole app when changing any of these files - reload("spec/spec_helper.rb") + reload("spec/rails_helper.rb") reload(%r{config/.+\.rb}) reload(%r{app/helpers/.+\.rb}) diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb index bcac39c71f..bb45816f0d 100644 --- a/plugins/poll/spec/controllers/polls_controller_spec.rb +++ b/plugins/poll/spec/controllers/polls_controller_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe ::DiscoursePoll::PollsController do routes { ::DiscoursePoll::Engine.routes } diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb index 944225b60c..bc86459637 100644 --- a/plugins/poll/spec/controllers/posts_controller_spec.rb +++ b/plugins/poll/spec/controllers/posts_controller_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe PostsController do let!(:user) { log_in } diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb index f07f59c5ed..071120bd95 100644 --- a/spec/components/admin_user_index_query_spec.rb +++ b/spec/components/admin_user_index_query_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'admin_user_index_query' describe AdminUserIndexQuery do diff --git a/spec/components/archetype_spec.rb b/spec/components/archetype_spec.rb index a4cffe853e..84d6164ea0 100644 --- a/spec/components/archetype_spec.rb +++ b/spec/components/archetype_spec.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require 'archetype' describe Archetype do diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb index b8cbd5fe9a..7cf6976073 100644 --- a/spec/components/auth/default_current_user_provider_spec.rb +++ b/spec/components/auth/default_current_user_provider_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'auth/default_current_user_provider' describe Auth::DefaultCurrentUserProvider do diff --git a/spec/components/auth/facebook_authenticator_spec.rb b/spec/components/auth/facebook_authenticator_spec.rb index 70c14491b7..5091ac5663 100644 --- a/spec/components/auth/facebook_authenticator_spec.rb +++ b/spec/components/auth/facebook_authenticator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' # In the ghetto ... getting the spec to run in autospec # thing is we need to load up all auth really early pre-fork diff --git a/spec/components/auth/google_oauth2_authenticator_spec.rb b/spec/components/auth/google_oauth2_authenticator_spec.rb index f14996e13c..ecf5230d50 100644 --- a/spec/components/auth/google_oauth2_authenticator_spec.rb +++ b/spec/components/auth/google_oauth2_authenticator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' # For autospec: Auth.send(:remove_const, :GoogleOAuth2Authenticator) diff --git a/spec/components/auth/open_id_authenticator_spec.rb b/spec/components/auth/open_id_authenticator_spec.rb index 78fdc00ad2..6b295dcc19 100644 --- a/spec/components/auth/open_id_authenticator_spec.rb +++ b/spec/components/auth/open_id_authenticator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' # In the ghetto ... getting the spec to run in autospec # thing is we need to load up all auth really early pre-fork diff --git a/spec/components/avatar_lookup_spec.rb b/spec/components/avatar_lookup_spec.rb index 9285360061..539ef48a24 100644 --- a/spec/components/avatar_lookup_spec.rb +++ b/spec/components/avatar_lookup_spec.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require_dependency 'avatar_lookup' describe AvatarLookup do diff --git a/spec/components/cache_spec.rb b/spec/components/cache_spec.rb index 385ab58428..387cea9e23 100644 --- a/spec/components/cache_spec.rb +++ b/spec/components/cache_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'cache' describe Cache do diff --git a/spec/components/category_list_spec.rb b/spec/components/category_list_spec.rb index 808abcd5d8..bab1d41ae1 100644 --- a/spec/components/category_list_spec.rb +++ b/spec/components/category_list_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'category_list' describe CategoryList do diff --git a/spec/components/common_passwords/common_passwords_spec.rb b/spec/components/common_passwords/common_passwords_spec.rb index f121343281..483a67c0e5 100644 --- a/spec/components/common_passwords/common_passwords_spec.rb +++ b/spec/components/common_passwords/common_passwords_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" require_dependency "common_passwords/common_passwords" describe CommonPasswords do diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb index 763c039771..efd13dc874 100644 --- a/spec/components/composer_messages_finder_spec.rb +++ b/spec/components/composer_messages_finder_spec.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require 'composer_messages_finder' describe ComposerMessagesFinder do diff --git a/spec/components/concern/has_custom_fields_spec.rb b/spec/components/concern/has_custom_fields_spec.rb index 48ef611008..d429c13a8e 100644 --- a/spec/components/concern/has_custom_fields_spec.rb +++ b/spec/components/concern/has_custom_fields_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe HasCustomFields do diff --git a/spec/components/concern/positionable_spec.rb b/spec/components/concern/positionable_spec.rb index 4e4b6d490a..1bf08f63e1 100644 --- a/spec/components/concern/positionable_spec.rb +++ b/spec/components/concern/positionable_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe Positionable do diff --git a/spec/components/content_buffer_spec.rb b/spec/components/content_buffer_spec.rb index 8e6299896b..f13492eb8c 100644 --- a/spec/components/content_buffer_spec.rb +++ b/spec/components/content_buffer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'content_buffer' describe ContentBuffer do diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index 056c5236ad..2511927c37 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" require "cooked_post_processor" describe CookedPostProcessor do diff --git a/spec/components/crawler_detection_spec.rb b/spec/components/crawler_detection_spec.rb index 56b5d99bec..601fde6c33 100644 --- a/spec/components/crawler_detection_spec.rb +++ b/spec/components/crawler_detection_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'crawler_detection' describe CrawlerDetection do diff --git a/spec/components/current_user_spec.rb b/spec/components/current_user_spec.rb index 3f439d6a03..2cb1061e08 100644 --- a/spec/components/current_user_spec.rb +++ b/spec/components/current_user_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'current_user' describe CurrentUser do diff --git a/spec/components/demon/base_spec.rb b/spec/components/demon/base_spec.rb index 58a5811d8b..1f1615fc63 100644 --- a/spec/components/demon/base_spec.rb +++ b/spec/components/demon/base_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'demon/base' describe Demon do diff --git a/spec/components/directory_helper_spec.rb b/spec/components/directory_helper_spec.rb index 1620713fad..18b4384ca2 100644 --- a/spec/components/directory_helper_spec.rb +++ b/spec/components/directory_helper_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'directory_helper' describe DirectoryHelper do diff --git a/spec/components/discourse_diff_spec.rb b/spec/components/discourse_diff_spec.rb index 37cb7357a8..c21737ad85 100644 --- a/spec/components/discourse_diff_spec.rb +++ b/spec/components/discourse_diff_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'discourse_diff' describe DiscourseDiff do diff --git a/spec/components/discourse_event_spec.rb b/spec/components/discourse_event_spec.rb index 281cb7e09d..2a262822a2 100644 --- a/spec/components/discourse_event_spec.rb +++ b/spec/components/discourse_event_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'discourse_event' describe DiscourseEvent do diff --git a/spec/components/discourse_hub_spec.rb b/spec/components/discourse_hub_spec.rb index 95d911a66b..b9ebdee282 100644 --- a/spec/components/discourse_hub_spec.rb +++ b/spec/components/discourse_hub_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'discourse_hub' describe DiscourseHub do diff --git a/spec/components/discourse_i18n_spec.rb b/spec/components/discourse_i18n_spec.rb index 967b71a1dc..ffff68a6a2 100644 --- a/spec/components/discourse_i18n_spec.rb +++ b/spec/components/discourse_i18n_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'i18n/backend/discourse_i18n' require 'translation_override' diff --git a/spec/components/discourse_plugin_registry_spec.rb b/spec/components/discourse_plugin_registry_spec.rb index 98c5709ac1..6c4d128e20 100644 --- a/spec/components/discourse_plugin_registry_spec.rb +++ b/spec/components/discourse_plugin_registry_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'discourse_plugin_registry' describe DiscoursePluginRegistry do diff --git a/spec/components/discourse_plugin_spec.rb b/spec/components/discourse_plugin_spec.rb index 8910b0f2ad..699447d74b 100644 --- a/spec/components/discourse_plugin_spec.rb +++ b/spec/components/discourse_plugin_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'discourse_plugin' describe DiscoursePlugin do diff --git a/spec/components/discourse_sass_compiler_spec.rb b/spec/components/discourse_sass_compiler_spec.rb index 1bd144f11e..baa998cf3a 100644 --- a/spec/components/discourse_sass_compiler_spec.rb +++ b/spec/components/discourse_sass_compiler_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'sass/discourse_sass_compiler' describe DiscourseSassCompiler do diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb index deee763a98..a66cecda46 100644 --- a/spec/components/discourse_spec.rb +++ b/spec/components/discourse_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'discourse' describe Discourse do diff --git a/spec/components/discourse_stylesheets_spec.rb b/spec/components/discourse_stylesheets_spec.rb index c7be72e96d..ec3cead6e9 100644 --- a/spec/components/discourse_stylesheets_spec.rb +++ b/spec/components/discourse_stylesheets_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'sass/discourse_stylesheets' describe DiscourseStylesheets do diff --git a/spec/components/discourse_updates_spec.rb b/spec/components/discourse_updates_spec.rb index 185a163649..7f3f1234af 100644 --- a/spec/components/discourse_updates_spec.rb +++ b/spec/components/discourse_updates_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'discourse_updates' describe DiscourseUpdates do diff --git a/spec/components/distributed_cache_spec.rb b/spec/components/distributed_cache_spec.rb index a26f6fbbd3..6f7c82886b 100644 --- a/spec/components/distributed_cache_spec.rb +++ b/spec/components/distributed_cache_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'distributed_cache' describe DistributedCache do diff --git a/spec/components/distributed_memoizer_spec.rb b/spec/components/distributed_memoizer_spec.rb index 097797f803..5639a6a30d 100644 --- a/spec/components/distributed_memoizer_spec.rb +++ b/spec/components/distributed_memoizer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'distributed_memoizer' describe DistributedMemoizer do diff --git a/spec/components/distributed_mutex_spec.rb b/spec/components/distributed_mutex_spec.rb index d8a42ffbce..e8b3082797 100644 --- a/spec/components/distributed_mutex_spec.rb +++ b/spec/components/distributed_mutex_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'distributed_mutex' describe DistributedMutex do diff --git a/spec/components/email/email_spec.rb b/spec/components/email/email_spec.rb index 95ac50c797..fbdc394947 100644 --- a/spec/components/email/email_spec.rb +++ b/spec/components/email/email_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'email' describe Email do diff --git a/spec/components/email/message_builder_spec.rb b/spec/components/email/message_builder_spec.rb index 7515dee03f..5f8a1d7638 100644 --- a/spec/components/email/message_builder_spec.rb +++ b/spec/components/email/message_builder_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'email/message_builder' describe Email::MessageBuilder do diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb index fe021624e2..a7d7d26aaf 100644 --- a/spec/components/email/receiver_spec.rb +++ b/spec/components/email/receiver_spec.rb @@ -1,6 +1,6 @@ # -*- encoding : utf-8 -*- -require 'spec_helper' +require 'rails_helper' require 'email/receiver' describe Email::Receiver do diff --git a/spec/components/email/renderer_spec.rb b/spec/components/email/renderer_spec.rb index 7800ae865a..c546b8fd11 100644 --- a/spec/components/email/renderer_spec.rb +++ b/spec/components/email/renderer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'email/renderer' describe Email::Renderer do diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb index 06ed0bb65b..b77844e01d 100644 --- a/spec/components/email/sender_spec.rb +++ b/spec/components/email/sender_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'email/sender' describe Email::Sender do diff --git a/spec/components/email/styles_spec.rb b/spec/components/email/styles_spec.rb index 3a190e9cc2..1f8bb953bf 100644 --- a/spec/components/email/styles_spec.rb +++ b/spec/components/email/styles_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'email' describe Email::Styles do diff --git a/spec/components/enum_spec.rb b/spec/components/enum_spec.rb index 58ab150ed1..12033ae000 100644 --- a/spec/components/enum_spec.rb +++ b/spec/components/enum_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'email' describe Enum do diff --git a/spec/components/file_store/local_store_spec.rb b/spec/components/file_store/local_store_spec.rb index d3d523d748..2ef9097a5c 100644 --- a/spec/components/file_store/local_store_spec.rb +++ b/spec/components/file_store/local_store_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'file_store/local_store' describe FileStore::LocalStore do diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb index ae59888948..8b9a6309f5 100644 --- a/spec/components/file_store/s3_store_spec.rb +++ b/spec/components/file_store/s3_store_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'file_store/s3_store' require 'file_store/local_store' diff --git a/spec/components/filter_best_posts_spec.rb b/spec/components/filter_best_posts_spec.rb index ca04ee7834..565e7fe6cf 100644 --- a/spec/components/filter_best_posts_spec.rb +++ b/spec/components/filter_best_posts_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'filter_best_posts' require 'topic_view' diff --git a/spec/components/flag_query_spec.rb b/spec/components/flag_query_spec.rb index de6f0fb0e2..9609ab6acc 100644 --- a/spec/components/flag_query_spec.rb +++ b/spec/components/flag_query_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'flag_query' describe FlagQuery do diff --git a/spec/components/freedom_patches/pool_drainer_spec.rb b/spec/components/freedom_patches/pool_drainer_spec.rb index ad44e37af3..e46abe9a84 100644 --- a/spec/components/freedom_patches/pool_drainer_spec.rb +++ b/spec/components/freedom_patches/pool_drainer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe 'pool drainer' do let(:pool) do diff --git a/spec/components/freedom_patches/safe_buffer_spec.rb b/spec/components/freedom_patches/safe_buffer_spec.rb index 61bba0de9e..0f61435015 100644 --- a/spec/components/freedom_patches/safe_buffer_spec.rb +++ b/spec/components/freedom_patches/safe_buffer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency "freedom_patches/safe_buffer" describe ActiveSupport::SafeBuffer do diff --git a/spec/components/gaps_spec.rb b/spec/components/gaps_spec.rb index 780d297ef0..2e76b16d1f 100644 --- a/spec/components/gaps_spec.rb +++ b/spec/components/gaps_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'cache' describe Gaps do diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index f0d8b94aa1..e5ae07942b 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'guardian' require_dependency 'post_destroyer' diff --git a/spec/components/has_errors_spec.rb b/spec/components/has_errors_spec.rb index 9ea4d1a068..f9b6876501 100644 --- a/spec/components/has_errors_spec.rb +++ b/spec/components/has_errors_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'has_errors' describe HasErrors do diff --git a/spec/components/highlight_js/highlight_js_spec.rb b/spec/components/highlight_js/highlight_js_spec.rb index ec7e12db24..22010aeb98 100644 --- a/spec/components/highlight_js/highlight_js_spec.rb +++ b/spec/components/highlight_js/highlight_js_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'highlight_js/highlight_js' describe HighlightJs do diff --git a/spec/components/html_prettify_spec.rb b/spec/components/html_prettify_spec.rb index 8f1126eeb7..1f1b6fad2c 100644 --- a/spec/components/html_prettify_spec.rb +++ b/spec/components/html_prettify_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'html_prettify' describe HtmlPrettify do diff --git a/spec/components/image_sizer_spec.rb b/spec/components/image_sizer_spec.rb index e8e705862f..f371d6acd4 100644 --- a/spec/components/image_sizer_spec.rb +++ b/spec/components/image_sizer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'image_sizer' describe ImageSizer do diff --git a/spec/components/import/normalize_spec.rb b/spec/components/import/normalize_spec.rb index 8175801e11..3eff19f034 100644 --- a/spec/components/import/normalize_spec.rb +++ b/spec/components/import/normalize_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" require_dependency "import/normalize" describe Import::Normalize do diff --git a/spec/components/js_locale_helper_spec.rb b/spec/components/js_locale_helper_spec.rb index 18d73d2df2..ae0077f8be 100644 --- a/spec/components/js_locale_helper_spec.rb +++ b/spec/components/js_locale_helper_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'js_locale_helper' describe JsLocaleHelper do diff --git a/spec/components/json_error_spec.rb b/spec/components/json_error_spec.rb index cd0c469310..eae021fe4c 100644 --- a/spec/components/json_error_spec.rb +++ b/spec/components/json_error_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'json_error' shared_examples "a generic error" do diff --git a/spec/components/letter_avatar_spec.rb b/spec/components/letter_avatar_spec.rb index c044e1f422..d19aa883d8 100644 --- a/spec/components/letter_avatar_spec.rb +++ b/spec/components/letter_avatar_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'letter_avatar' describe LetterAvatar do diff --git a/spec/components/middleware/anonymous_cache_spec.rb b/spec/components/middleware/anonymous_cache_spec.rb index 8bff0ae331..8dce0e5bcc 100644 --- a/spec/components/middleware/anonymous_cache_spec.rb +++ b/spec/components/middleware/anonymous_cache_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" require_dependency "middleware/anonymous_cache" describe Middleware::AnonymousCache::Helper do diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb index cbb8b68d38..12fd9fe551 100644 --- a/spec/components/middleware/request_tracker_spec.rb +++ b/spec/components/middleware/request_tracker_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" require_dependency "middleware/request_tracker" describe Middleware::RequestTracker do diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb index 2c45185c62..57be6bfe3b 100644 --- a/spec/components/new_post_manager_spec.rb +++ b/spec/components/new_post_manager_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'new_post_manager' describe NewPostManager do diff --git a/spec/components/new_post_result_spec.rb b/spec/components/new_post_result_spec.rb index 3c555e7931..3c1ad258a1 100644 --- a/spec/components/new_post_result_spec.rb +++ b/spec/components/new_post_result_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'new_post_result' describe NewPostResult do diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb index 2b5beb1fb1..3318a429b6 100644 --- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb +++ b/spec/components/onebox/engine/discourse_local_onebox_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Onebox::Engine::DiscourseLocalOnebox do it "matches for a topic url" do diff --git a/spec/components/onebox/engine/flash_video_onebox_spec.rb b/spec/components/onebox/engine/flash_video_onebox_spec.rb index 0bcc1d3e91..d63ca37d3a 100644 --- a/spec/components/onebox/engine/flash_video_onebox_spec.rb +++ b/spec/components/onebox/engine/flash_video_onebox_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'onebox/engine/flash_video_onebox' describe Onebox::Engine::FlashVideoOnebox do diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb index 96f1524a39..7714d3f2c2 100644 --- a/spec/components/oneboxer_spec.rb +++ b/spec/components/oneboxer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'oneboxer' describe Oneboxer do diff --git a/spec/components/onpdiff_spec.rb b/spec/components/onpdiff_spec.rb index 09c6ff41dc..0644edaaa8 100644 --- a/spec/components/onpdiff_spec.rb +++ b/spec/components/onpdiff_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'onpdiff' describe ONPDiff do diff --git a/spec/components/pinned_check_spec.rb b/spec/components/pinned_check_spec.rb index 009de0e7ca..5845abcad3 100644 --- a/spec/components/pinned_check_spec.rb +++ b/spec/components/pinned_check_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'pinned_check' describe PinnedCheck do diff --git a/spec/components/plugin/filter_manager_spec.rb b/spec/components/plugin/filter_manager_spec.rb index 1ff4ee9640..44e98d530e 100644 --- a/spec/components/plugin/filter_manager_spec.rb +++ b/spec/components/plugin/filter_manager_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'plugin/filter_manager' describe Plugin::FilterManager do diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb index fc87a425ed..8fb270ba56 100644 --- a/spec/components/plugin/instance_spec.rb +++ b/spec/components/plugin/instance_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'plugin/instance' describe Plugin::Instance do diff --git a/spec/components/plugin/metadata_spec.rb b/spec/components/plugin/metadata_spec.rb index 782b9a6ed4..4f8783b0d6 100644 --- a/spec/components/plugin/metadata_spec.rb +++ b/spec/components/plugin/metadata_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'plugin/metadata' describe Plugin::Metadata do diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb index e50f27dc3c..33bd648bb4 100644 --- a/spec/components/post_creator_spec.rb +++ b/spec/components/post_creator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'post_creator' require 'topic_subtype' diff --git a/spec/components/post_destroyer_spec.rb b/spec/components/post_destroyer_spec.rb index a5a91c4c75..00573a5f4d 100644 --- a/spec/components/post_destroyer_spec.rb +++ b/spec/components/post_destroyer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'post_destroyer' describe PostDestroyer do diff --git a/spec/components/post_enqueuer_spec.rb b/spec/components/post_enqueuer_spec.rb index b7d6c37296..2e1bddad93 100644 --- a/spec/components/post_enqueuer_spec.rb +++ b/spec/components/post_enqueuer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'post_enqueuer' describe PostEnqueuer do diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb index 67e505356e..0c035fcea4 100644 --- a/spec/components/post_revisor_spec.rb +++ b/spec/components/post_revisor_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'post_revisor' describe PostRevisor do diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 25c603ef1c..0c01fab34c 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'pretty_text' describe PrettyText do diff --git a/spec/components/promotion_spec.rb b/spec/components/promotion_spec.rb index 71d80a2738..d15ace0d4b 100644 --- a/spec/components/promotion_spec.rb +++ b/spec/components/promotion_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'promotion' describe Promotion do diff --git a/spec/components/rate_limiter_spec.rb b/spec/components/rate_limiter_spec.rb index 1c264fb3d1..1298523e03 100644 --- a/spec/components/rate_limiter_spec.rb +++ b/spec/components/rate_limiter_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'rate_limiter' describe RateLimiter do diff --git a/spec/components/redis_store_spec.rb b/spec/components/redis_store_spec.rb index d32e56d768..c4180ed6ed 100644 --- a/spec/components/redis_store_spec.rb +++ b/spec/components/redis_store_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'cache' describe "Redis Store" do diff --git a/spec/components/s3_helper_spec.rb b/spec/components/s3_helper_spec.rb index 4b1919785a..0ee326b65b 100644 --- a/spec/components/s3_helper_spec.rb +++ b/spec/components/s3_helper_spec.rb @@ -1,5 +1,5 @@ require "s3_helper" -require "spec_helper" +require "rails_helper" describe "S3Helper" do diff --git a/spec/components/scheduler/defer_spec.rb b/spec/components/scheduler/defer_spec.rb index 6f8d30ebf0..49fbde58c7 100644 --- a/spec/components/scheduler/defer_spec.rb +++ b/spec/components/scheduler/defer_spec.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require_dependency 'scheduler/defer' describe Scheduler::Defer do diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb index 3f7fa93c87..7261a79fe3 100644 --- a/spec/components/scheduler/manager_spec.rb +++ b/spec/components/scheduler/manager_spec.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require 'scheduler/scheduler' describe Scheduler::Manager do diff --git a/spec/components/scheduler/schedule_info_spec.rb b/spec/components/scheduler/schedule_info_spec.rb index 96afbb8672..fab1e2b069 100644 --- a/spec/components/scheduler/schedule_info_spec.rb +++ b/spec/components/scheduler/schedule_info_spec.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require 'scheduler/scheduler' describe Scheduler::ScheduleInfo do diff --git a/spec/components/score_calculator_spec.rb b/spec/components/score_calculator_spec.rb index 34694c317e..bcf41ebaa9 100644 --- a/spec/components/score_calculator_spec.rb +++ b/spec/components/score_calculator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'score_calculator' describe ScoreCalculator do diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index 8baa4c8e6c..71d5da7cd9 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require_dependency 'search' describe Search do diff --git a/spec/components/sidekiq/pausable_spec.rb b/spec/components/sidekiq/pausable_spec.rb index 887702489c..092b319001 100644 --- a/spec/components/sidekiq/pausable_spec.rb +++ b/spec/components/sidekiq/pausable_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'sidekiq/pausable' describe Sidekiq do diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb index 82afd880c9..fad8370364 100644 --- a/spec/components/site_setting_extension_spec.rb +++ b/spec/components/site_setting_extension_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'site_setting_extension' require_dependency 'site_settings/local_process_provider' diff --git a/spec/components/site_settings/db_provider_spec.rb b/spec/components/site_settings/db_provider_spec.rb index ded17ce96d..64bd7b0b70 100644 --- a/spec/components/site_settings/db_provider_spec.rb +++ b/spec/components/site_settings/db_provider_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'site_settings/db_provider' describe SiteSettings::DbProvider do diff --git a/spec/components/site_settings/local_process_provider_spec.rb b/spec/components/site_settings/local_process_provider_spec.rb index e4db9c90f6..6293216d67 100644 --- a/spec/components/site_settings/local_process_provider_spec.rb +++ b/spec/components/site_settings/local_process_provider_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'site_settings/local_process_provider' describe SiteSettings::LocalProcessProvider do diff --git a/spec/components/site_settings/yaml_loader_spec.rb b/spec/components/site_settings/yaml_loader_spec.rb index 5477aa9efc..a011817274 100644 --- a/spec/components/site_settings/yaml_loader_spec.rb +++ b/spec/components/site_settings/yaml_loader_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'site_settings/yaml_loader' describe SiteSettings::YamlLoader do diff --git a/spec/components/slug_spec.rb b/spec/components/slug_spec.rb index 4173ab9328..aee9c81f7a 100644 --- a/spec/components/slug_spec.rb +++ b/spec/components/slug_spec.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require 'slug' describe Slug do diff --git a/spec/components/spam_handler_spec.rb b/spec/components/spam_handler_spec.rb index bde8f0b2b1..64508d6eca 100644 --- a/spec/components/spam_handler_spec.rb +++ b/spec/components/spam_handler_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" require "spam_handler" describe SpamHandler do diff --git a/spec/components/sql_builder_spec.rb b/spec/components/sql_builder_spec.rb index 72926085d2..870c55a685 100644 --- a/spec/components/sql_builder_spec.rb +++ b/spec/components/sql_builder_spec.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require_dependency 'sql_builder' describe SqlBuilder do diff --git a/spec/components/suggested_topics_builder_spec.rb b/spec/components/suggested_topics_builder_spec.rb index 414185582a..c860fe0dc1 100644 --- a/spec/components/suggested_topics_builder_spec.rb +++ b/spec/components/suggested_topics_builder_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'suggested_topics_builder' describe SuggestedTopicsBuilder do diff --git a/spec/components/system_message_spec.rb b/spec/components/system_message_spec.rb index fe1eab9358..3a0ffd8d77 100644 --- a/spec/components/system_message_spec.rb +++ b/spec/components/system_message_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'system_message' require 'topic_subtype' diff --git a/spec/components/text_cleaner_spec.rb b/spec/components/text_cleaner_spec.rb index 278177a292..cf203c709c 100644 --- a/spec/components/text_cleaner_spec.rb +++ b/spec/components/text_cleaner_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'text_cleaner' describe TextCleaner do diff --git a/spec/components/text_sentinel_spec.rb b/spec/components/text_sentinel_spec.rb index c93df22aaf..ea11c1c145 100644 --- a/spec/components/text_sentinel_spec.rb +++ b/spec/components/text_sentinel_spec.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require 'text_sentinel' describe TextSentinel do diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb index 20edaf1b90..dcca1dd101 100644 --- a/spec/components/topic_creator_spec.rb +++ b/spec/components/topic_creator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicCreator do diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb index bb99bc35b8..634e4418ea 100644 --- a/spec/components/topic_query_spec.rb +++ b/spec/components/topic_query_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'topic_view' describe TopicQuery do diff --git a/spec/components/topic_retriever_spec.rb b/spec/components/topic_retriever_spec.rb index ac1f04622b..89db716b23 100644 --- a/spec/components/topic_retriever_spec.rb +++ b/spec/components/topic_retriever_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'topic_retriever' describe TopicRetriever do diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb index ad23e0ade5..6cdccf0166 100644 --- a/spec/components/topic_view_spec.rb +++ b/spec/components/topic_view_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'topic_view' describe TopicView do diff --git a/spec/components/topics_bulk_action_spec.rb b/spec/components/topics_bulk_action_spec.rb index 24dc4310ba..0003ee2dc5 100644 --- a/spec/components/topics_bulk_action_spec.rb +++ b/spec/components/topics_bulk_action_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'topics_bulk_action' describe TopicsBulkAction do diff --git a/spec/components/trashable_spec.rb b/spec/components/trashable_spec.rb index aa54d85d46..6cebdc50b4 100644 --- a/spec/components/trashable_spec.rb +++ b/spec/components/trashable_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'trashable' describe Trashable do diff --git a/spec/components/unread_spec.rb b/spec/components/unread_spec.rb index cf9d814ac3..cfbf457053 100644 --- a/spec/components/unread_spec.rb +++ b/spec/components/unread_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'unread' describe Unread do diff --git a/spec/components/url_helper_spec.rb b/spec/components/url_helper_spec.rb index ae2c37d1e7..e9f580f612 100644 --- a/spec/components/url_helper_spec.rb +++ b/spec/components/url_helper_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'url_helper' describe UrlHelper do diff --git a/spec/components/user_name_suggester_spec.rb b/spec/components/user_name_suggester_spec.rb index ec9eb7a46b..ca404ed4bf 100644 --- a/spec/components/user_name_suggester_spec.rb +++ b/spec/components/user_name_suggester_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'user_name_suggester' describe UserNameSuggester do diff --git a/spec/components/validators/allowed_ip_address_validator_spec.rb b/spec/components/validators/allowed_ip_address_validator_spec.rb index ecef8497ed..b2af99f5b7 100644 --- a/spec/components/validators/allowed_ip_address_validator_spec.rb +++ b/spec/components/validators/allowed_ip_address_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe AllowedIpAddressValidator do diff --git a/spec/components/validators/email_setting_validator_spec.rb b/spec/components/validators/email_setting_validator_spec.rb index 67fd6e82da..a143b38117 100644 --- a/spec/components/validators/email_setting_validator_spec.rb +++ b/spec/components/validators/email_setting_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe EmailSettingValidator do describe '#valid_value?' do diff --git a/spec/components/validators/email_validator_spec.rb b/spec/components/validators/email_validator_spec.rb index 887b6dbde7..b219de6ba6 100644 --- a/spec/components/validators/email_validator_spec.rb +++ b/spec/components/validators/email_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe EmailValidator do diff --git a/spec/components/validators/integer_setting_validator_spec.rb b/spec/components/validators/integer_setting_validator_spec.rb index 64b2819431..d681f2bc63 100644 --- a/spec/components/validators/integer_setting_validator_spec.rb +++ b/spec/components/validators/integer_setting_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe IntegerSettingValidator do describe '#valid_value?' do diff --git a/spec/components/validators/ip_address_format_validator_spec.rb b/spec/components/validators/ip_address_format_validator_spec.rb index 20265a2d16..a91c2d85cd 100644 --- a/spec/components/validators/ip_address_format_validator_spec.rb +++ b/spec/components/validators/ip_address_format_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe IpAddressFormatValidator do diff --git a/spec/components/validators/password_validator_spec.rb b/spec/components/validators/password_validator_spec.rb index cc328421fe..d95c0d5505 100644 --- a/spec/components/validators/password_validator_spec.rb +++ b/spec/components/validators/password_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency "common_passwords/common_passwords" describe PasswordValidator do diff --git a/spec/components/validators/post_validator_spec.rb b/spec/components/validators/post_validator_spec.rb index e233443b50..f320a1705d 100644 --- a/spec/components/validators/post_validator_spec.rb +++ b/spec/components/validators/post_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'validators/post_validator' describe Validators::PostValidator do diff --git a/spec/components/validators/quality_title_validator_spec.rb b/spec/components/validators/quality_title_validator_spec.rb index 065fcdcfd1..b6bf864a80 100644 --- a/spec/components/validators/quality_title_validator_spec.rb +++ b/spec/components/validators/quality_title_validator_spec.rb @@ -1,6 +1,6 @@ # encoding: UTF-8 -require 'spec_helper' +require 'rails_helper' require 'validators/quality_title_validator' require 'ostruct' diff --git a/spec/components/validators/reply_by_email_address_validator_spec.rb b/spec/components/validators/reply_by_email_address_validator_spec.rb index 81f6f24a01..ac580b7f01 100644 --- a/spec/components/validators/reply_by_email_address_validator_spec.rb +++ b/spec/components/validators/reply_by_email_address_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ReplyByEmailAddressValidator do diff --git a/spec/components/validators/string_setting_validator_spec.rb b/spec/components/validators/string_setting_validator_spec.rb index 69370d6433..890c2dc939 100644 --- a/spec/components/validators/string_setting_validator_spec.rb +++ b/spec/components/validators/string_setting_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe StringSettingValidator do diff --git a/spec/components/validators/topic_title_length_validator_spec.rb b/spec/components/validators/topic_title_length_validator_spec.rb index 427d4eaf04..2f960247ad 100644 --- a/spec/components/validators/topic_title_length_validator_spec.rb +++ b/spec/components/validators/topic_title_length_validator_spec.rb @@ -1,6 +1,6 @@ # encoding: UTF-8 -require 'spec_helper' +require 'rails_helper' require 'validators/topic_title_length_validator' describe TopicTitleLengthValidator do diff --git a/spec/components/validators/user_full_name_validator_spec.rb b/spec/components/validators/user_full_name_validator_spec.rb index 1b06d00ed8..bfa57b74b4 100644 --- a/spec/components/validators/user_full_name_validator_spec.rb +++ b/spec/components/validators/user_full_name_validator_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe UserFullNameValidator do let(:validator) { described_class.new({attributes: :name}) } diff --git a/spec/components/validators/username_setting_validator_spec.rb b/spec/components/validators/username_setting_validator_spec.rb index fcc417a0a2..8e06e4fd83 100644 --- a/spec/components/validators/username_setting_validator_spec.rb +++ b/spec/components/validators/username_setting_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UsernameSettingValidator do describe '#valid_value?' do diff --git a/spec/components/version_spec.rb b/spec/components/version_spec.rb index 8bf3e28512..26c24337bc 100644 --- a/spec/components/version_spec.rb +++ b/spec/components/version_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'version' describe Discourse::VERSION do diff --git a/spec/controllers/admin/admin_controller_spec.rb b/spec/controllers/admin/admin_controller_spec.rb index 21206230f8..f0e29511dd 100644 --- a/spec/controllers/admin/admin_controller_spec.rb +++ b/spec/controllers/admin/admin_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::AdminController do diff --git a/spec/controllers/admin/api_controller_spec.rb b/spec/controllers/admin/api_controller_spec.rb index f940ddea5c..2805a2d4b1 100644 --- a/spec/controllers/admin/api_controller_spec.rb +++ b/spec/controllers/admin/api_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::ApiController do diff --git a/spec/controllers/admin/backups_controller_spec.rb b/spec/controllers/admin/backups_controller_spec.rb index a16efe2607..050201a6ab 100644 --- a/spec/controllers/admin/backups_controller_spec.rb +++ b/spec/controllers/admin/backups_controller_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe Admin::BackupsController do diff --git a/spec/controllers/admin/badges_controller_spec.rb b/spec/controllers/admin/badges_controller_spec.rb index 94e9c763ec..5591ac6804 100644 --- a/spec/controllers/admin/badges_controller_spec.rb +++ b/spec/controllers/admin/badges_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::BadgesController do diff --git a/spec/controllers/admin/color_schemes_controller_spec.rb b/spec/controllers/admin/color_schemes_controller_spec.rb index cebda75720..9059330b44 100644 --- a/spec/controllers/admin/color_schemes_controller_spec.rb +++ b/spec/controllers/admin/color_schemes_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::ColorSchemesController do it "is a subclass of AdminController" do diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb index c501fe4c78..8bc31307cf 100644 --- a/spec/controllers/admin/dashboard_controller_spec.rb +++ b/spec/controllers/admin/dashboard_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'discourse_version_check' describe Admin::DashboardController do diff --git a/spec/controllers/admin/email_controller_spec.rb b/spec/controllers/admin/email_controller_spec.rb index 68b0ee5319..86d2b42e9a 100644 --- a/spec/controllers/admin/email_controller_spec.rb +++ b/spec/controllers/admin/email_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::EmailController do diff --git a/spec/controllers/admin/embeddable_hosts_controller_spec.rb b/spec/controllers/admin/embeddable_hosts_controller_spec.rb index d3d83cac5c..54a97ed938 100644 --- a/spec/controllers/admin/embeddable_hosts_controller_spec.rb +++ b/spec/controllers/admin/embeddable_hosts_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::EmbeddableHostsController do diff --git a/spec/controllers/admin/embedding_controller_spec.rb b/spec/controllers/admin/embedding_controller_spec.rb index 5913e9fdcf..49a989e15b 100644 --- a/spec/controllers/admin/embedding_controller_spec.rb +++ b/spec/controllers/admin/embedding_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::EmbeddingController do diff --git a/spec/controllers/admin/emojis_controller_spec.rb b/spec/controllers/admin/emojis_controller_spec.rb index 23a0256f5e..fa776bb892 100644 --- a/spec/controllers/admin/emojis_controller_spec.rb +++ b/spec/controllers/admin/emojis_controller_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe Admin::EmojisController do diff --git a/spec/controllers/admin/flags_controller_spec.rb b/spec/controllers/admin/flags_controller_spec.rb index 60ab321147..76599d2df7 100644 --- a/spec/controllers/admin/flags_controller_spec.rb +++ b/spec/controllers/admin/flags_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::FlagsController do diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb index 2735c8736f..a80f7bbf1e 100644 --- a/spec/controllers/admin/groups_controller_spec.rb +++ b/spec/controllers/admin/groups_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::GroupsController do diff --git a/spec/controllers/admin/impersonate_controller_spec.rb b/spec/controllers/admin/impersonate_controller_spec.rb index 5130551ef8..54eb1ee1f6 100644 --- a/spec/controllers/admin/impersonate_controller_spec.rb +++ b/spec/controllers/admin/impersonate_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::ImpersonateController do diff --git a/spec/controllers/admin/permalinks_controller_spec.rb b/spec/controllers/admin/permalinks_controller_spec.rb index c885363bfd..fe5652597d 100644 --- a/spec/controllers/admin/permalinks_controller_spec.rb +++ b/spec/controllers/admin/permalinks_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::PermalinksController do diff --git a/spec/controllers/admin/plugins_controller_spec.rb b/spec/controllers/admin/plugins_controller_spec.rb index 70c281c73d..2873523e32 100644 --- a/spec/controllers/admin/plugins_controller_spec.rb +++ b/spec/controllers/admin/plugins_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::PluginsController do diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb index b57ae429aa..92da083f32 100644 --- a/spec/controllers/admin/reports_controller_spec.rb +++ b/spec/controllers/admin/reports_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::ReportsController do diff --git a/spec/controllers/admin/screened_emails_controller_spec.rb b/spec/controllers/admin/screened_emails_controller_spec.rb index f05b80ce73..07adde4754 100644 --- a/spec/controllers/admin/screened_emails_controller_spec.rb +++ b/spec/controllers/admin/screened_emails_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::ScreenedEmailsController do it "is a subclass of AdminController" do diff --git a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb b/spec/controllers/admin/screened_ip_addresses_controller_spec.rb index e814c7abf1..64cbfa0f80 100644 --- a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb +++ b/spec/controllers/admin/screened_ip_addresses_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::ScreenedIpAddressesController do diff --git a/spec/controllers/admin/screened_urls_controller_spec.rb b/spec/controllers/admin/screened_urls_controller_spec.rb index 8d9fce01f0..3bd763d2bb 100644 --- a/spec/controllers/admin/screened_urls_controller_spec.rb +++ b/spec/controllers/admin/screened_urls_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::ScreenedUrlsController do it "is a subclass of AdminController" do diff --git a/spec/controllers/admin/site_customizations_controller_spec.rb b/spec/controllers/admin/site_customizations_controller_spec.rb index f8b598b9f3..2695f17c7e 100644 --- a/spec/controllers/admin/site_customizations_controller_spec.rb +++ b/spec/controllers/admin/site_customizations_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::SiteCustomizationsController do diff --git a/spec/controllers/admin/site_settings_controller_spec.rb b/spec/controllers/admin/site_settings_controller_spec.rb index 702598c8f5..59ff5ba042 100644 --- a/spec/controllers/admin/site_settings_controller_spec.rb +++ b/spec/controllers/admin/site_settings_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::SiteSettingsController do diff --git a/spec/controllers/admin/site_texts_controller_spec.rb b/spec/controllers/admin/site_texts_controller_spec.rb index aa7399b500..1ec7ad1aa7 100644 --- a/spec/controllers/admin/site_texts_controller_spec.rb +++ b/spec/controllers/admin/site_texts_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::SiteTextsController do diff --git a/spec/controllers/admin/staff_action_logs_controller_spec.rb b/spec/controllers/admin/staff_action_logs_controller_spec.rb index 8f638a33d7..a566571708 100644 --- a/spec/controllers/admin/staff_action_logs_controller_spec.rb +++ b/spec/controllers/admin/staff_action_logs_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::StaffActionLogsController do it "is a subclass of AdminController" do diff --git a/spec/controllers/admin/user_fields_controller_spec.rb b/spec/controllers/admin/user_fields_controller_spec.rb index fe63ce860d..cb0c95c930 100644 --- a/spec/controllers/admin/user_fields_controller_spec.rb +++ b/spec/controllers/admin/user_fields_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Admin::UserFieldsController do diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 20d5d198df..c35c83d3c2 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'single_sign_on' describe Admin::UsersController do diff --git a/spec/controllers/admin/versions_controller_spec.rb b/spec/controllers/admin/versions_controller_spec.rb index deca11ecc4..0353062d47 100644 --- a/spec/controllers/admin/versions_controller_spec.rb +++ b/spec/controllers/admin/versions_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'version' describe Admin::VersionsController do diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 9d0e17c0ac..fc1911efd1 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicsController do before do diff --git a/spec/controllers/badges_controller_spec.rb b/spec/controllers/badges_controller_spec.rb index ab98f35cf8..a2bb4420dc 100644 --- a/spec/controllers/badges_controller_spec.rb +++ b/spec/controllers/badges_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe BadgesController do let!(:badge) { Fabricate(:badge) } diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb index e545faedda..7eb1def2fb 100644 --- a/spec/controllers/categories_controller_spec.rb +++ b/spec/controllers/categories_controller_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe CategoriesController do describe "create" do diff --git a/spec/controllers/clicks_controller_spec.rb b/spec/controllers/clicks_controller_spec.rb index 18b9ad7795..3beaf783ef 100644 --- a/spec/controllers/clicks_controller_spec.rb +++ b/spec/controllers/clicks_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ClicksController do diff --git a/spec/controllers/composer_messages_controller_spec.rb b/spec/controllers/composer_messages_controller_spec.rb index 4c7b77fe2d..2365439153 100644 --- a/spec/controllers/composer_messages_controller_spec.rb +++ b/spec/controllers/composer_messages_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ComposerMessagesController do diff --git a/spec/controllers/directory_items_controller_spec.rb b/spec/controllers/directory_items_controller_spec.rb index b33b0590eb..38132d8e21 100644 --- a/spec/controllers/directory_items_controller_spec.rb +++ b/spec/controllers/directory_items_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe DirectoryItemsController do diff --git a/spec/controllers/draft_controller_spec.rb b/spec/controllers/draft_controller_spec.rb index 86bc5a9b67..1153e7529c 100644 --- a/spec/controllers/draft_controller_spec.rb +++ b/spec/controllers/draft_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe DraftController do diff --git a/spec/controllers/email_controller_spec.rb b/spec/controllers/email_controller_spec.rb index c1635c5313..411d3ff148 100644 --- a/spec/controllers/email_controller_spec.rb +++ b/spec/controllers/email_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe EmailController do diff --git a/spec/controllers/embed_controller_spec.rb b/spec/controllers/embed_controller_spec.rb index 9947844c7e..52a6387b31 100644 --- a/spec/controllers/embed_controller_spec.rb +++ b/spec/controllers/embed_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe EmbedController do diff --git a/spec/controllers/export_csv_controller_spec.rb b/spec/controllers/export_csv_controller_spec.rb index 440ccc11ef..3505512bc4 100644 --- a/spec/controllers/export_csv_controller_spec.rb +++ b/spec/controllers/export_csv_controller_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe ExportCsvController do let(:export_filename) { "user-archive-codinghorror-150115-234817-999.csv.gz" } diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 0cfd2acc18..8a42a6fe63 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe GroupsController do let(:group) { Fabricate(:group) } diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb index 7acdf7874e..ca0d4823eb 100644 --- a/spec/controllers/invites_controller_spec.rb +++ b/spec/controllers/invites_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe InvitesController do diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb index 41f343ca10..0415074b90 100644 --- a/spec/controllers/list_controller_spec.rb +++ b/spec/controllers/list_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ListController do diff --git a/spec/controllers/manifest_json_controller_spec.rb b/spec/controllers/manifest_json_controller_spec.rb index 41df4e221c..d0fd39e836 100644 --- a/spec/controllers/manifest_json_controller_spec.rb +++ b/spec/controllers/manifest_json_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' RSpec.describe ManifestJsonController do context 'index' do diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb index 175aea63b6..da58fc6e6c 100644 --- a/spec/controllers/notifications_controller_spec.rb +++ b/spec/controllers/notifications_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe NotificationsController do diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb index def39e3d48..62f803cea4 100644 --- a/spec/controllers/omniauth_callbacks_controller_spec.rb +++ b/spec/controllers/omniauth_callbacks_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Users::OmniauthCallbacksController do diff --git a/spec/controllers/onebox_controller_spec.rb b/spec/controllers/onebox_controller_spec.rb index 12eaa3103a..a2f5c38174 100644 --- a/spec/controllers/onebox_controller_spec.rb +++ b/spec/controllers/onebox_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe OneboxController do diff --git a/spec/controllers/permalinks_controller_spec.rb b/spec/controllers/permalinks_controller_spec.rb index aeca3b2cde..d88f7c7d67 100644 --- a/spec/controllers/permalinks_controller_spec.rb +++ b/spec/controllers/permalinks_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PermalinksController do describe 'show' do diff --git a/spec/controllers/post_action_users_controller_spec.rb b/spec/controllers/post_action_users_controller_spec.rb index 4cc1db9bcd..c915b5e5b5 100644 --- a/spec/controllers/post_action_users_controller_spec.rb +++ b/spec/controllers/post_action_users_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostActionUsersController do let!(:post) { Fabricate(:post, user: log_in) } diff --git a/spec/controllers/post_actions_controller_spec.rb b/spec/controllers/post_actions_controller_spec.rb index 14a204f079..5cbad63a85 100644 --- a/spec/controllers/post_actions_controller_spec.rb +++ b/spec/controllers/post_actions_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostActionsController do diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb index c9359e8ba1..885840e76a 100644 --- a/spec/controllers/posts_controller_spec.rb +++ b/spec/controllers/posts_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' shared_examples 'finding and showing post' do let(:user) { log_in } diff --git a/spec/controllers/queued_posts_controller_spec.rb b/spec/controllers/queued_posts_controller_spec.rb index 1e4210797a..f6c4b4a62c 100644 --- a/spec/controllers/queued_posts_controller_spec.rb +++ b/spec/controllers/queued_posts_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'queued_posts_controller' require_dependency 'queued_post' diff --git a/spec/controllers/robots_txt_controller_spec.rb b/spec/controllers/robots_txt_controller_spec.rb index 615cca3f60..8ee44f9a47 100644 --- a/spec/controllers/robots_txt_controller_spec.rb +++ b/spec/controllers/robots_txt_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe RobotsTxtController do diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb index d44f311880..ceb07f93de 100644 --- a/spec/controllers/search_controller_spec.rb +++ b/spec/controllers/search_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe SearchController do diff --git a/spec/controllers/session_controller_spec.rb b/spec/controllers/session_controller_spec.rb index 27d57483f9..492093b438 100644 --- a/spec/controllers/session_controller_spec.rb +++ b/spec/controllers/session_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe SessionController do diff --git a/spec/controllers/similar_topics_controller_spec.rb b/spec/controllers/similar_topics_controller_spec.rb index fc6c3f9d47..93dfa5ef9e 100644 --- a/spec/controllers/similar_topics_controller_spec.rb +++ b/spec/controllers/similar_topics_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe SimilarTopicsController do context 'similar_to' do diff --git a/spec/controllers/site_customizations_controller_spec.rb b/spec/controllers/site_customizations_controller_spec.rb index d9948d5950..d3a0f17451 100644 --- a/spec/controllers/site_customizations_controller_spec.rb +++ b/spec/controllers/site_customizations_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe SiteCustomizationsController do diff --git a/spec/controllers/static_controller_spec.rb b/spec/controllers/static_controller_spec.rb index 786445e16b..b5b8eb0b74 100644 --- a/spec/controllers/static_controller_spec.rb +++ b/spec/controllers/static_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe StaticController do diff --git a/spec/controllers/stylesheets_controller_spec.rb b/spec/controllers/stylesheets_controller_spec.rb index a74ab3df72..5a5f9cf05f 100644 --- a/spec/controllers/stylesheets_controller_spec.rb +++ b/spec/controllers/stylesheets_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe StylesheetsController do diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb index 0566dc1ea8..08da959738 100644 --- a/spec/controllers/topics_controller_spec.rb +++ b/spec/controllers/topics_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' def topics_controller_show_gen_perm_tests(expected, ctx) expected.each do |sym, status| diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index 0f7be132ba..2a0ceaf22c 100644 --- a/spec/controllers/uploads_controller_spec.rb +++ b/spec/controllers/uploads_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UploadsController do diff --git a/spec/controllers/user_actions_controller_spec.rb b/spec/controllers/user_actions_controller_spec.rb index 38be920764..b1914dea23 100644 --- a/spec/controllers/user_actions_controller_spec.rb +++ b/spec/controllers/user_actions_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'post_enqueuer' describe UserActionsController do diff --git a/spec/controllers/user_avatars_controller_spec.rb b/spec/controllers/user_avatars_controller_spec.rb index 19b4696342..c42c51d6b7 100644 --- a/spec/controllers/user_avatars_controller_spec.rb +++ b/spec/controllers/user_avatars_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserAvatarsController do diff --git a/spec/controllers/user_badges_controller_spec.rb b/spec/controllers/user_badges_controller_spec.rb index f191ef4f35..3ad8840bc6 100644 --- a/spec/controllers/user_badges_controller_spec.rb +++ b/spec/controllers/user_badges_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserBadgesController do let(:user) { Fabricate(:user) } diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 05aba09c9c..54f221b0f1 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UsersController do diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index b4fcacd5a5..fb97b0454c 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ApplicationHelper do diff --git a/spec/integration/invite_only_registration_spec.rb b/spec/integration/invite_only_registration_spec.rb index 7e3f95abca..72575738df 100644 --- a/spec/integration/invite_only_registration_spec.rb +++ b/spec/integration/invite_only_registration_spec.rb @@ -1,6 +1,6 @@ # encoding: UTF-8 -require 'spec_helper' +require 'rails_helper' describe 'invite only' do diff --git a/spec/integration/same_ip_spammers_spec.rb b/spec/integration/same_ip_spammers_spec.rb index 3b3c736423..d6341c03c9 100644 --- a/spec/integration/same_ip_spammers_spec.rb +++ b/spec/integration/same_ip_spammers_spec.rb @@ -1,6 +1,6 @@ # encoding: UTF-8 -require 'spec_helper' +require 'rails_helper' describe SpamRulesEnforcer do diff --git a/spec/integration/spam_rules_spec.rb b/spec/integration/spam_rules_spec.rb index 0b040d67cd..04f8b41ee0 100644 --- a/spec/integration/spam_rules_spec.rb +++ b/spec/integration/spam_rules_spec.rb @@ -1,6 +1,6 @@ # encoding: UTF-8 -require 'spec_helper' +require 'rails_helper' describe SpamRulesEnforcer do diff --git a/spec/integration/topic_auto_close_spec.rb b/spec/integration/topic_auto_close_spec.rb index 41c5438cff..a0a18ae1b4 100644 --- a/spec/integration/topic_auto_close_spec.rb +++ b/spec/integration/topic_auto_close_spec.rb @@ -1,6 +1,6 @@ # encoding: UTF-8 -require 'spec_helper' +require 'rails_helper' require 'sidekiq/testing' describe Topic do diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb index 5e95b706a7..ce75ce3dd7 100644 --- a/spec/integrity/i18n_spec.rb +++ b/spec/integrity/i18n_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'locale_file_walker' describe "i18n integrity checks" do diff --git a/spec/jobs/about_stats_spec.rb b/spec/jobs/about_stats_spec.rb index 68e6393e2c..25ae8291f8 100644 --- a/spec/jobs/about_stats_spec.rb +++ b/spec/jobs/about_stats_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Jobs::AboutStats do it 'caches the stats' do diff --git a/spec/jobs/automatic_group_membership_spec.rb b/spec/jobs/automatic_group_membership_spec.rb index fe80c04cae..e6d5999308 100644 --- a/spec/jobs/automatic_group_membership_spec.rb +++ b/spec/jobs/automatic_group_membership_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/regular/automatic_group_membership' describe Jobs::AutomaticGroupMembership do diff --git a/spec/jobs/bulk_invite_spec.rb b/spec/jobs/bulk_invite_spec.rb index 7f795be52c..77629a6a82 100644 --- a/spec/jobs/bulk_invite_spec.rb +++ b/spec/jobs/bulk_invite_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Jobs::BulkInvite do diff --git a/spec/jobs/clean_up_exports_spec.rb b/spec/jobs/clean_up_exports_spec.rb index b418c8539d..741ac87a30 100644 --- a/spec/jobs/clean_up_exports_spec.rb +++ b/spec/jobs/clean_up_exports_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/scheduled/clean_up_exports' diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb index 5ccede2c41..9c307b7fcc 100644 --- a/spec/jobs/clean_up_uploads_spec.rb +++ b/spec/jobs/clean_up_uploads_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/scheduled/clean_up_uploads' diff --git a/spec/jobs/close_topic_spec.rb b/spec/jobs/close_topic_spec.rb index d3dfcc8d64..9efb67ca48 100644 --- a/spec/jobs/close_topic_spec.rb +++ b/spec/jobs/close_topic_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' describe Jobs::CloseTopic do diff --git a/spec/jobs/crawl_topic_link_spec.rb b/spec/jobs/crawl_topic_link_spec.rb index 5d7024b9eb..8e01178b44 100644 --- a/spec/jobs/crawl_topic_link_spec.rb +++ b/spec/jobs/crawl_topic_link_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' require_dependency 'jobs/regular/crawl_topic_link' diff --git a/spec/jobs/create_missing_avatars_spec.rb b/spec/jobs/create_missing_avatars_spec.rb index 09cd1a9dc3..c57f7f6c54 100644 --- a/spec/jobs/create_missing_avatars_spec.rb +++ b/spec/jobs/create_missing_avatars_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/scheduled/create_missing_avatars' diff --git a/spec/jobs/dashboard_stats_spec.rb b/spec/jobs/dashboard_stats_spec.rb index 79f9865571..b00130d02d 100644 --- a/spec/jobs/dashboard_stats_spec.rb +++ b/spec/jobs/dashboard_stats_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Jobs::DashboardStats do it 'caches the stats' do diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb index a6a4d77f40..f52a033a04 100644 --- a/spec/jobs/enqueue_digest_emails_spec.rb +++ b/spec/jobs/enqueue_digest_emails_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' describe Jobs::EnqueueDigestEmails do diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb index ebef5e599f..2f89d34aaf 100644 --- a/spec/jobs/export_csv_file_spec.rb +++ b/spec/jobs/export_csv_file_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Jobs::ExportCsvFile do diff --git a/spec/jobs/feature_topic_users_spec.rb b/spec/jobs/feature_topic_users_spec.rb index 8bc9da9dac..b651e85668 100644 --- a/spec/jobs/feature_topic_users_spec.rb +++ b/spec/jobs/feature_topic_users_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' require 'jobs/regular/process_post' diff --git a/spec/jobs/invite_email_spec.rb b/spec/jobs/invite_email_spec.rb index 4b41e4223d..fc751bab6a 100644 --- a/spec/jobs/invite_email_spec.rb +++ b/spec/jobs/invite_email_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' describe Jobs::InviteEmail do diff --git a/spec/jobs/jobs_base_spec.rb b/spec/jobs/jobs_base_spec.rb index bcc0680d9a..c8ab2ab56a 100644 --- a/spec/jobs/jobs_base_spec.rb +++ b/spec/jobs/jobs_base_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' describe Jobs::Base do diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb index 2840b6c3e8..fa31b7ea18 100644 --- a/spec/jobs/jobs_spec.rb +++ b/spec/jobs/jobs_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' describe Jobs do diff --git a/spec/jobs/notify_mailing_list_subscribers_spec.rb b/spec/jobs/notify_mailing_list_subscribers_spec.rb index 84e94dc58f..9d7c5a61d8 100644 --- a/spec/jobs/notify_mailing_list_subscribers_spec.rb +++ b/spec/jobs/notify_mailing_list_subscribers_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe Jobs::NotifyMailingListSubscribers do diff --git a/spec/jobs/notify_moved_posts_spec.rb b/spec/jobs/notify_moved_posts_spec.rb index eb1ed1d394..29ab275eec 100644 --- a/spec/jobs/notify_moved_posts_spec.rb +++ b/spec/jobs/notify_moved_posts_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' require_dependency 'jobs/regular/process_post' diff --git a/spec/jobs/pending_flags_reminder_spec.rb b/spec/jobs/pending_flags_reminder_spec.rb index ec105b2d40..4f325b0a8a 100644 --- a/spec/jobs/pending_flags_reminder_spec.rb +++ b/spec/jobs/pending_flags_reminder_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Jobs::PendingFlagsReminder do context "notify_about_flags_after is 0" do diff --git a/spec/jobs/pending_queued_posts_reminder_spec.rb b/spec/jobs/pending_queued_posts_reminder_spec.rb index 4af0e8bbcb..dd182686da 100644 --- a/spec/jobs/pending_queued_posts_reminder_spec.rb +++ b/spec/jobs/pending_queued_posts_reminder_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe Jobs::PendingQueuedPostReminder do context "notify_about_queued_posts_after is 0" do diff --git a/spec/jobs/pending_users_reminder_spec.rb b/spec/jobs/pending_users_reminder_spec.rb index 82f0692059..c844184522 100644 --- a/spec/jobs/pending_users_reminder_spec.rb +++ b/spec/jobs/pending_users_reminder_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Jobs::PendingUsersReminder do diff --git a/spec/jobs/periodical_updates_spec.rb b/spec/jobs/periodical_updates_spec.rb index d91a8ac779..01071f290f 100644 --- a/spec/jobs/periodical_updates_spec.rb +++ b/spec/jobs/periodical_updates_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/scheduled/periodical_updates' describe Jobs::PeriodicalUpdates do diff --git a/spec/jobs/poll_feed_spec.rb b/spec/jobs/poll_feed_spec.rb index 20f13bc1e7..b222991cb0 100644 --- a/spec/jobs/poll_feed_spec.rb +++ b/spec/jobs/poll_feed_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/regular/process_post' describe Jobs::PollFeed do diff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rb index fc009bfb21..3ac0dd2d26 100644 --- a/spec/jobs/poll_mailbox_spec.rb +++ b/spec/jobs/poll_mailbox_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/regular/process_post' describe Jobs::PollMailbox do diff --git a/spec/jobs/process_post_spec.rb b/spec/jobs/process_post_spec.rb index 723605373a..35c6b8e244 100644 --- a/spec/jobs/process_post_spec.rb +++ b/spec/jobs/process_post_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'jobs/regular/process_post' describe Jobs::ProcessPost do diff --git a/spec/jobs/send_system_message_spec.rb b/spec/jobs/send_system_message_spec.rb index 4025c94e0d..78f739477c 100644 --- a/spec/jobs/send_system_message_spec.rb +++ b/spec/jobs/send_system_message_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'jobs/regular/send_system_message' describe Jobs::SendSystemMessage do diff --git a/spec/jobs/test_email_spec.rb b/spec/jobs/test_email_spec.rb index 1c5e4ccb97..252a96b85e 100644 --- a/spec/jobs/test_email_spec.rb +++ b/spec/jobs/test_email_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' describe Jobs::TestEmail do diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb index b7521691a6..7c4aff7354 100644 --- a/spec/jobs/tl3_promotions_spec.rb +++ b/spec/jobs/tl3_promotions_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Jobs::Tl3Promotions do diff --git a/spec/jobs/update_gravatar_spec.rb b/spec/jobs/update_gravatar_spec.rb index c3f9b45295..0c80a3afcf 100644 --- a/spec/jobs/update_gravatar_spec.rb +++ b/spec/jobs/update_gravatar_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Jobs::UpdateGravatar do diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb index a06db067a7..0bb58c9553 100644 --- a/spec/jobs/user_email_spec.rb +++ b/spec/jobs/user_email_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'jobs/base' describe Jobs::UserEmail do diff --git a/spec/mailers/invite_mailer_spec.rb b/spec/mailers/invite_mailer_spec.rb index 99695ea05e..ce847a504a 100644 --- a/spec/mailers/invite_mailer_spec.rb +++ b/spec/mailers/invite_mailer_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe InviteMailer do diff --git a/spec/mailers/rejection_mailer_spec.rb b/spec/mailers/rejection_mailer_spec.rb index 1414000900..a3d76044b2 100644 --- a/spec/mailers/rejection_mailer_spec.rb +++ b/spec/mailers/rejection_mailer_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe RejectionMailer do diff --git a/spec/mailers/test_mailer_spec.rb b/spec/mailers/test_mailer_spec.rb index f1f6544d64..68308ef0be 100644 --- a/spec/mailers/test_mailer_spec.rb +++ b/spec/mailers/test_mailer_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe TestMailer do diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb index 7f55cc198d..3f07451639 100644 --- a/spec/mailers/user_notifications_spec.rb +++ b/spec/mailers/user_notifications_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe UserNotifications do diff --git a/spec/mailers/version_mailer_spec.rb b/spec/mailers/version_mailer_spec.rb index a662226400..24b45d0309 100644 --- a/spec/mailers/version_mailer_spec.rb +++ b/spec/mailers/version_mailer_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe VersionMailer do subject { VersionMailer.send_notice } diff --git a/spec/models/about_spec.rb b/spec/models/about_spec.rb index 3a217eabea..145c1acbe4 100644 --- a/spec/models/about_spec.rb +++ b/spec/models/about_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe About do diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb index 36a029b477..f15a7b2bad 100644 --- a/spec/models/admin_dashboard_data_spec.rb +++ b/spec/models/admin_dashboard_data_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe AdminDashboardData do diff --git a/spec/models/api_key_spec.rb b/spec/models/api_key_spec.rb index 79aeac601d..5d163dc368 100644 --- a/spec/models/api_key_spec.rb +++ b/spec/models/api_key_spec.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require_dependency 'api_key' describe ApiKey do diff --git a/spec/models/application_request_spec.rb b/spec/models/application_request_spec.rb index fb436b6367..7aca4b71d3 100644 --- a/spec/models/application_request_spec.rb +++ b/spec/models/application_request_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ApplicationRequest do diff --git a/spec/models/backup_spec.rb b/spec/models/backup_spec.rb index 7be314ba88..14b4544e9f 100644 --- a/spec/models/backup_spec.rb +++ b/spec/models/backup_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'backup' diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb index f695d1de88..f5ff32d462 100644 --- a/spec/models/badge_spec.rb +++ b/spec/models/badge_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'badge' describe Badge do diff --git a/spec/models/badge_type.rb b/spec/models/badge_type.rb index 8fc13e83dc..5d265d06e1 100644 --- a/spec/models/badge_type.rb +++ b/spec/models/badge_type.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'badge_type' describe BadgeType do diff --git a/spec/models/category_featured_topic_spec.rb b/spec/models/category_featured_topic_spec.rb index 8aa83e21b9..d6ca194e13 100644 --- a/spec/models/category_featured_topic_spec.rb +++ b/spec/models/category_featured_topic_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe CategoryFeaturedTopic do diff --git a/spec/models/category_featured_user_spec.rb b/spec/models/category_featured_user_spec.rb index de7e0ff0ad..bdfcbeaef2 100644 --- a/spec/models/category_featured_user_spec.rb +++ b/spec/models/category_featured_user_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe CategoryFeaturedUser do diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb index 9d74f3e777..f466be73c6 100644 --- a/spec/models/category_spec.rb +++ b/spec/models/category_spec.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require_dependency 'post_creator' describe Category do diff --git a/spec/models/category_user_spec.rb b/spec/models/category_user_spec.rb index 5fb965f491..90fe0b1c5b 100644 --- a/spec/models/category_user_spec.rb +++ b/spec/models/category_user_spec.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require_dependency 'post_creator' describe CategoryUser do diff --git a/spec/models/color_scheme_color_spec.rb b/spec/models/color_scheme_color_spec.rb index e5ec898c6c..95830f4409 100644 --- a/spec/models/color_scheme_color_spec.rb +++ b/spec/models/color_scheme_color_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ColorSchemeColor do def test_invalid_hex(hex) diff --git a/spec/models/color_scheme_spec.rb b/spec/models/color_scheme_spec.rb index bdc55ee13b..34f75e4d94 100644 --- a/spec/models/color_scheme_spec.rb +++ b/spec/models/color_scheme_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ColorScheme do diff --git a/spec/models/digest_email_site_setting_spec.rb b/spec/models/digest_email_site_setting_spec.rb index dc07f45dbd..5eb899928a 100644 --- a/spec/models/digest_email_site_setting_spec.rb +++ b/spec/models/digest_email_site_setting_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe DigestEmailSiteSetting do describe 'valid_value?' do diff --git a/spec/models/digest_unsubscribe_key_spec.rb b/spec/models/digest_unsubscribe_key_spec.rb index f658a40219..c9b9bcab50 100644 --- a/spec/models/digest_unsubscribe_key_spec.rb +++ b/spec/models/digest_unsubscribe_key_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'digest_unsubscribe_key' describe DigestUnsubscribeKey do diff --git a/spec/models/directory_item_spec.rb b/spec/models/directory_item_spec.rb index a21211d68b..ad3b23b0f8 100644 --- a/spec/models/directory_item_spec.rb +++ b/spec/models/directory_item_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe DirectoryItem do context 'refresh' do diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb index 08f950b4bf..552682dde5 100644 --- a/spec/models/discourse_single_sign_on_spec.rb +++ b/spec/models/discourse_single_sign_on_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe DiscourseSingleSignOn do before do diff --git a/spec/models/draft_sequence_spec.rb b/spec/models/draft_sequence_spec.rb index 8ed65ed450..8fe559a77d 100644 --- a/spec/models/draft_sequence_spec.rb +++ b/spec/models/draft_sequence_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe DraftSequence do it 'should produce next sequence for a key' do diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb index 16746ad4ee..96782b28b4 100644 --- a/spec/models/draft_spec.rb +++ b/spec/models/draft_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Draft do before do diff --git a/spec/models/email_log_spec.rb b/spec/models/email_log_spec.rb index 70a0a79946..8c33e2b5f8 100644 --- a/spec/models/email_log_spec.rb +++ b/spec/models/email_log_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe EmailLog do diff --git a/spec/models/email_token_spec.rb b/spec/models/email_token_spec.rb index b1651ea59a..cf62b1c5cd 100644 --- a/spec/models/email_token_spec.rb +++ b/spec/models/email_token_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe EmailToken do diff --git a/spec/models/embeddable_host_spec.rb b/spec/models/embeddable_host_spec.rb index 83043104d9..2a4c306a09 100644 --- a/spec/models/embeddable_host_spec.rb +++ b/spec/models/embeddable_host_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe EmbeddableHost do diff --git a/spec/models/global_setting_spec.rb b/spec/models/global_setting_spec.rb index a29886b307..dbe1b94c2e 100644 --- a/spec/models/global_setting_spec.rb +++ b/spec/models/global_setting_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'tempfile' describe GlobalSetting::EnvProvider do diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index 095296ab0a..5c4ce42cd8 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Group do diff --git a/spec/models/incoming_link_spec.rb b/spec/models/incoming_link_spec.rb index a03871a66b..1e32b9d0bd 100644 --- a/spec/models/incoming_link_spec.rb +++ b/spec/models/incoming_link_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe IncomingLink do diff --git a/spec/models/incoming_links_report_spec.rb b/spec/models/incoming_links_report_spec.rb index 2320298ca3..d85e4bd7cb 100644 --- a/spec/models/incoming_links_report_spec.rb +++ b/spec/models/incoming_links_report_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe IncomingLinksReport do diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb index bc30a173f5..a61819fd49 100644 --- a/spec/models/invite_redeemer_spec.rb +++ b/spec/models/invite_redeemer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe InviteRedeemer do diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb index 63ef8e3db9..61a6e68466 100644 --- a/spec/models/invite_spec.rb +++ b/spec/models/invite_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Invite do diff --git a/spec/models/locale_site_setting_spec.rb b/spec/models/locale_site_setting_spec.rb index c999e336d5..6a19cb7d8d 100644 --- a/spec/models/locale_site_setting_spec.rb +++ b/spec/models/locale_site_setting_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe LocaleSiteSetting do diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index af9dbc8e4c..2792068d61 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Notification do before do diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb index 6d27e247b9..40ea15c0d1 100644 --- a/spec/models/optimized_image_spec.rb +++ b/spec/models/optimized_image_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe OptimizedImage do diff --git a/spec/models/permalink_spec.rb b/spec/models/permalink_spec.rb index e86e8c469a..131fbeae5e 100644 --- a/spec/models/permalink_spec.rb +++ b/spec/models/permalink_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe Permalink do diff --git a/spec/models/plugin_store_spec.rb b/spec/models/plugin_store_spec.rb index bd84395c8d..9c236a0436 100644 --- a/spec/models/plugin_store_spec.rb +++ b/spec/models/plugin_store_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" require_dependency "plugin_store" describe PluginStore do diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb index c502e2bba1..752a54cfda 100644 --- a/spec/models/post_action_spec.rb +++ b/spec/models/post_action_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'post_destroyer' describe PostAction do diff --git a/spec/models/post_alert_observer_spec.rb b/spec/models/post_alert_observer_spec.rb index 326d34196e..c4de604173 100644 --- a/spec/models/post_alert_observer_spec.rb +++ b/spec/models/post_alert_observer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'post_destroyer' describe PostAlertObserver do diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb index f2bc5f1f33..096e90014f 100644 --- a/spec/models/post_analyzer_spec.rb +++ b/spec/models/post_analyzer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostAnalyzer do diff --git a/spec/models/post_detail_spec.rb b/spec/models/post_detail_spec.rb index 940b8a0a41..7697a41252 100644 --- a/spec/models/post_detail_spec.rb +++ b/spec/models/post_detail_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostDetail do it { is_expected.to belong_to :post } diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb index cdbea639b8..1442525a65 100644 --- a/spec/models/post_mover_spec.rb +++ b/spec/models/post_mover_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostMover do diff --git a/spec/models/post_reply_spec.rb b/spec/models/post_reply_spec.rb index 1e34c0ae43..e3392e338e 100644 --- a/spec/models/post_reply_spec.rb +++ b/spec/models/post_reply_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostReply do diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 20e0921b5d..1baf1caf54 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'post_destroyer' describe Post do diff --git a/spec/models/post_timing_spec.rb b/spec/models/post_timing_spec.rb index beb39c3d57..7817cee98b 100644 --- a/spec/models/post_timing_spec.rb +++ b/spec/models/post_timing_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostTiming do diff --git a/spec/models/post_upload_spec.rb b/spec/models/post_upload_spec.rb index 4e370c1a8d..9830844d67 100644 --- a/spec/models/post_upload_spec.rb +++ b/spec/models/post_upload_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostUpload do diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb index d316fb001a..5a8b974be1 100644 --- a/spec/models/queued_post_spec.rb +++ b/spec/models/queued_post_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'queued_post' describe QueuedPost do diff --git a/spec/models/quoted_post_spec.rb b/spec/models/quoted_post_spec.rb index dc34fa4a47..77bb741339 100644 --- a/spec/models/quoted_post_spec.rb +++ b/spec/models/quoted_post_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe QuotedPost do it 'correctly extracts quotes in integration test' do diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb index a013f21097..8ea96c9cfc 100644 --- a/spec/models/report_spec.rb +++ b/spec/models/report_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe Report do diff --git a/spec/models/rtl_spec.rb b/spec/models/rtl_spec.rb index 780743a0bb..74b3462cc1 100644 --- a/spec/models/rtl_spec.rb +++ b/spec/models/rtl_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe RTL do diff --git a/spec/models/s3_region_site_setting_spec.rb b/spec/models/s3_region_site_setting_spec.rb index aae52e3eda..2249fbad5e 100644 --- a/spec/models/s3_region_site_setting_spec.rb +++ b/spec/models/s3_region_site_setting_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe S3RegionSiteSetting do diff --git a/spec/models/screened_email_spec.rb b/spec/models/screened_email_spec.rb index 0621b69cdf..7364773158 100644 --- a/spec/models/screened_email_spec.rb +++ b/spec/models/screened_email_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ScreenedEmail do diff --git a/spec/models/screened_ip_address_spec.rb b/spec/models/screened_ip_address_spec.rb index 37385784f3..c26b1151be 100644 --- a/spec/models/screened_ip_address_spec.rb +++ b/spec/models/screened_ip_address_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ScreenedIpAddress do let(:ip_address) { '99.232.23.124' } diff --git a/spec/models/screened_url_spec.rb b/spec/models/screened_url_spec.rb index bdebf88ecc..6da3fd4769 100644 --- a/spec/models/screened_url_spec.rb +++ b/spec/models/screened_url_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ScreenedUrl do diff --git a/spec/models/search_observer_spec.rb b/spec/models/search_observer_spec.rb index 34455c4155..dc0a2daaf3 100644 --- a/spec/models/search_observer_spec.rb +++ b/spec/models/search_observer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe SearchObserver do diff --git a/spec/models/site_customization_spec.rb b/spec/models/site_customization_spec.rb index 8831ea5d6f..571e95ddd0 100644 --- a/spec/models/site_customization_spec.rb +++ b/spec/models/site_customization_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe SiteCustomization do diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb index 444bd6f032..b4ac6a8ff2 100644 --- a/spec/models/site_setting_spec.rb +++ b/spec/models/site_setting_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'site_setting' require_dependency 'site_setting_extension' diff --git a/spec/models/site_spec.rb b/spec/models/site_spec.rb index 031a4564ff..a3376a4c4e 100644 --- a/spec/models/site_spec.rb +++ b/spec/models/site_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'site' describe Site do diff --git a/spec/models/stylesheet_cache_spec.rb b/spec/models/stylesheet_cache_spec.rb index ef26433bbb..eb52d07bcc 100644 --- a/spec/models/stylesheet_cache_spec.rb +++ b/spec/models/stylesheet_cache_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe StylesheetCache do diff --git a/spec/models/top_menu_item_spec.rb b/spec/models/top_menu_item_spec.rb index 4f716f8e5f..a92df985ff 100644 --- a/spec/models/top_menu_item_spec.rb +++ b/spec/models/top_menu_item_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopMenuItem do before(:each) { SiteSetting.stubs(:top_menu).returns('one,-nope|two|three,-not|four,ignored|category/xyz') } diff --git a/spec/models/top_topic_spec.rb b/spec/models/top_topic_spec.rb index 4bb99d7c90..0e3a473b55 100644 --- a/spec/models/top_topic_spec.rb +++ b/spec/models/top_topic_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopTopic do diff --git a/spec/models/topic_allowed_user_spec.rb b/spec/models/topic_allowed_user_spec.rb index c3a8a85c25..6b78330900 100644 --- a/spec/models/topic_allowed_user_spec.rb +++ b/spec/models/topic_allowed_user_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicAllowedUser do it { is_expected.to belong_to :user } diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb index 73ff1490bc..564259c491 100644 --- a/spec/models/topic_embed_spec.rb +++ b/spec/models/topic_embed_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'stringio' describe TopicEmbed do diff --git a/spec/models/topic_featured_users_spec.rb b/spec/models/topic_featured_users_spec.rb index 593cda22ed..71ff4a5423 100644 --- a/spec/models/topic_featured_users_spec.rb +++ b/spec/models/topic_featured_users_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicFeaturedUsers do it 'ensures consistenct' do diff --git a/spec/models/topic_invite_spec.rb b/spec/models/topic_invite_spec.rb index d93e9eb34f..8c55ee1ca7 100644 --- a/spec/models/topic_invite_spec.rb +++ b/spec/models/topic_invite_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicInvite do diff --git a/spec/models/topic_link_click_spec.rb b/spec/models/topic_link_click_spec.rb index b8c4bb8c7c..5dd27a3fe8 100644 --- a/spec/models/topic_link_click_spec.rb +++ b/spec/models/topic_link_click_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicLinkClick do diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb index be7ab759e1..a8338311b2 100644 --- a/spec/models/topic_link_spec.rb +++ b/spec/models/topic_link_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicLink do diff --git a/spec/models/topic_participants_summary_spec.rb b/spec/models/topic_participants_summary_spec.rb index b704752490..29e2edb4cf 100644 --- a/spec/models/topic_participants_summary_spec.rb +++ b/spec/models/topic_participants_summary_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicParticipantsSummary do describe '#summary' do diff --git a/spec/models/topic_posters_summary_spec.rb b/spec/models/topic_posters_summary_spec.rb index 72cd027c69..928e772b65 100644 --- a/spec/models/topic_posters_summary_spec.rb +++ b/spec/models/topic_posters_summary_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicPostersSummary do describe '#summary' do diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 2f6d42e5e8..6a8eb9d768 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -require 'spec_helper' +require 'rails_helper' require_dependency 'post_destroyer' describe Topic do diff --git a/spec/models/topic_status_update_spec.rb b/spec/models/topic_status_update_spec.rb index 787c56aa90..dc69ebfbca 100644 --- a/spec/models/topic_status_update_spec.rb +++ b/spec/models/topic_status_update_spec.rb @@ -1,6 +1,6 @@ # encoding: UTF-8 -require 'spec_helper' +require 'rails_helper' require_dependency 'post_destroyer' describe TopicStatusUpdate do diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb index 3745065f46..5410f69eed 100644 --- a/spec/models/topic_tracking_state_spec.rb +++ b/spec/models/topic_tracking_state_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicTrackingState do diff --git a/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb index 4498d6e360..c5b4d331a9 100644 --- a/spec/models/topic_user_spec.rb +++ b/spec/models/topic_user_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicUser do diff --git a/spec/models/topic_view_item_spec.rb b/spec/models/topic_view_item_spec.rb index fd15a7592b..ff5940a3a4 100644 --- a/spec/models/topic_view_item_spec.rb +++ b/spec/models/topic_view_item_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TopicViewItem do diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb index 77f96aed11..f979ec0135 100644 --- a/spec/models/trust_level3_requirements_spec.rb +++ b/spec/models/trust_level3_requirements_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TrustLevel3Requirements do diff --git a/spec/models/twitter_user_info_spec.rb b/spec/models/twitter_user_info_spec.rb index 1ed1457f28..708b3d4c60 100644 --- a/spec/models/twitter_user_info_spec.rb +++ b/spec/models/twitter_user_info_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe TwitterUserInfo do it "does not overflow" do diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb index 2e3d17c6be..b67196ec6d 100644 --- a/spec/models/upload_spec.rb +++ b/spec/models/upload_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require 'digest/sha1' describe Upload do diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb index e4fd78823e..9e2ec982d0 100644 --- a/spec/models/user_action_spec.rb +++ b/spec/models/user_action_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserAction do diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb index a46ce21b48..944a0785c6 100644 --- a/spec/models/user_avatar_spec.rb +++ b/spec/models/user_avatar_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserAvatar do let(:avatar){ diff --git a/spec/models/user_badge.rb b/spec/models/user_badge.rb index 76b9c9c9e4..5161b413da 100644 --- a/spec/models/user_badge.rb +++ b/spec/models/user_badge.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'user_badge' describe UserBadge do diff --git a/spec/models/user_email_observer_spec.rb b/spec/models/user_email_observer_spec.rb index 3c246853bc..1fb5be42b3 100644 --- a/spec/models/user_email_observer_spec.rb +++ b/spec/models/user_email_observer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserEmailObserver do diff --git a/spec/models/user_history_spec.rb b/spec/models/user_history_spec.rb index f33a497d68..f19db854da 100644 --- a/spec/models/user_history_spec.rb +++ b/spec/models/user_history_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserHistory do diff --git a/spec/models/user_open_id_spec.rb b/spec/models/user_open_id_spec.rb index f37efc363b..b7113f2ff8 100644 --- a/spec/models/user_open_id_spec.rb +++ b/spec/models/user_open_id_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserOpenId do diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb index 0e7e259360..66720ec790 100644 --- a/spec/models/user_profile_spec.rb +++ b/spec/models/user_profile_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserProfile do it 'is created automatically when a user is created' do diff --git a/spec/models/user_profile_view_spec.rb b/spec/models/user_profile_view_spec.rb index 456cfe16f1..66474b7e0d 100644 --- a/spec/models/user_profile_view_spec.rb +++ b/spec/models/user_profile_view_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' RSpec.describe UserProfileView do let(:user) { Fabricate(:user) } diff --git a/spec/models/user_search_spec.rb b/spec/models/user_search_spec.rb index 7a27cebc20..5d5a55f4f2 100644 --- a/spec/models/user_search_spec.rb +++ b/spec/models/user_search_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserSearch do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 9b06d76c7e..792c9ef191 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'user' describe User do diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb index 7a75f45f77..dcd5f82428 100644 --- a/spec/models/user_stat_spec.rb +++ b/spec/models/user_stat_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserStat do diff --git a/spec/models/user_visit_spec.rb b/spec/models/user_visit_spec.rb index 41cc9564b6..ea87011ff3 100644 --- a/spec/models/user_visit_spec.rb +++ b/spec/models/user_visit_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserVisit do let(:user) { Fabricate(:user) } diff --git a/spec/models/username_validator_spec.rb b/spec/models/username_validator_spec.rb index d03de63264..700cea4850 100644 --- a/spec/models/username_validator_spec.rb +++ b/spec/models/username_validator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UsernameValidator do context "#valid_format?" do diff --git a/spec/spec_helper.rb b/spec/rails_helper.rb similarity index 100% rename from spec/spec_helper.rb rename to spec/rails_helper.rb diff --git a/spec/serializers/basic_post_serializer_spec.rb b/spec/serializers/basic_post_serializer_spec.rb index 70c09dfbc1..63743c5d95 100644 --- a/spec/serializers/basic_post_serializer_spec.rb +++ b/spec/serializers/basic_post_serializer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'post' require_dependency 'user' diff --git a/spec/serializers/category_detailed_serializer_spec.rb b/spec/serializers/category_detailed_serializer_spec.rb index eeb0121c16..cf76aa4c14 100644 --- a/spec/serializers/category_detailed_serializer_spec.rb +++ b/spec/serializers/category_detailed_serializer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'category' describe CategoryDetailedSerializer do diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb index 20643968f8..4800b0f9ca 100644 --- a/spec/serializers/post_serializer_spec.rb +++ b/spec/serializers/post_serializer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'post_action' describe PostSerializer do diff --git a/spec/serializers/topic_list_item_serializer_spec.rb b/spec/serializers/topic_list_item_serializer_spec.rb index 3cbdc2e40a..823682e3b2 100644 --- a/spec/serializers/topic_list_item_serializer_spec.rb +++ b/spec/serializers/topic_list_item_serializer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'post_action' describe TopicListItemSerializer do diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb index 43e5689a3e..7f16958a26 100644 --- a/spec/serializers/user_serializer_spec.rb +++ b/spec/serializers/user_serializer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'user' describe UserSerializer do diff --git a/spec/services/anonymous_shadow_creator_spec.rb b/spec/services/anonymous_shadow_creator_spec.rb index 8560226098..1483f59c74 100644 --- a/spec/services/anonymous_shadow_creator_spec.rb +++ b/spec/services/anonymous_shadow_creator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe AnonymousShadowCreator do diff --git a/spec/services/auto_block_spec.rb b/spec/services/auto_block_spec.rb index 840c4ab9c1..dcecb04c8e 100644 --- a/spec/services/auto_block_spec.rb +++ b/spec/services/auto_block_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe SpamRule::AutoBlock do diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb index e81ec36922..f29456dc87 100644 --- a/spec/services/badge_granter_spec.rb +++ b/spec/services/badge_granter_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe BadgeGranter do diff --git a/spec/services/color_scheme_revisor_spec.rb b/spec/services/color_scheme_revisor_spec.rb index aab5cac919..8db267690e 100644 --- a/spec/services/color_scheme_revisor_spec.rb +++ b/spec/services/color_scheme_revisor_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe ColorSchemeRevisor do diff --git a/spec/services/flag_sockpuppets_spec.rb b/spec/services/flag_sockpuppets_spec.rb index fc925dd44b..9a647e68c6 100644 --- a/spec/services/flag_sockpuppets_spec.rb +++ b/spec/services/flag_sockpuppets_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe SpamRule::FlagSockpuppets do diff --git a/spec/services/group_message_spec.rb b/spec/services/group_message_spec.rb index 64b1591c14..b4ddeaff04 100644 --- a/spec/services/group_message_spec.rb +++ b/spec/services/group_message_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe GroupMessage do diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb index e5d446d4b9..415c565950 100644 --- a/spec/services/post_alerter_spec.rb +++ b/spec/services/post_alerter_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostAlerter do diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb index e6fffb942a..7cd7348293 100644 --- a/spec/services/post_owner_changer_spec.rb +++ b/spec/services/post_owner_changer_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe PostOwnerChanger do describe "change_owner!" do diff --git a/spec/services/post_timestamp_changer_spec.rb b/spec/services/post_timestamp_changer_spec.rb index 245eaa3df9..bc0b246f16 100644 --- a/spec/services/post_timestamp_changer_spec.rb +++ b/spec/services/post_timestamp_changer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe PostTimestampChanger do describe "change!" do diff --git a/spec/services/random_topic_selector_spec.rb b/spec/services/random_topic_selector_spec.rb index eaaad4c8b6..dd2d1cccb3 100644 --- a/spec/services/random_topic_selector_spec.rb +++ b/spec/services/random_topic_selector_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe RandomTopicSelector do diff --git a/spec/services/spam_rules_enforcer_spec.rb b/spec/services/spam_rules_enforcer_spec.rb index 0d60c46547..0bb0a8790b 100644 --- a/spec/services/spam_rules_enforcer_spec.rb +++ b/spec/services/spam_rules_enforcer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe SpamRulesEnforcer do diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb index 00eb85eee2..5de0f6bdd9 100644 --- a/spec/services/staff_action_logger_spec.rb +++ b/spec/services/staff_action_logger_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe StaffActionLogger do diff --git a/spec/services/user_activator_spec.rb b/spec/services/user_activator_spec.rb index 689e869994..928c760f1b 100644 --- a/spec/services/user_activator_spec.rb +++ b/spec/services/user_activator_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserActivator do diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb index c32aa0a65f..b641c1c045 100644 --- a/spec/services/user_anonymizer_spec.rb +++ b/spec/services/user_anonymizer_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe UserAnonymizer do diff --git a/spec/services/user_blocker_spec.rb b/spec/services/user_blocker_spec.rb index 2a1c5758a6..49d526c59b 100644 --- a/spec/services/user_blocker_spec.rb +++ b/spec/services/user_blocker_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserBlocker do diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb index 5e023d30cd..e4043e9370 100644 --- a/spec/services/user_destroyer_spec.rb +++ b/spec/services/user_destroyer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' require_dependency 'user_destroyer' describe UserDestroyer do diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb index eeb7da1251..1f46e5eb51 100644 --- a/spec/services/user_updater_spec.rb +++ b/spec/services/user_updater_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UserUpdater do diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb index debbf70cad..cf79494f26 100644 --- a/spec/services/username_changer_spec.rb +++ b/spec/services/username_changer_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UsernameChanger do diff --git a/spec/services/username_checker_service_spec.rb b/spec/services/username_checker_service_spec.rb index 7b9a409410..d6736e1ff4 100644 --- a/spec/services/username_checker_service_spec.rb +++ b/spec/services/username_checker_service_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require 'rails_helper' describe UsernameCheckerService do diff --git a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb index 0211cda3dc..ba571e0780 100644 --- a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb +++ b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" require "auth/authenticator" require_dependency "auth/result" diff --git a/spec/views/omniauth_callbacks/failure.html.erb_spec.rb b/spec/views/omniauth_callbacks/failure.html.erb_spec.rb index 98520a6cb0..ce6adc032a 100644 --- a/spec/views/omniauth_callbacks/failure.html.erb_spec.rb +++ b/spec/views/omniauth_callbacks/failure.html.erb_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe "users/omniauth_callbacks/failure.html.erb" do