diff --git a/Gemfile b/Gemfile index 840e632d..c6dd32ab 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ group :development, :test do gem 'listen', '~> 3.2' gem 'pry', '~> 0.13' gem 'pry-rails' - gem 'rspec-rails', '~> 3.8' + gem 'rspec-rails', '~> 4.0' gem 'shoulda-matchers', '~> 5.3' gem 'simplecov', '~> 0.16.1' gem 'spring' diff --git a/Gemfile.lock b/Gemfile.lock index a68f6c5f..7a339d2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -329,23 +329,23 @@ GEM rexml (3.3.8) rmagick (5.3.0) pkg-config (~> 1.4) - rspec-core (3.9.3) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.4) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (3.9.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.4) + rspec-support (~> 3.13.0) + rspec-rails (4.1.2) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.13.1) rubocop (0.83.0) parallel (~> 1.10) parser (>= 2.7.0.1) @@ -470,7 +470,7 @@ DEPENDENCIES rails-html-sanitizer (~> 1.2.0) rails_autolink (~> 1.1.6) rmagick (~> 5.3.0) - rspec-rails (~> 3.8) + rspec-rails (~> 4.0) rubocop (~> 0.83.0) rubyzip (~> 1.3.0) scss_lint (~> 0.54)