gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #717 from AndrewKvalheim/shoulda-spring

Browse source 
Use recommended method for installing Shoulda Matchers with Spring.
This commit is contained in:
Henne Vogelsang 2015-10-27 09:09:10 +01:00
commit 6e9a8bbd59
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -151,7 +151,7 @@ group :test do
gem 'poltergeist' gem 'poltergeist'
gem 'phantomjs', :require => 'phantomjs/poltergeist' gem 'phantomjs', :require => 'phantomjs/poltergeist'
# Set of rails validations matchers to describe models # Set of rails validations matchers to describe models
gem 'shoulda' gem 'shoulda-matchers', require: false
# Extracted from RSpec 3 stub_model and mock_model # Extracted from RSpec 3 stub_model and mock_model
gem 'rspec-activemodel-mocks' gem 'rspec-activemodel-mocks'
gem 'timecop' gem 'timecop'

6
Gemfile.lock
View file

@ -376,10 +376,6 @@ GEM
sass (~> 3.2.2) sass (~> 3.2.2)
sprockets (~> 2.8, < 2.12) sprockets (~> 2.8, < 2.12)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
shoulda-context (1.2.1)
shoulda-matchers (2.6.1) shoulda-matchers (2.6.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
simplecov (0.8.2) simplecov (0.8.2)
@ -496,7 +492,7 @@ DEPENDENCIES
rspec-rails rspec-rails
rubocop rubocop
sass-rails (>= 4.0.2) sass-rails (>= 4.0.2)
shoulda shoulda-matchers
spring-commands-rspec spring-commands-rspec
sqlite3 sqlite3
timecop timecop

1
spec/spec_helper.rb
View file

@ -13,6 +13,7 @@ ENV['RAILS_ENV'] ||= 'test'
require File.expand_path('../../config/environment', __FILE__) require File.expand_path('../../config/environment', __FILE__)
require 'rspec/rails' require 'rspec/rails'
require 'shoulda/matchers'
# To avoid confusion on missed migrations - use Rails 4 checker to ensure # To avoid confusion on missed migrations - use Rails 4 checker to ensure
# all migrations applied # all migrations applied
ActiveRecord::Migration.maintain_test_schema! ActiveRecord::Migration.maintain_test_schema!