diff --git a/Gemfile b/Gemfile index 445c05531a..0e2d21d89c 100644 --- a/Gemfile +++ b/Gemfile @@ -103,7 +103,6 @@ gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f5 group :test, :development do # Pretty printed test output - gem 'turn', '~> 0.8.3', require: false gem 'fuubar', '~> 2.2.0' gem 'rspec-rails', ">= 3.5.2" gem 'shoulda-matchers' diff --git a/Gemfile.lock b/Gemfile.lock index 22e8109a1e..1ac2fa34fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,6 @@ GEM tilt angularjs-file-upload-rails (1.1.6) angularjs-rails (1.5.5) - ansi (1.4.2) arel (3.0.3) ast (2.3.0) atomic (1.1.99) @@ -202,13 +201,13 @@ GEM builder (3.0.4) byebug (9.0.6) cancan (1.6.8) - capybara (2.15.4) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) chronic (0.10.2) chunky_png (1.3.4) climate_control (0.1.0) @@ -275,10 +274,10 @@ GEM eventmachine (1.2.3) excon (0.45.4) execjs (2.6.0) - factory_girl (3.3.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (3.3.0) - factory_girl (~> 3.3.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -462,12 +461,11 @@ GEM activesupport (>= 3.0.0) railties (>= 3.0.0) kgio (2.9.3) - knapsack (1.5.1) + knapsack (1.16.0) rake - timecop (>= 0.1.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.4.1) + letter_opener (1.6.0) launchy (~> 2.2) libv8 (3.16.14.11) listen (3.0.8) @@ -611,7 +609,7 @@ GEM rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.7.0) - rspec-rails (3.7.1) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -619,8 +617,8 @@ GEM rspec-expectations (~> 3.7.0) rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) - rspec-retry (0.4.2) - rspec-core + rspec-retry (0.5.6) + rspec-core (> 3.3, < 3.8) rspec-support (3.7.0) rubocop (0.49.1) parallel (~> 1.10) @@ -640,7 +638,7 @@ GEM select2-rails (3.5.10) thor (~> 0.14) shellany (0.0.1) - shoulda-matchers (1.1.0) + shoulda-matchers (2.8.0) activesupport (>= 3.0.0) skylight (1.5.0) activesupport (>= 3.0.0) @@ -660,7 +658,7 @@ GEM ref thor (0.20.0) tilt (1.4.1) - timecop (0.8.1) + timecop (0.9.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -668,8 +666,6 @@ GEM turbo-sprockets-rails3 (0.3.6) railties (> 3.2.8, < 4.0.0) sprockets (>= 2.0.0) - turn (0.8.3) - ansi tzinfo (0.3.53) uglifier (2.7.1) execjs (>= 0.3.0) @@ -798,7 +794,6 @@ DEPENDENCIES timecop truncate_html turbo-sprockets-rails3 - turn (~> 0.8.3) uglifier (>= 1.0.3) unicorn unicorn-rails @@ -811,4 +806,4 @@ RUBY VERSION ruby 2.1.5p273 BUNDLED WITH - 1.16.0 + 1.16.1