From 6811a625686165655640db451cd3e901463a12c0 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 5 Apr 2017 10:33:06 +1000 Subject: [PATCH] Updating RSpec Gems --- Gemfile | 8 ++++---- Gemfile.lock | 57 +++++++++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/Gemfile b/Gemfile index 72c12fa7c5..3787a195ed 100644 --- a/Gemfile +++ b/Gemfile @@ -102,8 +102,8 @@ gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz' group :test, :development do # Pretty printed test output gem 'turn', '~> 0.8.3', :require => false - gem 'fuubar' - gem 'rspec-rails' + gem 'fuubar', '~> 2.2.0' + gem 'rspec-rails', ">= 3.5.2" gem 'shoulda-matchers' gem 'factory_girl_rails', :require => false gem 'capybara' @@ -113,7 +113,7 @@ group :test, :development do gem 'timecop' gem 'poltergeist' gem 'rspec-retry' - gem 'json_spec' + gem 'json_spec', '~> 1.1.4' gem 'unicorn-rails' gem 'atomic' gem 'knapsack' @@ -133,7 +133,7 @@ group :development do gem 'guard-livereload' gem 'rack-livereload' gem 'guard-rails' - gem 'guard-rspec' + gem 'guard-rspec', '~> 4.7.3' gem 'parallel_tests' gem 'rubocop', '>= 0.49.1' diff --git a/Gemfile.lock b/Gemfile.lock index 241c6298bb..413b49a25f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -266,7 +266,7 @@ GEM warden (~> 1.2.1) devise-encryptable (0.1.2) devise (>= 2.1.0) - diff-lcs (1.2.4) + diff-lcs (1.3) diffy (3.1.0) em-websocket (0.5.0) eventmachine (>= 0.12.9) @@ -404,8 +404,8 @@ GEM foundation-rails (5.5.0.0) railties (>= 3.1.0) sass (>= 3.2.0, < 3.4) - fuubar (1.3.3) - rspec (>= 2.14.0, < 3.1.0) + fuubar (2.2.0) + rspec-core (~> 3.0) ruby-progressbar (~> 1.4) geocoder (1.1.8) gmaps4rails (1.5.6) @@ -415,15 +415,17 @@ GEM lumberjack (~> 1.0) pry (>= 0.9.12) thor (>= 0.18.1) + guard-compat (1.2.1) guard-livereload (2.0.1) em-websocket (~> 0.5) guard (~> 2.0) multi_json (~> 1.8) guard-rails (0.4.7) guard (>= 0.2.2) - guard-rspec (4.0.4) - guard (>= 2.1.1) - rspec (~> 2.14) + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) haml (4.0.4) tilt highline (1.6.15) @@ -446,9 +448,9 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.6) - json_spec (1.1.1) + json_spec (1.1.5) multi_json (~> 1.0) - rspec (~> 2.0) + rspec (>= 2.0, < 4.0) jwt (1.5.4) kaminari (0.13.0) actionpack (>= 3.0.0) @@ -588,24 +590,29 @@ GEM roo (2.7.1) nokogiri (~> 1) rubyzip (~> 1.1, < 2.0.0) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.4) - rspec-expectations (2.14.0) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.2) - rspec-rails (2.14.2) + rspec (3.7.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-core (3.7.0) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.7.0) + rspec-rails (3.7.1) 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-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) rspec-retry (0.4.2) rspec-core + rspec-support (3.7.0) rubocop (0.49.1) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -723,20 +730,20 @@ DEPENDENCIES foundation-icons-sass-rails foundation-rails foundation_rails_helper! - fuubar + fuubar (~> 2.2.0) geocoder gmaps4rails guard guard-livereload guard-rails - guard-rspec + guard-rspec (~> 4.7.3) haml i18n (~> 0.6.11) i18n-js (~> 3.0.0) immigrant jquery-migrate-rails jquery-rails - json_spec + json_spec (~> 1.1.4) jwt (~> 1.5) knapsack letter_opener @@ -761,7 +768,7 @@ DEPENDENCIES representative_view roadie-rails (~> 1.0.3) roo (~> 2.7.0) - rspec-rails + rspec-rails (>= 3.5.2) rspec-retry rubocop (>= 0.49.1) sass (~> 3.3)