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

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::AdminController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::ApiController do

View File

@@ -1,4 +1,4 @@
require "spec_helper"
require "rails_helper"
describe Admin::BackupsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::BadgesController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::ColorSchemesController do
it "is a subclass of AdminController" do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'discourse_version_check'
describe Admin::DashboardController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::EmailController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::EmbeddableHostsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::EmbeddingController do

View File

@@ -1,4 +1,4 @@
require "spec_helper"
require "rails_helper"
describe Admin::EmojisController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::FlagsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::GroupsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::ImpersonateController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::PermalinksController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::PluginsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::ReportsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::ScreenedEmailsController do
it "is a subclass of AdminController" do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::ScreenedIpAddressesController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::ScreenedUrlsController do
it "is a subclass of AdminController" do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::SiteCustomizationsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::SiteSettingsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::SiteTextsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::StaffActionLogsController do
it "is a subclass of AdminController" do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Admin::UserFieldsController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'single_sign_on'
describe Admin::UsersController do

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'version'
describe Admin::VersionsController do

View File

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

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe BadgesController do
let!(:badge) { Fabricate(:badge) }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
require "spec_helper"
require "rails_helper"
describe ExportCsvController do
let(:export_filename) { "user-archive-codinghorror-150115-234817-999.csv.gz" }

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe GroupsController do
let(:group) { Fabricate(:group) }

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
RSpec.describe ManifestJsonController do
context 'index' do

View File

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

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe Users::OmniauthCallbacksController do

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe PostActionUsersController do
let!(:post) { Fabricate(:post, user: log_in) }

View File

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

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
shared_examples 'finding and showing post' do
let(:user) { log_in }

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'queued_posts_controller'
require_dependency 'queued_post'

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe SimilarTopicsController do
context 'similar_to' do

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
def topics_controller_show_gen_perm_tests(expected, ctx)
expected.each do |sym, status|

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe UserBadgesController do
let(:user) { Fabricate(:user) }

View File

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