Merge pull request #282 from sul-dlss/update-dependencies

Update dependencies

Gemfile

@@ -65,3 +65,4 @@ end
 
 gem 'honeybadger'
 gem 'rsolr-ext'
+gem 'rsolr', '~> 1.1'

Gemfile.lock

@@ -60,14 +60,14 @@ GEM
       mini_exiftool
       nokogiri
     ast (2.4.0)
-    autoprefixer-rails (9.5.0)
+    autoprefixer-rails (9.5.1)
       execjs
     awesome_print (1.8.0)
     bagit (0.4.3)
       docopt (~> 0.5.0)
       validatable (~> 1.6)
     bcrypt (3.1.12)
-    blacklight (6.19.2)
+    blacklight (6.20.0)
       bootstrap-sass (~> 3.2)
       deprecation
       globalid
@@ -153,7 +153,7 @@ GEM
     devise-remote-user (1.0.0)
       devise
     diff-lcs (1.3)
-    dlss-capistrano (3.4.1)
+    dlss-capistrano (3.5.0)
       capistrano (~> 3.0)
       capistrano-bundle_audit (>= 0.1.0)
       capistrano-one_time_key
@@ -164,14 +164,14 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dor-rights-auth (1.3.0)
       nokogiri
-    dor-services (6.6.2)
+    dor-services (6.7.0)
       active-fedora (>= 8.7.0, < 9)
       activesupport (>= 4.2.10, < 6.0.0)
       confstruct (~> 0.2.7)
       deprecation (~> 0)
       dor-rights-auth (~> 1.0, >= 1.2.0)
       dor-services-client (~> 1.5)
-      dor-workflow-service (~> 2.0, >= 2.0.1)
+      dor-workflow-service (~> 2.11)
       druid-tools (>= 0.4.1)
       equivalent-xml (~> 0.5, >= 0.5.1)
       json (>= 1.8.1)
@@ -189,14 +189,13 @@ GEM
       stanford-mods (>= 2.3.1)
       stanford-mods-normalizer (~> 0.1)
       systemu (~> 2.6)
-      uuidtools (~> 2.1.4)
     dor-services-client (1.7.0)
       activesupport (>= 4.2, < 6)
       deprecation
       faraday (~> 0.15)
       moab-versioning (~> 4.0)
       nokogiri (~> 1.8)
-    dor-workflow-service (2.10.1)
+    dor-workflow-service (2.12.0)
       activesupport (>= 3.2.1, < 6)
       confstruct (>= 0.2.7, < 2)
       deprecation
@@ -215,8 +214,8 @@ GEM
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.2)
     dry-inflector (0.1.2)
-    dry-logic (0.5.0)
-      dry-container (~> 0.2, >= 0.2.6)
+    dry-logic (0.6.0)
+      concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
     dry-types (0.14.1)
@@ -338,7 +337,7 @@ GEM
       solrizer (~> 3.3)
     orm_adapter (0.5.0)
     parallel (1.17.0)
-    parser (2.6.2.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
@@ -444,7 +443,7 @@ GEM
       mime-types
       nokogiri
       rest-client
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -507,7 +506,6 @@ GEM
       unf_ext
     unf_ext (0.0.7.5)
     unicode-display_width (1.5.0)
-    uuidtools (2.1.5)
     validatable (1.6.7)
     validates_email_format_of (1.6.3)
       i18n
@@ -557,6 +555,7 @@ DEPENDENCIES
   okcomputer
   pry
   rails (~> 4.2.9)
+  rsolr (~> 1.1)
   rsolr-ext
   rspec-rails (~> 3.1)
   rubocop (~> 0.58.1)

spec/features/collection_create_spec.rb

@@ -238,8 +238,8 @@
       expect(hyc.all_hydrus_objects(models: [hya], pids_only: true)).to include(apid)
       expect(hyc.all_hydrus_objects(models: [hyc], pids_only: true)).to include(cpid)
       #   - in workflows
-      expect(wfs.get_workflows(apid)).to eq([hwf])
-      expect(wfs.get_workflows(cpid)).to eq([hwf])
+      expect(wfs.workflows(apid)).to eq([hwf])
+      expect(wfs.workflows(cpid)).to eq([hwf])
       # Delete the collection and its APO.
       expect(hc.is_destroyable).to eq(true)
       click_link 'Discard this collection'
@@ -253,8 +253,8 @@
       expect(hyc.all_hydrus_objects(models: [hya], pids_only: true)).not_to include(apid)
       expect(hyc.all_hydrus_objects(models: [hyc], pids_only: true)).not_to include(cpid)
       #   - from workflows
-      expect(wfs.get_workflows(apid)).to eq([])
-      expect(wfs.get_workflows(cpid)).to eq([])
+      expect(wfs.workflows(apid)).to eq([])
+      expect(wfs.workflows(cpid)).to eq([])
     end
   end
 end

spec/features/item_create_spec.rb

@@ -630,7 +630,7 @@
       #   - in workflows
       expect(hi.class).to eq(hyi)
       expect(hyc.all_hydrus_objects(models: [hyi], pids_only: true)).to include(pid)
-      expect(wfs.get_workflows(pid)).to eq([hwf])
+      expect(wfs.workflows(pid)).to eq([hwf])
       #   - with an uploaded file
       #   - and a corresponding entry in DB table
       expect(Dir.glob(dir + '/*').size).to eq(1)
@@ -646,7 +646,7 @@
       #   - from workflows
       expect { hyi.find(pid) }.to raise_error(afe)
       expect(hyc.all_hydrus_objects(models: [hyi], pids_only: true)).not_to include(pid)
-      expect(wfs.get_workflows(pid)).to eq([])
+      expect(wfs.workflows(pid)).to eq([])
       #   - with no upload directory
       #   - and no DB entries
       expect(File.directory?(dir)).to eq(false)