From cfae7b4fada531c4b5863406175e1112aef4c77d Mon Sep 17 00:00:00 2001
From: Andy Wallace <andrewwallace@library.ucla.edu>
Date: Tue, 2 Nov 2021 13:18:22 -0700
Subject: [PATCH] Update dependencies, Install rspec-retry for flaky tests
 (#897)

* Update dependencies

- update puma to ~> 5.5 in Gemfile
- update sidekiq to ~> 5.2 in Gemfile
- run `bundle update`

* Install rspec-retry for flaky tests
---
 Gemfile             |   8 +-
 Gemfile.lock        | 426 ++++++++++++++++++++++++--------------------
 spec/spec_helper.rb |  40 +++--
 3 files changed, 258 insertions(+), 216 deletions(-)

diff --git a/Gemfile b/Gemfile
index b81b201d7..29ba363ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem 'loofah', '>= 2.2.3'
 gem 'mysql2', '~> 0.5'
 gem 'pkg-config', '~> 1.1'
 # Use Puma as the app server
-gem 'puma', '~> 4.3'
+gem 'puma', '~> 5.5'
 gem 'rack', '>= 2.0.6'
 gem 'rails', '~> 5.1.6'
 gem 'redcarpet'
@@ -38,7 +38,7 @@ gem 'rollbar'
 gem 'rsolr', '>= 1.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
-gem 'sidekiq', '~> 5.1.3'
+gem 'sidekiq', '~> 5.2'
 gem 'sidekiq-failures'
 gem 'sidekiq-status'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
@@ -83,3 +83,7 @@ group :development, :test do
   gem 'webmock'
   gem 'xray-rails'
 end
+
+group :test do
+  gem 'rspec-retry' # Unlike rspec, this doesn't need to be included in development group
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index b01045890..452851a75 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,7 +24,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active-fedora (11.5.5)
+    active-fedora (11.5.6)
       active-triples (>= 0.11.0, < 2.0.0)
       activemodel (>= 4.2, < 5.2)
       activesupport (>= 4.2.4, < 5.2)
@@ -32,15 +32,16 @@ GEM
       faraday (~> 0.12.1)
       faraday-encoding (= 0.0.4)
       ldp (~> 0.7.0)
+      rdf-vocab (< 3.1.5)
       rsolr (>= 1.1.2, < 3)
       ruby-progressbar (~> 1.0)
       solrizer (>= 3.4, < 5)
-    active-triples (1.1.0)
+    active-triples (1.1.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rdf (>= 2.0.2, < 4.0)
       rdf-vocab (>= 2.0, < 4.0)
-    active_encode (0.7.0)
+    active_encode (0.8.2)
       rails
       sprockets (< 4)
     activejob (5.1.7)
@@ -52,7 +53,7 @@ GEM
       activemodel (= 5.1.7)
       activesupport (= 5.1.7)
       arel (~> 8.0)
-    activerecord-import (1.0.4)
+    activerecord-import (1.2.0)
       activerecord (>= 3.2)
     activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -65,40 +66,41 @@ GEM
       sshkit (>= 1.6.1, != 1.7.0)
     almond-rails (0.3.0)
       rails (>= 4.2)
+    amazing_print (1.4.0)
     arel (8.0.0)
-    ast (2.4.0)
-    autoprefixer-rails (9.7.4)
-      execjs
-    awesome_nested_set (3.2.0)
+    ast (2.4.2)
+    autoprefixer-rails (10.3.3.0)
+      execjs (~> 2)
+    awesome_nested_set (3.4.0)
       activerecord (>= 4.0.0, < 7.0)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.279.0)
-    aws-sdk-core (3.90.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.523.0)
+    aws-sdk-core (3.121.6)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.520.1)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.29.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-kms (1.50.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.2)
-      aws-sdk-core (~> 3, >= 3.83.0)
+    aws-sdk-s3 (1.104.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     bcp47 (0.3.3)
       i18n
-    bcrypt (3.1.13)
+    bcrypt (3.1.16)
     bindex (0.8.1)
     bixby (1.0.0)
       rubocop (~> 0.50, <= 0.52.1)
       rubocop-rspec (~> 1.22, <= 1.22.2)
-    blacklight (6.22.0)
+    blacklight (6.24.0)
       bootstrap-sass (~> 3.2)
       deprecation
       globalid
@@ -120,7 +122,7 @@ GEM
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
-    bootstrap_form (4.3.0)
+    bootstrap_form (4.4.0)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
     breadcrumbs_on_rails (3.0.1)
@@ -138,9 +140,9 @@ GEM
       sass-rails
       signet
     builder (3.2.4)
-    byebug (11.1.1)
+    byebug (11.1.3)
     cancancan (1.17.0)
-    capistrano (3.12.0)
+    capistrano (3.16.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -149,11 +151,11 @@ GEM
       capistrano (~> 3.1)
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
-    capistrano-passenger (0.2.0)
+    capistrano-passenger (0.2.1)
       capistrano (~> 3.0)
-    capistrano-rails (1.4.0)
+    capistrano-rails (1.6.1)
       capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
+      capistrano-bundler (>= 1.1, < 3)
     capistrano-rails-collection (0.1.0)
       capistrano-rails (~> 1.1)
     capistrano-sidekiq (0.20.0)
@@ -166,10 +168,11 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    carrierwave (1.3.1)
+    carrierwave (1.3.2)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
+      ssrf_filter (~> 1.0)
     childprocess (3.0.0)
     chronic (0.10.2)
     chronic_duration (0.10.6)
@@ -182,33 +185,34 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.6)
-    connection_pool (2.2.2)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
     darlingtonia (3.2.2)
       active-fedora (>= 11.5.2)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    deprecation (1.0.0)
+    declarative (0.0.20)
+    deprecation (1.1.0)
       activesupport
-    devise (4.7.1)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-guests (0.7.0)
+    devise-guests (0.8.1)
       devise
-    diff-lcs (1.3)
-    docile (1.3.2)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.2)
     dotenv-rails (2.2.2)
       dotenv (= 2.2.2)
