Merge pull request #3847 from andyw8/prepare-for-separate-spec-helpers

Prepare for separate RSpec helper files

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})
 

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 }

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 }

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

spec/components/archetype_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 require 'archetype'
 
 describe Archetype do

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

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

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)

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

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

spec/components/cache_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'cache'
 
 describe Cache do

spec/components/category_list_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'category_list'
 
 describe CategoryList do

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

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

spec/components/concern/has_custom_fields_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 
 describe HasCustomFields do

spec/components/concern/positionable_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Positionable do
 

spec/components/content_buffer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'content_buffer'
 
 describe ContentBuffer do

spec/components/cooked_post_processor_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 require "cooked_post_processor"
 
 describe CookedPostProcessor do

spec/components/crawler_detection_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'crawler_detection'
 
 describe CrawlerDetection do

spec/components/current_user_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'current_user'
 
 describe CurrentUser do

spec/components/demon/base_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'demon/base'
 
 describe Demon do

spec/components/directory_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'directory_helper'
 
 describe DirectoryHelper do

spec/components/discourse_diff_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'discourse_diff'
 
 describe DiscourseDiff do

spec/components/discourse_event_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'discourse_event'
 
 describe DiscourseEvent do

spec/components/discourse_hub_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'discourse_hub'
 
 describe DiscourseHub do

spec/components/discourse_i18n_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'i18n/backend/discourse_i18n'
 require 'translation_override'
 

spec/components/discourse_plugin_registry_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'discourse_plugin_registry'
 
 describe DiscoursePluginRegistry do

spec/components/discourse_plugin_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'discourse_plugin'
 
 describe DiscoursePlugin do

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

spec/components/discourse_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'discourse'
 
 describe Discourse do

spec/components/discourse_stylesheets_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'sass/discourse_stylesheets'
 
 describe DiscourseStylesheets do

spec/components/discourse_updates_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'discourse_updates'
 
 describe DiscourseUpdates do

spec/components/distributed_cache_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'distributed_cache'
 
 describe DistributedCache do

spec/components/distributed_memoizer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'distributed_memoizer'
 
 describe DistributedMemoizer do

spec/components/distributed_mutex_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'distributed_mutex'
 
 describe DistributedMutex do

spec/components/email/email_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'email'
 
 describe Email do

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

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

spec/components/email/renderer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'email/renderer'
 
 describe Email::Renderer do

spec/components/email/sender_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'email/sender'
 
 describe Email::Sender do

spec/components/email/styles_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'email'
 
 describe Email::Styles do

spec/components/enum_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'email'
 
 describe Enum do

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

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'
 

spec/components/filter_best_posts_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'filter_best_posts'
 require 'topic_view'
 

spec/components/flag_query_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'flag_query'
 
 describe FlagQuery do

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

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

spec/components/gaps_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'cache'
 
 describe Gaps do

spec/components/guardian_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'guardian'
 require_dependency 'post_destroyer'
 

spec/components/has_errors_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'has_errors'
 
 describe HasErrors do

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

spec/components/html_prettify_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'html_prettify'
 
 describe HtmlPrettify do

spec/components/image_sizer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'image_sizer'
 
 describe ImageSizer do

spec/components/import/normalize_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 require_dependency "import/normalize"
 
 describe Import::Normalize do

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

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

spec/components/letter_avatar_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'letter_avatar'
 
 describe LetterAvatar do

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

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

spec/components/new_post_manager_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'new_post_manager'
 
 describe NewPostManager do

spec/components/new_post_result_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'new_post_result'
 
 describe NewPostResult do

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

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

spec/components/oneboxer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'oneboxer'
 
 describe Oneboxer do

spec/components/onpdiff_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'onpdiff'
 
 describe ONPDiff do

spec/components/pinned_check_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'pinned_check'
 
 describe PinnedCheck do

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

spec/components/plugin/instance_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'plugin/instance'
 
 describe Plugin::Instance do

spec/components/plugin/metadata_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'plugin/metadata'
 
 describe Plugin::Metadata do

spec/components/post_creator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'post_creator'
 require 'topic_subtype'
 

spec/components/post_destroyer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'post_destroyer'
 
 describe PostDestroyer do

spec/components/post_enqueuer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'post_enqueuer'
 
 describe PostEnqueuer do

spec/components/post_revisor_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'post_revisor'
 
 describe PostRevisor do

spec/components/pretty_text_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'pretty_text'
 
 describe PrettyText do

spec/components/promotion_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'promotion'
 
 describe Promotion do

spec/components/rate_limiter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'rate_limiter'
 
 describe RateLimiter do

spec/components/redis_store_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'cache'
 
 describe "Redis Store" do

spec/components/s3_helper_spec.rb

@@ -1,5 +1,5 @@
 require "s3_helper"
-require "spec_helper"
+require "rails_helper"
 
 describe "S3Helper" do
 

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

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

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

spec/components/score_calculator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'score_calculator'
 
 describe ScoreCalculator do

spec/components/search_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'search'
 
 describe Search do

spec/components/sidekiq/pausable_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'sidekiq/pausable'
 
 describe Sidekiq do

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'
 

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

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

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

spec/components/slug_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 require 'slug'
 
 describe Slug do

spec/components/spam_handler_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 require "spam_handler"
 
 describe SpamHandler do

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

spec/components/suggested_topics_builder_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'suggested_topics_builder'
 
 describe SuggestedTopicsBuilder do

spec/components/system_message_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'system_message'
 require 'topic_subtype'
 

spec/components/text_cleaner_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'text_cleaner'
 
 describe TextCleaner do

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

spec/components/topic_creator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe TopicCreator do
 

spec/components/topic_query_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'topic_view'
 
 describe TopicQuery do

spec/components/topic_retriever_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require_dependency 'topic_retriever'
 
 describe TopicRetriever do

spec/components/topic_view_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'topic_view'
 
 describe TopicView do