From 991f1b49be44e368fc242a938a066bcfdc535802 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Mon, 8 Apr 2019 02:33:45 -0700 Subject: [PATCH 1/3] Update dependencies --- Gemfile.lock | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d3b5a5a9c..a6575a1d9 100644 --- a/Gemfile.lock +++ b/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) @@ -404,8 +403,9 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retries (0.0.5) - rsolr (1.1.2) + rsolr (2.2.1) builder (>= 2.1.2) + faraday (>= 0.9.0) rsolr-ext (1.0.3) rsolr (>= 1.0.2) rspec-core (3.8.0) @@ -444,7 +444,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 +507,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 From caecb3ed6c29c4afab17603a9dfd24b801b964dc Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Mon, 8 Apr 2019 10:07:43 -0500 Subject: [PATCH 2/3] Avoid deprecated workflow service methods --- spec/features/collection_create_spec.rb | 8 ++++---- spec/features/item_create_spec.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/features/collection_create_spec.rb b/spec/features/collection_create_spec.rb index b19da620a..7bf7f8f32 100644 --- a/spec/features/collection_create_spec.rb +++ b/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 diff --git a/spec/features/item_create_spec.rb b/spec/features/item_create_spec.rb index 680463f6f..8914b4eb1 100644 --- a/spec/features/item_create_spec.rb +++ b/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) From fb383dbc2211e286b25f1613ec343ba641c6ec4d Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Mon, 8 Apr 2019 10:13:41 -0500 Subject: [PATCH 3/3] Lock rsolr to ~> 1.1 upgrading to rsolr 2 causes a problem where the Solr URI is too long and causes a test to fail with 414 Request-URI Too Long --- Gemfile | 1 + Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 7ef79cf1a..afc3939c7 100644 --- a/Gemfile +++ b/Gemfile @@ -65,3 +65,4 @@ end gem 'honeybadger' gem 'rsolr-ext' +gem 'rsolr', '~> 1.1' diff --git a/Gemfile.lock b/Gemfile.lock index a6575a1d9..3c0ec9c1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -403,9 +403,8 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retries (0.0.5) - rsolr (2.2.1) + rsolr (1.1.2) builder (>= 2.1.2) - faraday (>= 0.9.0) rsolr-ext (1.0.3) rsolr (>= 1.0.2) rspec-core (3.8.0) @@ -556,6 +555,7 @@ DEPENDENCIES okcomputer pry rails (~> 4.2.9) + rsolr (~> 1.1) rsolr-ext rspec-rails (~> 3.1) rubocop (~> 0.58.1)