@@ -216,27 +220,25 @@ GEM
     dropbox_api (0.1.18)
       faraday (<= 1.0)
       oauth2 (~> 1.1)
-    dry-configurable (0.11.3)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
-    dry-events (0.2.0)
+    dry-events (0.3.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
     dry-inflector (0.2.0)
     dry-logic (0.6.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-matcher (0.8.3)
-      dry-core (>= 0.4.8)
+    dry-matcher (0.9.0)
+      dry-core (~> 0.4, >= 0.4.8)
     dry-monads (1.3.5)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.4)
@@ -246,7 +248,7 @@ GEM
       dry-equalizer (~> 0.2)
       dry-types (~> 0.13)
       ice_nine (~> 0.11)
-    dry-transaction (0.13.0)
+    dry-transaction (0.13.2)
       dry-container (>= 0.2.8)
       dry-events (>= 0.1.0)
       dry-matcher (>= 0.7.0)
@@ -265,43 +267,51 @@ GEM
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.5, >= 0.5.0)
       dry-types (~> 0.14.0)
-    ebnf (1.2.0)
+    ebnf (2.2.1)
+      amazing_print (~> 1.2)
+      htmlentities (~> 4.3)
       rdf (~> 3.1)
+      scanf (~> 1.0)
       sxp (~> 1.1)
+      unicode-types (~> 1.6)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erubi (1.9.0)
-    execjs (2.7.0)
-    factory_bot (5.1.1)
-      activesupport (>= 4.2.0)
-    factory_bot_rails (5.1.1)
-      factory_bot (~> 5.1.0)
-      railties (>= 4.2.0)
+    erubi (1.10.0)
+    execjs (2.8.1)
+    factory_bot (6.2.0)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.2.0)
+      factory_bot (~> 6.2.0)
+      railties (>= 5.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.4)
       faraday
     fcrepo_wrapper (0.9.0)
       ruby-progressbar
-    ffaker (2.13.0)
-    ffi (1.12.2)
+    ffaker (2.20.0)
+    ffi (1.15.4)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
     flipflop (2.6.0)
       activesupport (>= 4.0)
     flot-rails (0.0.7)
       jquery-rails
