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 AllowedIpAddressValidator do

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe EmailSettingValidator do
describe '#valid_value?' do

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe IntegerSettingValidator do
describe '#valid_value?' do

View File

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

View File

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

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require_dependency 'validators/post_validator'
describe Validators::PostValidator do

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
require 'spec_helper'
require 'rails_helper'
require 'validators/quality_title_validator'
require 'ostruct'

View File

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

View File

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

View File

@ -1,6 +1,6 @@
# encoding: UTF-8
require 'spec_helper'
require 'rails_helper'
require 'validators/topic_title_length_validator'
describe TopicTitleLengthValidator do

View File

@ -1,4 +1,4 @@
require "spec_helper"
require "rails_helper"
describe UserFullNameValidator do
let(:validator) { described_class.new({attributes: :name}) }

View File

@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
describe UsernameSettingValidator do
describe '#valid_value?' do