Skip to content

Commit

Permalink
Upgrade to rspec3
Browse files Browse the repository at this point in the history
  • Loading branch information
alext committed Jan 6, 2015
1 parent 0541d19 commit 2fecdb1
Show file tree
Hide file tree
Showing 12 changed files with 138 additions and 51 deletions.
1 change: 1 addition & 0 deletions .rspec
@@ -1 +1,2 @@
--color
--require spec_helper
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -10,7 +10,7 @@ gem 'unicorn', '4.6.3'
gem 'airbrake', '3.1.15'

group :development, :test do
gem 'rspec-rails', '2.14.0'
gem 'rspec-rails', '~> 3.1.0'
gem 'database_cleaner', '1.2.0'
gem 'factory_girl_rails', '4.2.1'
gem 'simplecov-rcov', '0.2.3', :require => false
Expand Down
25 changes: 15 additions & 10 deletions Gemfile.lock
Expand Up @@ -39,7 +39,7 @@ GEM
crack (0.4.1)
safe_yaml (~> 0.9.0)
database_cleaner (1.2.0)
diff-lcs (1.2.4)
diff-lcs (1.2.5)
erubis (2.7.0)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -93,17 +93,22 @@ GEM
rake (10.1.1)
rdoc (3.12.2)
json (~> 1.4)
rspec-core (2.14.5)
rspec-expectations (2.14.3)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.3)
rspec-rails (2.14.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
safe_yaml (0.9.7)
simplecov (0.7.1)
multi_json (~> 1.0)
Expand Down Expand Up @@ -141,7 +146,7 @@ DEPENDENCIES
logstasher (= 0.4.8)
mongoid (= 3.1.5)
rails (= 3.2.17)
rspec-rails (= 2.14.0)
rspec-rails (~> 3.1.0)
simplecov-rcov (= 0.2.3)
unicorn (= 4.6.3)
webmock (= 1.15.0)
2 changes: 1 addition & 1 deletion spec/lib/router_reloader_spec.rb
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'
require 'router_reloader'

describe RouterReloader do
Expand Down
2 changes: 1 addition & 1 deletion spec/models/backend_spec.rb
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'

describe Backend do
describe "validations" do
Expand Down
2 changes: 1 addition & 1 deletion spec/models/route_spec.rb
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'

describe Route do
describe "validations" do
Expand Down
38 changes: 38 additions & 0 deletions spec/rails_helper.rb
@@ -0,0 +1,38 @@
# This file is copied to spec/ when you run 'rails generate rspec:install'
ENV["RAILS_ENV"] ||= 'test'
require 'spec_helper'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
# Add additional requires below this line. Rails is not loaded until this point!

# Requires supporting ruby files with custom matchers and macros, etc, in
# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
# run as spec files by default. This means that files in spec/support that end
# in _spec.rb will both be required and run as specs, causing the specs to be
# run twice. It is recommended that you do not name files matching this glob to
# end with _spec.rb. You can configure this pattern with the --pattern
# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
#
# The following line is provided for convenience purposes. It has the downside
# of increasing the boot-up time by auto-requiring all files in the support
# directory. Alternatively, in the individual `*_spec.rb` files, manually
# require only the support files necessary.
#
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }

RSpec.configure do |config|
# RSpec Rails can automatically mix in different behaviours to your tests
# based on their file location, for example enabling you to call `get` and
# `post` in specs under `spec/controllers`.
#
# You can disable this behaviour by removing the line below, and instead
# explicitly tag your specs with their type, e.g.:
#
# RSpec.describe UsersController, :type => :controller do
# # ...
# end
#
# The different available types are documented in the features, such as in
# https://relishapp.com/rspec/rspec-rails/docs
config.infer_spec_type_from_file_location!
end
2 changes: 1 addition & 1 deletion spec/requests/backend_crud_spec.rb
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'

describe "managing backends" do

Expand Down
2 changes: 1 addition & 1 deletion spec/requests/gone_routes_spec.rb
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'

describe "auto creation and deletion of gone routes" do

Expand Down
2 changes: 1 addition & 1 deletion spec/requests/healthcheck_spec.rb
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'

describe "Healthecheck" do