-    font-awesome-rails (4.7.0.5)
-      railties (>= 3.2, < 6.1)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    google-api-client (0.37.2)
+    font-awesome-rails (4.7.0.7)
+      railties (>= 3.2, < 7)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    google-api-client (0.52.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
+      rexml
       signet (~> 0.12)
-    google_drive (2.1.3)
+    google_drive (3.0.6)
       google-api-client (>= 0.11.0, < 1.0.0)
       googleauth (>= 0.5.0, < 1.0.0)
       nokogiri (>= 1.5.3, < 2.0.0)
@@ -312,7 +322,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.12)
-    haml (5.1.2)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     hamster (3.0.0)
@@ -320,8 +330,16 @@ GEM
     hashdiff (1.0.1)
     hiredis (0.6.3)
     htmlentities (4.3.4)
+    http (5.0.4)
+      addressable (~> 2.8)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.4.0)
+    http-cookie (1.0.4)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
     http_logger (0.6.0)
-    httparty (0.18.0)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
@@ -335,10 +353,10 @@ GEM
     hydra-core (10.7.0)
       hydra-access-controls (= 10.7.0)
       railties (>= 4.0.0, < 6)
-    hydra-derivatives (3.5.0)
-      active-fedora (>= 11.3.1, < 14)
+    hydra-derivatives (3.6.0)
+      active-fedora (>= 11.5.6, != 13.2.1, != 13.2.0, != 13.1.3, != 13.1.2, != 13.1.1, != 13.1.0, != 13.0.0, != 12.2.1, != 12.2.0, != 12.1.1, != 12.1.0, != 12.0.3, != 12.0.2, != 12.0.1, != 12.0.0)
       active_encode (~> 0.1)
-      activesupport (>= 4.0, < 6)
+      activesupport (>= 4.0, < 7)
       addressable (~> 2.5)
       deprecation
       mime-types (> 2.0, < 4.0)
@@ -350,7 +368,7 @@ GEM
       rails (>= 4.2.0, < 6)
       simple_form (~> 3.2)
       sprockets-es6
-    hydra-file_characterization (1.1.0)
+    hydra-file_characterization (1.1.2)
       activesupport (>= 3.0.0)
     hydra-head (10.7.0)
       hydra-access-controls (= 10.7.0)
@@ -359,7 +377,7 @@ GEM
     hydra-pcdm (1.1.0)
       active-fedora (>= 10, < 14)
       mime-types (>= 1)
-    hydra-role-management (1.0.2)
+    hydra-role-management (1.0.3)
       blacklight
       bootstrap_form
       bundler (>= 1.5)
@@ -418,12 +436,12 @@ GEM
       signet
       simple_form (~> 3.2, <= 3.5.0)
       tinymce-rails (~> 4.1)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     iiif_manifest (0.5.0)
       activesupport (>= 4)
-    jbuilder (2.10.0)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     jmespath (1.4.0)
     jquery-datatables-rails (3.4.0)
@@ -431,43 +449,43 @@ GEM
       jquery-rails
       railties (>= 3.1)
       sass-rails
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.3.0)
-    json-canonicalization (0.2.0)
-    json-ld (3.1.1)
+    json (2.6.1)
+    json-canonicalization (0.2.1)
+    json-ld (3.1.10)
       htmlentities (~> 4.3)
       json-canonicalization (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.14)
       rack (~> 2.0)
       rdf (~> 3.1)
-    json-ld-preloaded (3.1.1)
+    json-ld-preloaded (3.1.6)
       json-ld (~> 3.1)
       rdf (~> 3.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.2.1)
-    kaminari (1.2.0)
+    jwt (2.3.0)
+    kaminari (1.2.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.0)
-      kaminari-activerecord (= 1.2.0)
-      kaminari-core (= 1.2.0)
-    kaminari-actionview (1.2.0)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
       actionview
-      kaminari-core (= 1.2.0)
-    kaminari-activerecord (1.2.0)
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
       activerecord
-      kaminari-core (= 1.2.0)
-    kaminari-core (1.2.0)
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
     kaminari_route_prefix (0.1.1)
       kaminari (~> 1.0)
