From aaf5bcbb12c3dba484022180deaf91e0054474f8 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Tue, 13 Mar 2018 09:32:12 +0100 Subject: [PATCH 1/9] Upgrade rspec-rails from 3.7.1 to 3.7.2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 22e8109a1e..1e94acc3fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -611,7 +611,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) @@ -811,4 +811,4 @@ RUBY VERSION ruby 2.1.5p273 BUNDLED WITH - 1.16.0 + 1.16.1 From bdd58dccf037af474699337b1a590cd21a3477e5 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Tue, 13 Mar 2018 09:34:09 +0100 Subject: [PATCH 2/9] Upgrade Timecop from 0.8.1 to 0.9.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1e94acc3fa..aaf8ea8118 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -660,7 +660,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) From 1d75e5a671b5d3a87a70eda06b621bbec9905180 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Tue, 13 Mar 2018 09:53:20 +0100 Subject: [PATCH 3/9] Upgrade rspec-retry from 0.4.2 to 0.5.6 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index aaf8ea8118..253eca874b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -619,8 +619,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) From 6f879cd5d93d2928a33c56a6ffc6b3076029d074 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Tue, 13 Mar 2018 09:54:26 +0100 Subject: [PATCH 4/9] Remove unused gem Turn It provides runners for MiniTest and we use RSpec. --- Gemfile | 1 - Gemfile.lock | 4 ---- 2 files changed, 5 deletions(-) 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 253eca874b..21fadacea2 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) @@ -668,8 +667,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 +795,6 @@ DEPENDENCIES timecop truncate_html turbo-sprockets-rails3 - turn (~> 0.8.3) uglifier (>= 1.0.3) unicorn unicorn-rails From d96c1fc16564dccd52a5fae242aa128fba008ca4 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Tue, 13 Mar 2018 10:01:14 +0100 Subject: [PATCH 5/9] Upgrade factory_girl_rails from 3.3.0 to 4.9.0 This is the last version before moving to factory_bot_rails. --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 21fadacea2..0a7ca2e579 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,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) From 47a6ffbf6662536e943ce3a1a64de54d242115d3 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Tue, 13 Mar 2018 13:58:06 +0100 Subject: [PATCH 6/9] Upgrade Capybara from 2.15.4 to 2.18.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0a7ca2e579..1c1f059221 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,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) From cce30d5762514522da069cc5cafb2ded95507b4f Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Tue, 13 Mar 2018 14:11:00 +0100 Subject: [PATCH 7/9] Upgrade Knapsack from 1.5.1 to 1.16.0 --- Gemfile.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1c1f059221..e239b6bd21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -461,9 +461,8 @@ 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) From e6f6232607b752ca1d135e7b423b241f63d3c623 Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Tue, 13 Mar 2018 14:21:54 +0100 Subject: [PATCH 8/9] Upgrade letter_opener from 1.4.1 to 1.6.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e239b6bd21..161d820318 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -465,7 +465,7 @@ GEM rake 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) From d980809a193d2e4303a1ef299fd881a64ac0c34b Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Tue, 13 Mar 2018 15:35:55 +0100 Subject: [PATCH 9/9] Upgrade shoulda-matchers from 1.1.0 to 2.8.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 161d820318..1ac2fa34fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -638,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)