From 7708fc2720f3858c6f5aaeef03ced9ba64d13daa Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Wed, 30 Dec 2015 20:55:43 +0100 Subject: [PATCH] Update to latest rspec-rails (3.4) --- Gemfile | 2 +- Gemfile.lock | 34 ++++++++++++++++++---------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 49165d3..ece6532 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ group :development do end group :development, :test do - gem "rspec-rails", '~> 2.14' + gem "rspec-rails", '~> 3.4.0' gem "capybara", '~> 2.4.4' gem "byebug" end diff --git a/Gemfile.lock b/Gemfile.lock index 55c1aed..d17abd3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -262,21 +262,23 @@ GEM railties (>= 4.2.0.alpha, < 5) rollbar (1.3.2) multi_json (~> 1.3) - rspec-collection_matchers (1.1.2) - rspec-expectations (>= 2.99.0.beta1) - rspec-core (2.99.2) - rspec-expectations (2.99.2) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.99.2) - rspec-rails (2.99.0) - actionpack (>= 3.0) - activemodel (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-collection_matchers - rspec-core (~> 2.99.0) - rspec-expectations (~> 2.99.0) - rspec-mocks (~> 2.99.0) + rspec-core (3.4.1) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-mocks (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-rails (3.4.0) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) rubocop (0.28.0) astrolabe (~> 1.3) parser (>= 2.2.0.pre.7, < 3.0) @@ -398,7 +400,7 @@ DEPENDENCIES rdiscount responders (~> 2.0) rollbar - rspec-rails (~> 2.14) + rspec-rails (~> 3.4.0) rubocop sass-rails (~> 5.0.1) select2-rails