Merge branch 'main' into add-provenance

sul-dlss · Apr 28, 2022 · b5f2440 · b5f2440
2 parents 573b37a + 3e7e7c3
commit b5f2440
Show file tree

Hide file tree

Showing 39 changed files with 2,087 additions and 584 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -44,8 +44,8 @@ jobs:
         name: Wait for DB
         command: dockerize -wait tcp://localhost:3306 -timeout 1m
     - run:
-        name: Prepare DB for tests
-        command: bin/rails db:reset
+        name: Database setup
+        command: bin/rails db:test:prepare
     - run:
         name: Setup Code Climate test-reporter
         command: |

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -130,6 +130,9 @@ Style/ClassVars:
 Style/NumericPredicate:
   Enabled: false
 
+Style/ReturnNil:
+  Enabled: true
+
 # New cops
 Gemspec/DateAssignment: # (new in 1.10)
   Enabled: true
@@ -322,3 +325,8 @@ Rails/MigrationClassName: # new in 2.14
   Enabled: true
 Rails/TransactionExitStatement: # new in 2.14
   Enabled: true
+
+Lint/RefinementImportMethods: # new in 1.27
+  Enabled: true
+Style/RedundantInitialize: # new in 1.27
+  Enabled: true
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -48,7 +48,7 @@ GEM
     activerecord (6.1.5)
       activemodel (= 6.1.5)
       activesupport (= 6.1.5)
-    activerecord-import (1.3.0)
+    activerecord-import (1.4.0)
       activerecord (>= 4.2)
     activestorage (6.1.5)
       actionpack (= 6.1.5)
@@ -122,7 +122,7 @@ GEM
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.6)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     config (4.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
@@ -143,7 +143,7 @@ GEM
     database_cleaner-core (2.0.1)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
-    dlss-capistrano (4.0.0)
+    dlss-capistrano (4.1.1)
       capistrano (~> 3.0)
       capistrano-bundle_audit (>= 0.3.0)
       capistrano-one_time_key
@@ -152,7 +152,7 @@ GEM
     dotiw (5.3.2)
       activesupport
       i18n
-    dry-configurable (0.14.0)
+    dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
     dry-container (0.9.0)
@@ -191,7 +191,7 @@ GEM
     erubi (1.10.0)
     eventmachine (1.2.7)
     execjs (2.8.1)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
@@ -201,17 +201,18 @@ GEM
       ruby2_keywords (>= 0.0.4)
     faraday-httpclient (2.0.1)
       httpclient (>= 2.2)
-    faraday-net_http (2.0.1)
+    faraday-net_http (2.0.2)
     faraday-retry (1.0.3)
     ffi (1.15.5)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
+      rexml (~> 3.0)
     hana (1.3.7)
     hashdiff (1.0.1)
     hashie (5.0.0)
-    honeybadger (4.11.0)
+    honeybadger (4.12.1)
     htmlentities (4.3.4)
     httpclient (2.8.3)
     httpi (2.5.0)
@@ -228,7 +229,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json_schemer (0.2.19)
+    json_schemer (0.2.20)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -250,7 +251,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.15.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -261,7 +262,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
     minitest (5.15.0)
-    msgpack (1.4.5)
+    msgpack (1.5.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     mysql2 (0.5.3)
@@ -270,12 +271,12 @@ GEM
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-darwin)
+    nokogiri (1.13.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.13.4-x86_64-linux)
       racc (~> 1.4)
     nori (2.6.0)
     oauth2 (1.4.9)
@@ -288,8 +289,8 @@ GEM
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -299,7 +300,7 @@ GEM
       yard (~> 0.9.11)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -339,7 +340,7 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.2.1)
+    regexp_parser (2.3.1)
     request_store (1.5.1)
       rack (>= 1.4)
     retina_tag (1.4.1)
@@ -354,10 +355,10 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-rails (5.1.1)
+    rspec-rails (5.1.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -366,24 +367,24 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
-    rubocop (1.26.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.17.0)
       parser (>= 3.1.1.0)
-    rubocop-rails (2.14.0)
+    rubocop-rails (2.14.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.9.0)
+    rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-prof (1.4.3)
     ruby-progressbar (1.11.0)