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.
This commit is contained in:
Andy Waite 2015-10-11 10:41:23 +01:00
parent c8de38c553
commit 3e50313fdc
333 changed files with 332 additions and 332 deletions

View File

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

View File

@ -1,4 +1,4 @@
require "spec_helper"
require "rails_helper"
describe ::DiscoursePoll::PollsController do
routes { ::DiscoursePoll::Engine.routes }

View File

@ -1,4 +1,4 @@
require "spec_helper"
require "rails_helper"
describe PostsController do
let!(:user) { log_in }

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'admin_user_index_query'
describe AdminUserIndexQuery do

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'auth/default_current_user_provider'
describe Auth::DefaultCurrentUserProvider do

View File

@ -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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
# For autospec:
Auth.send(:remove_const, :GoogleOAuth2Authenticator)

View File

@ -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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
require "spec_helper"
require "rails_helper"
require_dependency "common_passwords/common_passwords"
describe CommonPasswords do

View File

@ -1,5 +1,5 @@
# encoding: utf-8
require 'spec_helper'
require 'rails_helper'
require 'composer_messages_finder'
describe ComposerMessagesFinder do

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'sass/discourse_sass_compiler'
describe DiscourseSassCompiler do

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
# -*- encoding : utf-8 -*-
require 'spec_helper'
require 'rails_helper'
require 'email/receiver'
describe Email::Receiver do

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require 'file_store/local_store'
describe FileStore::LocalStore do

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require 'file_store/s3_store'
require 'file_store/local_store'

View File

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

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe 'pool drainer' do
let(:pool) do

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency "freedom_patches/safe_buffer"
describe ActiveSupport::SafeBuffer do

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'highlight_js/highlight_js'
describe HighlightJs do

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'js_locale_helper'
describe JsLocaleHelper do

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'json_error'
shared_examples "a generic error" do

View File

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

View File

@ -1,4 +1,4 @@
require "spec_helper"
require "rails_helper"
require_dependency "middleware/anonymous_cache"
describe Middleware::AnonymousCache::Helper do

View File

@ -1,4 +1,4 @@
require "spec_helper"
require "rails_helper"
require_dependency "middleware/request_tracker"
describe Middleware::RequestTracker do

View File

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

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Onebox::Engine::DiscourseLocalOnebox do
it "matches for a topic url" do

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require 'onebox/engine/flash_video_onebox'
describe Onebox::Engine::FlashVideoOnebox do

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
# encoding: utf-8
require 'spec_helper'
require 'rails_helper'
require_dependency 'scheduler/defer'
describe Scheduler::Defer do

View File

@ -1,5 +1,5 @@
# encoding: utf-8
require 'spec_helper'
require 'rails_helper'
require 'scheduler/scheduler'
describe Scheduler::Manager do

View File

@ -1,5 +1,5 @@
# encoding: utf-8
require 'spec_helper'
require 'rails_helper'
require 'scheduler/scheduler'
describe Scheduler::ScheduleInfo do

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'site_setting_extension'
require_dependency 'site_settings/local_process_provider'

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'site_settings/db_provider'
describe SiteSettings::DbProvider do

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'site_settings/local_process_provider'
describe SiteSettings::LocalProcessProvider do

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require 'site_settings/yaml_loader'
describe SiteSettings::YamlLoader do

View File

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

View File

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

View File

@ -1,5 +1,5 @@
# encoding: utf-8
require 'spec_helper'
require 'rails_helper'
require_dependency 'sql_builder'
describe SqlBuilder do

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More