-    ld-patch (3.1.0)
-      ebnf (~> 1.2)
+    ld-patch (3.1.3)
+      ebnf (~> 2.1)
       rdf (~> 3.1)
       rdf-xsd (~> 3.1)
       sparql (~> 3.1)
@@ -515,7 +533,11 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.4.0)
+    llhttp-ffi (0.4.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
+    logger (1.4.4)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -524,59 +546,59 @@ GEM
       carrierwave (>= 0.5.8)
       rails (>= 5.0.0)
     memoist (0.16.2)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_magick (4.10.1)
-    mini_mime (1.0.2)
+    mime-types-data (3.2021.0901)
+    mini_magick (4.11.0)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
-    minitest (5.14.0)
-    multi_json (1.14.1)
+    minitest (5.14.4)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     nest (3.2.0)
       redic
-    net-http-persistent (3.1.0)
+    net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
-    nio4r (2.5.2)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
+    nio4r (2.5.8)
     noid (0.9.0)
-    noid-rails (3.0.1)
-      actionpack (>= 5.0.0, < 6)
+    noid-rails (3.0.3)
+      actionpack (>= 5.0.0, < 7)
       noid (~> 0.9)
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogumbo (2.0.2)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     numerizer (0.1.1)
-    oauth (0.5.6)
-    oauth2 (1.4.4)
+    oauth (0.5.7)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    openseadragon (0.5.0)
+    openseadragon (0.6.0)
       rails (> 3.2.0)
     orm_adapter (0.5.0)
-    os (1.0.1)
-    parallel (1.19.1)
-    parser (2.7.0.4)
-      ast (~> 2.4.0)
-    pkg-config (1.4.1)
-    posix-spawn (0.3.13)
+    os (1.1.1)
+    parallel (1.21.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pkg-config (1.4.6)
+    posix-spawn (0.3.15)
     power_converter (0.1.2)
-    powerpack (0.1.2)
+    powerpack (0.1.3)
     public_suffix (4.0.6)
     pul_uv_rails (2.0.1)
-    puma (4.3.8)
+    puma (5.5.2)
       nio4r (~> 2.0)
-    qa (2.2.0)
+    qa (2.3.0)
       activerecord-import
       deprecation
       faraday
@@ -584,8 +606,8 @@ GEM
       rails (~> 5.0)
       rdf
     racc (1.6.0)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -604,7 +626,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rails_autolink (1.1.6)
       rails (> 3.1)
@@ -615,28 +637,29 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.3)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-readline (0.5.5)
-    rdf (3.1.1)
+    rdf (3.1.15)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (3.1.0)
       rdf (~> 3.1)
-    rdf-isomorphic (3.1.0)
+    rdf-isomorphic (3.1.1)
       rdf (~> 3.1)
     rdf-json (3.1.0)
       rdf (~> 3.1)
-    rdf-microdata (3.1.0)
+    rdf-microdata (3.1.1)
       htmlentities (~> 4.3)
       nokogiri (~> 1.10)
       rdf (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-n3 (3.1.1)
-      rdf (~> 3.1)
-      sparql (~> 3.1)
+    rdf-n3 (3.1.2)
+      ebnf (~> 2.1)
+      rdf (~> 3.1, >= 3.1.8)
+      sparql (~> 3.1, >= 3.1.4)
       sxp (~> 1.1)
     rdf-normalize (0.4.0)
       rdf (~> 3.1)
@@ -646,68 +669,70 @@ GEM
       rdf (~> 3.1)
       rdf-aggregate-repo (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-rdfxml (3.1.0)
+    rdf-rdfxml (3.1.1)
       htmlentities (~> 4.3)
       rdf (~> 3.1)
       rdf-rdfa (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-reasoner (0.6.0)
-      rdf (~> 3.1)
-      rdf-vocab (~> 3.1)
+    rdf-reasoner (0.7.2)
+      rdf (~> 3.1, >= 3.1.12)
       rdf-xsd (~> 3.1)
-    rdf-tabular (3.1.0)
+    rdf-tabular (3.1.1)
       addressable (~> 2.3)
       bcp47 (~> 0.3, >= 0.3.3)
       json-ld (~> 3.1)
       rdf (~> 3.1)
       rdf-vocab (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-trig (3.1.0)
-      ebnf (~> 1.1)
+    rdf-trig (3.1.2)
+      ebnf (~> 2.1)
       rdf (~> 3.1)
       rdf-turtle (~> 3.1)
-    rdf-trix (3.1.0)
-      rdf (~> 3.1)
-    rdf-turtle (3.1.0)
-      ebnf (~> 1.2)
+    rdf-trix (3.1.1)
       rdf (~> 3.1)
-    rdf-vocab (3.1.2)
+      rdf-xsd (~> 3.1)
+    rdf-turtle (3.1.3)
+      ebnf (~> 2.1)
+      rdf (~> 3.1, >= 3.1.8)
+    rdf-vocab (3.1.4)
       rdf (~> 3.1)
-    rdf-xsd (3.1.0)
+    rdf-xsd (3.1.1)
       rdf (~> 3.1)
-    redcarpet (3.5.0)
+      rexml (~> 3.2)
+    redcarpet (3.5.1)
     redic (1.5.3)
       hiredis
-    redis (4.1.3)
-    redis-namespace (1.7.0)
+    redis (4.1.4)
+    redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    redlock (1.2.0)
+    redlock (1.2.2)
       redis (>= 3.0.0, < 5.0)
-    representable (3.0.4)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    responders (3.0.0)
+    responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     retriable (3.1.2)
     retries (0.0.5)
+    rexml (3.2.5)
     riiif (1.7.1)
       deprecation (>= 1.0.0)
       railties (>= 4.2, < 6)
-    rollbar (2.24.0)
+    rollbar (3.3.0)
     rsolr (2.3.0)
       builder (>= 2.1.2)
       faraday (>= 0.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
+    rspec-rails (3.9.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -715,7 +740,9 @@ GEM
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-retry (0.6.2)
+      rspec-core (> 3.3)
+    rspec-support (3.9.4)
     rubocop (0.52.1)
       parallel (~> 1.10)
       parser (>= 2.4.0.2, < 3.0)
@@ -730,10 +757,9 @@ GEM
       json
       multipart-post
       oauth2
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     ruby_dep (1.5.0)
-    rubyzip (2.2.0)
-    safe_yaml (1.0.5)
+    rubyzip (2.3.2)
     samvera-nesting_indexer (2.0.0)
       dry-equalizer
     sass (3.7.4)
@@ -747,31 +773,32 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.2.1)
+    sassc (2.4.0)
       ffi (~> 1.9)
-    select2-rails (3.5.10)
-      thor (~> 0.14)
+    scanf (1.0.0)
+    select2-rails (3.5.11)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    shex (0.6.0)
-      ebnf (~> 1.2)
+    shex (0.6.4)
+      ebnf (~> 2.1, >= 2.2)
+      htmlentities (~> 4.3)
       json-ld (~> 3.1)
       json-ld-preloaded (~> 3.1)
       rdf (~> 3.1)
       rdf-xsd (~> 3.1)
       sparql (~> 3.1)
       sxp (~> 1.1)
-    sidekiq (5.1.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
+    sidekiq (5.2.9)
+      connection_pool (~> 2.2, >= 2.2.2)
+      rack (~> 2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    sidekiq-failures (1.0.0)
+      redis (>= 3.3.5, < 4.2)
+    sidekiq-failures (1.0.1)
       sidekiq (>= 4.0.0)
-    sidekiq-status (1.1.4)
+    sidekiq-status (2.1.0)
       chronic_duration
-      sidekiq (>= 3.0)
+      sidekiq (>= 5.0)
     signet (0.12.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -785,9 +812,9 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    slop (4.8.0)
-    solr_wrapper (2.2.0)
-      faraday
+    slop (4.9.1)
+    solr_wrapper (3.1.2)
+      http
       retriable
       ruby-progressbar
       rubyzip
@@ -795,18 +822,19 @@ GEM
       activesupport
       nokogiri
       xml-simple
-    sparql (3.1.0)
+    sparql (3.1.8)
       builder (~> 3.2)
-      ebnf (~> 1.2)
-      rdf (~> 3.1)
+      ebnf (~> 2.1)
+      logger (~> 1.4)
+      rdf (~> 3.1, >= 3.1.14)
       rdf-aggregate-repo (~> 3.1)
       rdf-xsd (~> 3.1)
-      sparql-client (~> 3.1)
+      sparql-client (~> 3.1, >= 3.1.2)
       sxp (~> 1.1)
-    sparql-client (3.1.0)
-      net-http-persistent (~> 3.1)
+    sparql-client (3.1.2)
+      net-http-persistent (~> 4.0, >= 4.0.1)
       rdf (~> 3.1)
-    spring (2.1.0)
+    spring (2.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     spring-watcher-listen (2.0.1)
@@ -819,26 +847,28 @@ GEM
       babel-source (>= 5.8.11)
       babel-transpiler
       sprockets (>= 3.0.0)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.20.0)
+    sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    ssrf_filter (1.0.7)
     sxp (1.1.0)
       rdf (~> 3.1)
     sync (0.5.0)
     temple (0.8.2)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tins (1.24.1)
+    tins (1.29.1)
       sync
-    tinymce-rails (4.9.8)
+    tinymce-rails (4.9.11)
       railties (>= 3.1.1)
+    trailblazer-option (0.1.1)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -846,21 +876,25 @@ GEM
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
-    tzinfo (1.2.6)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uber (0.1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.1)
-    warden (1.2.8)
-      rack (>= 2.0.6)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8)
+    unicode-display_width (1.8.0)
+    unicode-types (1.7.0)
+    warden (1.2.9)
+      rack (>= 2.0.9)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webmock (3.8.2)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.6.5)
@@ -868,7 +902,8 @@ GEM
     websocket-extensions (0.1.5)
     whenever (1.0.0)
       chronic (>= 0.6.3)
-    xml-simple (1.1.5)
+    xml-simple (1.1.9)
+      rexml
     xpath (3.2.0)
       nokogiri (~> 1.8)
     xray-rails (0.3.2)
@@ -908,7 +943,7 @@ DEPENDENCIES
   loofah (>= 2.2.3)
   mysql2 (~> 0.5)
   pkg-config (~> 1.1)
-  puma (~> 4.3)
+  puma (~> 5.5)
   rack (>= 2.0.6)
   rails (~> 5.1.6)
   rb-readline
@@ -918,10 +953,11 @@ DEPENDENCIES
   rollbar
   rsolr (>= 1.0)
   rspec-rails (~> 3.8)
+  rspec-retry
   rubocop-rspec
   sass-rails (~> 5.0)
   selenium-webdriver
-  sidekiq (~> 5.1.3)
+  sidekiq (~> 5.2)
   sidekiq-failures
   sidekiq-status
   simplecov (~> 0.16.1)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index db5b6f7ec..904028fb3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,30 +1,16 @@
 # frozen_string_literal: true
-# This file was generated by the `rails generate rspec:install` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-
-# Use WebMock to stub HTTP requests
+
+require 'rspec/retry'
 require 'webmock/rspec'
-WebMock.enable!
-WebMock.allow_net_connect!
 
 if ENV['TRAVIS'] == 'true'
   require 'coveralls'
   Coveralls.wear!('rails')
 end
 
+WebMock.enable!
+WebMock.allow_net_connect!
+
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
@@ -38,6 +24,22 @@
     # ...rather than:
     #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+
+    # show retry status in spec process
+    config.verbose_retry = true
+    # show exception that triggers a retry if verbose_retry is set to true
+    config.display_try_failure_messages = true
+
+    # run retry only on features
+    config.around :each, :js do |ex|
+      ex.run_with_retry retry: 3
+    end
+
+    # callback to be run between retries
+    config.retry_callback = proc do |ex|
+      # run some additional clean up task - can be filtered by example metadata
+      Capybara.reset! if ex.metadata[:js]
+    end
   end
 
   # rspec-mocks config goes here. You can use an alternate test double