Expand Down
2 changes: 1 addition & 1 deletion spec/requests/routes_crud_spec.rb
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'

describe "managing routes" do
describe "fetching details of a route" do
Expand Down
109 changes: 76 additions & 33 deletions spec/spec_helper.rb
Expand Up @@ -3,45 +3,88 @@
SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
SimpleCov.start 'rails'

# This file is copied to spec/ when you run 'rails generate rspec:install'
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'rspec/autorun'
# This file was generated by the `rails generate rspec:install` command. Conventionally, all
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
# The generated `.rspec` file contains `--require spec_helper` which will cause this
# file to always be loaded, without a need to explicitly require it in any files.
#
# Given that it is always loaded, you are encouraged to keep this file as
# light-weight as possible. Requiring heavyweight dependencies from this file
# will add to the boot time of your test suite on EVERY test run, even for an
# individual file that may not need all of that loaded. Instead, consider making
# a separate helper file that requires the additional dependencies and performs
# the additional setup, and require it from the spec files that actually need it.
#
# The `.rspec` file also contains a few flags that are not defaults but that
# users commonly want.
#
# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
RSpec.configure do |config|
# rspec-expectations config goes here. You can use an alternate
# assertion/expectation library such as wrong or the stdlib/minitest
# assertions if you prefer.
config.expect_with :rspec do |expectations|
# This option will default to `true` in RSpec 4. It makes the `description`
# and `failure_message` of custom matchers include text for helper methods
# defined using `chain`, e.g.:
# be_bigger_than(2).and_smaller_than(4).description
# # => "be bigger than 2 and smaller than 4"
# ...rather than:
# # => "be bigger than 2"
expectations.include_chain_clauses_in_custom_matcher_descriptions = true
end

# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
# rspec-mocks config goes here. You can use an alternate test double
# library (such as bogus or mocha) by changing the `mock_with` option here.
config.mock_with :rspec do |mocks|
# Prevents you from mocking or stubbing a method that does not exist on
# a real object. This is generally recommended, and will default to
# `true` in RSpec 4.
mocks.verify_partial_doubles = true
end

# Checks for pending migrations before tests are run.
# If you are not using ActiveRecord, you can remove this line.
#ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
# The settings below are suggested to provide a good initial experience
# with RSpec, but feel free to customize to your heart's content.
=begin
# These two settings work together to allow you to limit a spec run
# to individual examples or groups you care about by tagging them with
# `:focus` metadata. When nothing is tagged with `:focus`, all examples
# get run.
config.filter_run :focus
config.run_all_when_everything_filtered = true
RSpec.configure do |config|
# ## Mock Framework
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
#
# config.mock_with :mocha
# config.mock_with :flexmock
# config.mock_with :rr

# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
#config.fixture_path = "#{::Rails.root}/spec/fixtures"

# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
# instead of true.
#config.use_transactional_fixtures = true

# If true, the base class of anonymous controllers will be inferred
# automatically. This will be the default behavior in future versions of
# rspec-rails.
config.infer_base_class_for_anonymous_controllers = false
# Limits the available syntax to the non-monkey patched syntax that is recommended.
# For more details, see:
# - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
# - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
# - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
config.disable_monkey_patching!
# Many RSpec users commonly either run the entire suite or an individual
# file, and it's useful to allow more verbose output when running an
# individual spec file.
if config.files_to_run.one?
# Use the documentation formatter for detailed output,
# unless a formatter has already been configured
# (e.g. via a command-line flag).
config.default_formatter = 'doc'
end
# Print the 10 slowest examples and example groups at the
# end of the spec run, to help surface which specs are running
# particularly slow.
config.profile_examples = 10
# Run specs in random order to surface order dependencies. If you find an
# order dependency and want to debug it, you can fix the order by providing
# the seed, which is printed after each run.
# --seed 1234
config.order = "random"
config.order = :random
# Seed global randomization in this process using the `--seed` CLI option.
# Setting this allows you to use `--seed` to deterministically reproduce
# test failures related to randomization by passing the same `--seed` value
# as the one that triggered the failure.
Kernel.srand config.seed
=end
end

0 comments on commit 2fecdb1

Please sign in to comment.