lock to rspec 2.13.x as 2.14.x rspec-mocks breaks one of our tests
This commit is contained in:
parent
cf66b6bb6d
commit
785c46db53
2
Gemfile
2
Gemfile
|
@ -23,7 +23,7 @@ gem 'metriks', '0.9.9.5'
|
||||||
gem 'ar-octopus', github: 'travis-ci/octopus', require: nil
|
gem 'ar-octopus', github: 'travis-ci/octopus', require: nil
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem 'rspec', '~> 2.11'
|
gem 'rspec', '~> 2.13.0'
|
||||||
gem 'factory_girl', '~> 2.4.0'
|
gem 'factory_girl', '~> 2.4.0'
|
||||||
gem 'mocha', '~> 0.12'
|
gem 'mocha', '~> 0.12'
|
||||||
gem 'database_cleaner', '~> 0.8.0'
|
gem 'database_cleaner', '~> 0.8.0'
|
||||||
|
|
16
Gemfile.lock
16
Gemfile.lock
|
@ -223,14 +223,14 @@ GEM
|
||||||
rerun (0.8.1)
|
rerun (0.8.1)
|
||||||
listen (>= 1.0.3)
|
listen (>= 1.0.3)
|
||||||
rollout (1.1.0)
|
rollout (1.1.0)
|
||||||
rspec (2.14.0)
|
rspec (2.13.0)
|
||||||
rspec-core (~> 2.14.0)
|
rspec-core (~> 2.13.0)
|
||||||
rspec-expectations (~> 2.14.0)
|
rspec-expectations (~> 2.13.0)
|
||||||
rspec-mocks (~> 2.14.0)
|
rspec-mocks (~> 2.13.0)
|
||||||
rspec-core (2.14.0)
|
rspec-core (2.13.1)
|
||||||
rspec-expectations (2.14.0)
|
rspec-expectations (2.13.0)
|
||||||
diff-lcs (>= 1.1.3, < 2.0)
|
diff-lcs (>= 1.1.3, < 2.0)
|
||||||
rspec-mocks (2.14.1)
|
rspec-mocks (2.13.1)
|
||||||
sidekiq (2.5.4)
|
sidekiq (2.5.4)
|
||||||
celluloid (~> 0.12.0)
|
celluloid (~> 0.12.0)
|
||||||
connection_pool (~> 0.9.2)
|
connection_pool (~> 0.9.2)
|
||||||
|
@ -293,7 +293,7 @@ DEPENDENCIES
|
||||||
rake (~> 0.9.2)
|
rake (~> 0.9.2)
|
||||||
rb-fsevent (~> 0.9.1)
|
rb-fsevent (~> 0.9.1)
|
||||||
rerun
|
rerun
|
||||||
rspec (~> 2.11)
|
rspec (~> 2.13.0)
|
||||||
sentry-raven!
|
sentry-raven!
|
||||||
sinatra
|
sinatra
|
||||||
sinatra-contrib
|
sinatra-contrib
|
||||||
|
|
Loading…
Reference in New Issue
Block a user