nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump shoulda-matchers

Browse source
This commit is contained in:
Jonne Haß 2015-10-20 15:14:20 +02:00 committed by Dennis Schubert
parent 6404f5df2b
commit c0c4b7277b
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -268,7 +268,7 @@ group :test do
gem "factory_girl_rails", "4.5.0" gem "factory_girl_rails", "4.5.0"
gem "timecop", "0.8.0" gem "timecop", "0.8.0"
gem "webmock", "1.21.0", require: false gem "webmock", "1.21.0", require: false
gem "shoulda-matchers", "2.8.0", require: false gem "shoulda-matchers", "3.0.0"
end end
group :development, :test do group :development, :test do

6
Gemfile.lock
View file

@ -659,8 +659,8 @@ GEM
rubyzip (~> 1.0) rubyzip (~> 1.0)
websocket (~> 1.0) websocket (~> 1.0)
shellany (0.0.1) shellany (0.0.1)
shoulda-matchers (2.8.0) shoulda-matchers (3.0.0)
activesupport (>= 3.0.0) activesupport (>= 4.0.0)
sidekiq (3.4.2) sidekiq (3.4.2)
celluloid (~> 0.16.0) celluloid (~> 0.16.0)
connection_pool (~> 2.2, >= 2.2.0) connection_pool (~> 2.2, >= 2.2.0)
@ -861,7 +861,7 @@ DEPENDENCIES
rubyzip (= 1.1.7) rubyzip (= 1.1.7)
sass-rails (= 5.0.4) sass-rails (= 5.0.4)
selenium-webdriver (= 2.47.1) selenium-webdriver (= 2.47.1)
shoulda-matchers (= 2.8.0) shoulda-matchers (= 3.0.0)
sidekiq (= 3.4.2) sidekiq (= 3.4.2)
sidetiq (= 0.6.3) sidetiq (= 0.6.3)
simple_captcha2 (= 0.3.4) simple_captcha2 (= 0.3.4)

7
spec/spec_helper.rb
View file

@ -106,3 +106,10 @@ RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods config.include FactoryGirl::Syntax::Methods
end end
Shoulda::Matchers.configure do |config|
config.integrate do |with|
with.test_framework :rspec
with.library :rails
end
end