diff --git a/Gemfile b/Gemfile index a3acfb0..b204f07 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,7 @@ end group :development, :test do # Test framework - gem 'rspec-rails' + gem 'rspec-rails', '~> 2.99.0' # Fixtures made easy gem 'factory_girl_rails', '~> 4.4.1' diff --git a/Gemfile.lock b/Gemfile.lock index d43833c..d354728 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -189,18 +189,21 @@ GEM ref (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) - rspec-core (2.14.8) - rspec-expectations (2.14.5) + rspec-collection_matchers (0.0.4) + rspec-expectations (>= 2.99.0.beta1) + rspec-core (2.99.0) + rspec-expectations (2.99.0) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.2) + rspec-mocks (2.99.0) + rspec-rails (2.99.0) actionpack (>= 3.0) activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) + rspec-collection_matchers + rspec-core (~> 2.99.0) + rspec-expectations (~> 2.99.0) + rspec-mocks (~> 2.99.0) sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) @@ -246,7 +249,7 @@ GEM polyglot (>= 0.3.1) turbolinks (2.2.2) coffee-rails - tzinfo (1.2.0) + tzinfo (1.2.1) thread_safe (~> 0.1) uglifier (2.5.0) execjs (>= 0.3.0) @@ -285,7 +288,7 @@ DEPENDENCIES pg (~> 0.17.0) poltergeist (~> 1.5.0) rails (= 4.1.2.rc1) - rspec-rails + rspec-rails (~> 2.99.0) sass-rails (~> 4.0.1) sdoc shoulda-matchers (~> 2.6.1) -- libgit2 0.21.2