From 53a5f02b723d9c85a0d4743c4e642fc5cd7738fc Mon Sep 17 00:00:00 2001
From: Cristina <CristinaRO@users.noreply.github.com>
Date: Mon, 14 Oct 2019 00:18:53 +0100
Subject: [PATCH] AO3-5789 Update Database Cleaner and test-only gems (#3652)

* Upgrade database_cleaner to remove deprecations

One step closer to Rails 5.2:

`DEPRECATION WARNING: schema_migrations_table_name is deprecated and will be removed from Rails 5.2`

Our previous version of `database_cleaner` used `schema_migrations_table_name`.

This commit upgrades it to the minimum viable version that gets rid of the deprecated code, since newer versions may require more work to be compatible with our current test suite.

* Update test-only gems that are not locked
---
 Gemfile      |  2 +-
 Gemfile.lock | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index 386a7286261..a310f868de6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -141,7 +141,7 @@ group :test do
   gem 'pickle'
   gem 'shoulda'
   gem 'capybara', '~> 2.16.1'
-  gem 'database_cleaner', '1.5.2'
+  gem 'database_cleaner', '1.6.0'
   gem 'cucumber', '~> 2.4.0'
   gem 'poltergeist'
   gem 'capybara-screenshot'
diff --git a/Gemfile.lock b/Gemfile.lock
index f83118ef266..fcb32db0d0a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,7 +92,7 @@ GEM
     bcrypt (3.1.11)
     brakeman (3.7.2)
     builder (3.2.3)
-    bullet (5.9.0)
+    bullet (6.0.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundler-audit (0.5.0)
@@ -117,15 +117,15 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.14)
-      capybara (>= 1.0, < 3)
+    capybara-screenshot (1.0.23)
+      capybara (>= 1.0, < 4)
       launchy
     chronic (0.10.2)
     climate_control (0.2.0)
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    codecov (0.1.10)
+    codecov (0.1.14)
       json
       simplecov
       url
@@ -159,7 +159,7 @@ GEM
       timecop
     cucumber-wire (0.0.1)
     dalli (2.7.6)
-    database_cleaner (1.5.2)
+    database_cleaner (1.6.0)
     delorean (2.1.0)
       chronic
     devise (4.7.1)
@@ -282,8 +282,8 @@ GEM
     pickle (0.5.5)
       cucumber (>= 0.8, < 4.0)
       rake
-    poltergeist (1.15.0)
-      capybara (~> 2.1)
+    poltergeist (1.18.1)
+      capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     power_assert (1.0.2)
@@ -370,7 +370,7 @@ GEM
     rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
-    rspec-rails (3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -388,17 +388,17 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
-    shoulda (3.5.0)
+    shoulda (3.6.0)
       shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
+      shoulda-matchers (~> 3.0)
     shoulda-context (1.2.2)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
+    shoulda-matchers (3.1.3)
+      activesupport (>= 4.0.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     sinatra (2.0.3)
       mustermann (~> 1.0)
       rack (~> 2.0)
@@ -418,7 +418,7 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    timecop (0.8.1)
+    timecop (0.9.1)
     timeliness (0.3.8)
     transaction_isolation (1.0.5)
       activerecord (>= 3.0.11)
@@ -490,7 +490,7 @@ DEPENDENCIES
   cucumber-rails (~> 1.5)
   cucumber-timecop
   dalli
-  database_cleaner (= 1.5.2)
+  database_cleaner (= 1.6.0)
   delorean
   devise
   devise-async