Skip to content

Commit 023a3bf

Browse files
committed
Bundle update rspec-rails
We need to this to support testing Sidekiq jobs inline, see rails/rails#37270 and rspec/rspec-rails#2242 for more information.
1 parent 0b46c52 commit 023a3bf

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ group :development, :test do
4646
gem "rack", ">= 2.0.6"
4747
gem 'rails-controller-testing'
4848
gem 'rspec-its'
49-
gem 'rspec-rails'
49+
gem 'rspec-rails', '4.0.0.rc1'
5050
gem 'shoulda-matchers'
5151
gem 'simplecov', require: false
5252
gem 'spring'

Gemfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,17 +324,17 @@ GEM
324324
rspec-its (1.3.0)
325325
rspec-core (>= 3.0.0)
326326
rspec-expectations (>= 3.0.0)
327-
rspec-mocks (3.9.0)
327+
rspec-mocks (3.9.1)
328328
diff-lcs (>= 1.2.0, < 2.0)
329329
rspec-support (~> 3.9.0)
330-
rspec-rails (3.9.0)
331-
actionpack (>= 3.0)
332-
activesupport (>= 3.0)
333-
railties (>= 3.0)
334-
rspec-core (~> 3.9.0)
335-
rspec-expectations (~> 3.9.0)
336-
rspec-mocks (~> 3.9.0)
337-
rspec-support (~> 3.9.0)
330+
rspec-rails (4.0.0.rc1)
331+
actionpack (>= 4.2)
332+
activesupport (>= 4.2)
333+
railties (>= 4.2)
334+
rspec-core (~> 3.9)
335+
rspec-expectations (~> 3.9)
336+
rspec-mocks (~> 3.9)
337+
rspec-support (~> 3.9)
338338
rspec-support (3.9.0)
339339
rubocop (0.77.0)
340340
jaro_winkler (~> 1.5.1)
@@ -465,7 +465,7 @@ DEPENDENCIES
465465
rails-controller-testing
466466
rails-erd
467467
rspec-its
468-
rspec-rails
468+
rspec-rails (= 4.0.0.rc1)
469469
rubocop-govuk (~> 2)
470470
ruby-progressbar
471471
scenic

0 commit comments

Comments
 (0)