dor-workflow-client 3.19.0 → 3.23.0

data/lib/dor/workflow/client/status.rb

@@ -42,32 +42,38 @@ module Dor
         end
 
         # @return [Hash{Symbol => Object}] including :status_code and :status_time
+        # rubocop:disable Metrics/MethodLength
         def info
-          # if we have an accessioned milestone, this is the last possible step and should be the status regardless of time stamp
-          accessioned_milestones = current_milestones.select { |m| m[:milestone] == 'accessioned' }
-          return { status_code: STEPS['accessioned'], status_time: accessioned_milestones.last[:at].utc.xmlschema } unless accessioned_milestones.empty?
-
-          status_code = 0
-          status_time = nil
-          # for each milestone in the current version, see if it comes at the same time or after the current 'last' step, if so, make it the last and record the date/time
-          current_milestones.each do |m|
-            m_name = m[:milestone]
-            m_time = m[:at].utc.xmlschema
-            next unless STEPS.key?(m_name) && (!status_time || m_time >= status_time)
-
-            status_code = STEPS[m_name]
-            status_time = m_time
+          @info ||= begin
+            # if we have an accessioned milestone, this is the last possible step and should be the status regardless of time stamp
+            accessioned_milestones = current_milestones.select { |m| m[:milestone] == 'accessioned' }
+            return { status_code: STEPS['accessioned'], status_time: accessioned_milestones.last[:at].utc.xmlschema } unless accessioned_milestones.empty?
+
+            status_code = 0
+            status_time = nil
+            # for each milestone in the current version, see if it comes at the same time or after the current 'last' step, if so, make it the last and record the date/time
+            current_milestones.each do |m|
+              m_name = m[:milestone]
+              m_time = m[:at].utc.xmlschema
+              next unless STEPS.key?(m_name) && (!status_time || m_time >= status_time)
+
+              status_code = STEPS[m_name]
+              status_time = m_time
+            end
+
+            { status_code: status_code, status_time: status_time }
           end
+        end
+        # rubocop:enable Metrics/MethodLength
 
-          { status_code: status_code, status_time: status_time }
+        def status_code
+          info.fetch(:status_code)
         end
 
         # @param [Boolean] include_time
         # @return [String] single composed status from status_info
         def display(include_time: false)
-          status_info_hash = info
-          status_code = status_info_hash[:status_code]
-          status_time = status_info_hash[:status_time]
+          status_time = info[:status_time]
 
           # use the translation table to get the appropriate verbage for the latest step
           result = "v#{version} #{STATUS_CODE_DISP_TXT[status_code]}"
@@ -75,14 +81,24 @@ module Dor
           result
         end
 
+        def display_simplified
+          simplified_status_code(STATUS_CODE_DISP_TXT[status_code])
+        end
+
         def milestones
-          @milestones ||= lifecycle_routes.milestones('dor', druid)
+          @milestones ||= lifecycle_routes.milestones(druid: druid)
         end
 
         private
 
         attr_reader :druid, :version, :lifecycle_routes
 
+        # @return [String] text translation of the status code, minus any trailing parenthetical explanation
+        # e.g. 'In accessioning (described)' and 'In accessioning (described, published)' both return 'In accessioning'
+        def simplified_status_code(display)
+          display.gsub(/\(.*\)$/, '').strip
+        end
+
         def current_milestones
           current = []
           # only get steps that are part of accessioning and part of the current version. That can mean they were archived with the current version

data/lib/dor/workflow/client/version.rb

@@ -3,7 +3,7 @@
 module Dor
   module Workflow
     class Client
-      VERSION = '3.19.0'
+      VERSION = '3.23.0'
     end
   end
 end

data/lib/dor/workflow/client/workflow_routes.rb

@@ -274,13 +274,20 @@ module Dor
           workflow(pid: pid, workflow_name: workflow_name).process_for_recent_version(name: process)
         end
 
-        # Deletes a workflow from a particular repository and druid
+        # Deletes a workflow from a particular repository and druid. This is only used by Hydrus.
         # @param [String] repo The repository the object resides in.  The service recoginzes "dor" and "sdr" at the moment
         # @param [String] druid The id of the object to delete the workflow from
         # @param [String] workflow The name of the workflow to be deleted
+        # @param [Integer] version The version of the workflow to delete
         # @return [Boolean] always true
-        def delete_workflow(repo, druid, workflow)
-          requestor.request "#{repo}/objects/#{druid}/workflows/#{workflow}", 'delete'
+        def delete_workflow(repo, druid, workflow, version: nil)
+          qs_args = if version
+                      "?version=#{version}"
+                    else
+                      Deprecation.warn(self, 'Calling delete_workflow without passing version is deprecated and will result in an error in dor-workflow-client 4.0')
+                      ''
+                    end
+          requestor.request "#{repo}/objects/#{druid}/workflows/#{workflow}#{qs_args}", 'delete'
           true
         end
 

data/lib/dor/workflow/response/process.rb

@@ -5,6 +5,9 @@ module Dor
     module Response
       # Represents the status of an object doing a workflow process
       class Process
+        extend Deprecation
+        self.deprecation_horizon = '4.x'
+
         # @params [Workflow] parent
         # @params [Hash] attributes
         def initialize(parent:, **attributes)
@@ -49,6 +52,7 @@ module Dor
         end
 
         delegate :pid, :workflow_name, :repository, to: :parent
+        deprecation_deprecate :repository
 
         private
 

data/lib/dor/workflow/response/workflow.rb

@@ -5,6 +5,9 @@ module Dor
     module Response
       # The response from asking the server about a workflow for an item
       class Workflow
+        extend Deprecation
+        self.deprecation_horizon = '4.x'
+
         def initialize(xml:)
           @xml = xml
         end
@@ -20,6 +23,7 @@ module Dor
         def repository
           workflow['repository']
         end
+        deprecation_deprecate :repository
 
         # @param [Integer] version the version we are checking for.
         def active_for?(version:)

data/spec/models/response/process_spec.rb

@@ -33,6 +33,10 @@ RSpec.describe Dor::Workflow::Response::Process do
   end
 
   describe '#repository' do
+    before do
+      allow(Deprecation).to receive(:warn)
+    end
+
     subject { instance.repository }
 
     let(:xml) do

data/spec/models/response/workflow_spec.rb

@@ -32,6 +32,10 @@ RSpec.describe Dor::Workflow::Response::Workflow do
   describe '#repository' do
     subject { instance.repository }
 
+    before do
+      allow(Deprecation).to receive(:warn)
+    end
+
     let(:xml) do
       <<~XML
         <workflow repository="dor" objectId="druid:mw971zk1113" id="assemblyWF">

data/spec/workflow/client/lifecycle_routes_spec.rb

@@ -6,6 +6,8 @@ RSpec.describe Dor::Workflow::Client::LifecycleRoutes do
   let(:requestor) { instance_double(Dor::Workflow::Client::Requestor, request: response) }
   let(:response) { '<xml />' }
   let(:routes) { described_class.new(requestor: requestor) }
+  let(:repo) { 'dor' }
+  let(:druid) { 'druid:gv054hp4128' }
 
   describe '#milestones' do
     let(:ng_xml) { Nokogiri::XML(xml) }
@@ -15,52 +17,177 @@ RSpec.describe Dor::Workflow::Client::LifecycleRoutes do
 
     before do
       allow(routes).to receive(:query_lifecycle).and_return(ng_xml)
+      allow(Deprecation).to receive(:warn)
     end
 
-    subject(:milestones) { routes.milestones('dor', 'druid:gv054hp4128') }
+    context 'with positional arguments' do
+      subject(:milestones) { routes.milestones(repo, druid) }
 
-    it 'includes the version in with the milestones' do
-      expect(milestones.first[:milestone]).to eq('published')
-      expect(milestones.first[:version]).to eq('2')
+      it 'includes the version in with the milestones' do
+        expect(milestones.first[:milestone]).to eq('published')
+        expect(milestones.first[:version]).to eq('2')
+        expect(Deprecation).to have_received(:warn).twice
+      end
+    end
+
+    context 'with kwargs' do
+      subject(:milestones) { routes.milestones(druid: druid) }
+
+      it 'includes the version in with the milestones' do
+        expect(milestones.first[:milestone]).to eq('published')
+        expect(milestones.first[:version]).to eq('2')
+      end
     end
   end
 
   describe '#lifecycle' do
-    context 'without version' do
-      subject(:lifecycle) { routes.lifecycle('dor', 'druid:gv054hp4128', 'submitted') }
+    context 'with positional arguments' do
+      before do
+        allow(Deprecation).to receive(:warn)
+      end
+
+      context 'without version' do
+        subject(:lifecycle) { routes.lifecycle(repo, druid, 'submitted') }
+
+        it 'make the request' do
+          lifecycle
+          expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle')
+          expect(Deprecation).to have_received(:warn).twice
+        end
+      end
 
-      it 'make the request' do
-        lifecycle
-        expect(requestor).to have_received(:request).with('dor/objects/druid:gv054hp4128/lifecycle')
+      context 'with version' do
+        subject(:lifecycle) { routes.lifecycle(repo, druid, 'submitted', version: 3) }
+
+        it 'makes the request with the version' do
+          lifecycle
+          expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle?version=3')
+          expect(Deprecation).to have_received(:warn).twice
+        end
       end
     end
 
-    context 'with version' do
-      subject(:lifecycle) { routes.lifecycle('dor', 'druid:gv054hp4128', 'submitted', version: 3) }
+    context 'with kwargs' do
+      before do
+        allow(Deprecation).to receive(:warn)
+      end
+
+      context 'with deprecated repo arg' do
+        context 'without version' do
+          subject(:lifecycle) { routes.lifecycle(repo: repo, druid: druid, milestone_name: 'submitted') }
+
+          it 'make the request' do
+            lifecycle
+            expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle')
+            expect(Deprecation).to have_received(:warn)
+          end
+        end
+
+        context 'with version' do
+          subject(:lifecycle) { routes.lifecycle(repo: repo, druid: druid, milestone_name: 'submitted', version: 3) }
 
-      it 'makes the request with the version' do
-        lifecycle
-        expect(requestor).to have_received(:request).with('dor/objects/druid:gv054hp4128/lifecycle?version=3')
+          it 'makes the request with the version' do
+            lifecycle
+            expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle?version=3')
+            expect(Deprecation).to have_received(:warn)
+          end
+        end
+      end
+
+      context 'without version' do
+        subject(:lifecycle) { routes.lifecycle(druid: druid, milestone_name: 'submitted') }
+
+        it 'make the request' do
+          lifecycle
+          expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle')
+          expect(Deprecation).not_to have_received(:warn)
+        end
+      end
+
+      context 'with version' do
+        subject(:lifecycle) { routes.lifecycle(druid: druid, milestone_name: 'submitted', version: 3) }
+
+        it 'makes the request with the version' do
+          lifecycle
+          expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle?version=3')
+          expect(Deprecation).not_to have_received(:warn)
+        end
       end
     end
   end
 
   describe '#active_lifecycle' do
-    context 'without version' do
-      subject(:active_lifecycle) { routes.active_lifecycle('dor', 'druid:gv054hp4128', 'submitted') }
+    context 'with positional arguments' do
+      before do
+        allow(Deprecation).to receive(:warn)
+      end
 
-      it 'make the request' do
-        active_lifecycle
-        expect(requestor).to have_received(:request).with('dor/objects/druid:gv054hp4128/lifecycle?active-only=true')
+      context 'without version' do
+        subject(:active_lifecycle) { routes.active_lifecycle(repo, druid, 'submitted') }
+
+        it 'make the request' do
+          active_lifecycle
+          expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle?active-only=true')
+          expect(Deprecation).to have_received(:warn).twice
+        end
+      end
+
+      context 'with version' do
+        subject(:active_lifecycle) { routes.active_lifecycle(repo, druid, 'submitted', version: 3) }
+
+        it 'makes the request with the version' do
+          active_lifecycle
+          expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle?version=3&active-only=true')
+          expect(Deprecation).to have_received(:warn).twice
+        end
       end
     end
 
-    context 'with version' do
-      subject(:active_lifecycle) { routes.active_lifecycle('dor', 'druid:gv054hp4128', 'submitted', version: 3) }
+    context 'with kwargs' do
+      before do
+        allow(Deprecation).to receive(:warn)
+      end
+
+      context 'with deprecated repo arg' do
+        context 'without version' do
+          subject(:active_lifecycle) { routes.active_lifecycle(repo: repo, druid: druid, milestone_name: 'submitted') }
+
+          it 'make the request' do
+            active_lifecycle
+            expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle?active-only=true')
+            expect(Deprecation).to have_received(:warn)
+          end
+        end
+
+        context 'with version' do
+          subject(:active_lifecycle) { routes.active_lifecycle(repo: repo, druid: druid, milestone_name: 'submitted', version: 3) }
+
+          it 'makes the request with the version' do
+            active_lifecycle
+            expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle?version=3&active-only=true')
+            expect(Deprecation).to have_received(:warn)
+          end
+        end
+      end
+
+      context 'without version' do
+        subject(:active_lifecycle) { routes.active_lifecycle(druid: druid, milestone_name: 'submitted') }
+
+        it 'make the request' do
+          active_lifecycle
+          expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle?active-only=true')
+          expect(Deprecation).not_to have_received(:warn)
+        end
+      end
+
+      context 'with version' do
+        subject(:active_lifecycle) { routes.active_lifecycle(druid: druid, milestone_name: 'submitted', version: 3) }
 
-      it 'makes the request with the version' do
-        active_lifecycle
-        expect(requestor).to have_received(:request).with('dor/objects/druid:gv054hp4128/lifecycle?version=3&active-only=true')
+        it 'makes the request with the version' do
+          active_lifecycle
+          expect(requestor).to have_received(:request).with('objects/druid:gv054hp4128/lifecycle?version=3&active-only=true')
+          expect(Deprecation).not_to have_received(:warn)
+        end
       end
     end
   end

data/spec/workflow/client/status_spec.rb

@@ -14,12 +14,6 @@ RSpec.describe Dor::Workflow::Client::Status do
   describe '#display' do
     subject(:status) { instance.display }
 
-    before do
-      # TODO: this stub is too knowledgable about the inner workings of the LifecycleRoutest
-      # instead it should just stub :milestones which returns an array of hashes
-      # expect(lifecycle_routes).to receive(:query_lifecycle).and_return(xml)
-    end
-
     context 'for gv054hp4128' do
       context 'when current version is published, but does not have a version attribute' do
         let(:xml) do
@@ -178,4 +172,23 @@ RSpec.describe Dor::Workflow::Client::Status do
       end
     end
   end
+
+  describe '#display_simplified' do
+    subject(:status) { instance.display_simplified }
+    let(:xml) do
+      '<?xml version="1.0" encoding="UTF-8"?>
+      <lifecycle objectId="druid:gv054hp4128">
+      <milestone date="2012-11-06T16:19:15-0800" version="2">described</milestone>
+      <milestone date="2012-11-06T16:21:02-0800">opened</milestone>
+      <milestone date="2012-11-06T16:30:03-0800">submitted</milestone>
+      <milestone date="2012-11-06T16:35:00-0800">described</milestone>
+      <milestone date="2012-11-06T16:59:39-0800" version="3">published</milestone>
+      <milestone date="2012-11-06T16:59:39-0800">published</milestone>
+      </lifecycle>'
+    end
+
+    it 'generates a status string' do
+      expect(status).to eq('In accessioning')
+    end
+  end
 end

data/spec/workflow/client_spec.rb

@@ -44,7 +44,6 @@ RSpec.describe Dor::Workflow::Client do
   let(:mock_logger) { double('Logger', info: true, debug: true, warn: true) }
 
   before do
-    @repo  = 'dor'
     @druid = 'druid:123'
   end
 
@@ -84,17 +83,17 @@ RSpec.describe Dor::Workflow::Client do
     end
 
     it 'requests the workflow by name and return the URL to the workflow' do
-      client.create_workflow(@repo, @druid, 'etdSubmitWF', wf_xml)
+      client.create_workflow(nil, @druid, 'etdSubmitWF', wf_xml)
       expect(Deprecation).to have_received(:warn).twice
     end
 
     it 'raises on an unexpected Exception' do
-      expect { client.create_workflow(@repo, @druid, 'raiseException', wf_xml) }.to raise_error(Exception, 'broken')
+      expect { client.create_workflow(nil, @druid, 'raiseException', wf_xml) }.to raise_error(Exception, 'broken')
       expect(Deprecation).to have_received(:warn).twice
     end
 
     it 'sets the lane_id param if provided in options hash' do
-      client.create_workflow(@repo, @druid, 'laneIdWF', wf_xml, lane_id: 'foo_lane')
+      client.create_workflow(nil, @druid, 'laneIdWF', wf_xml, lane_id: 'foo_lane')
       expect(Deprecation).to have_received(:warn).twice
     end
   end
@@ -153,16 +152,16 @@ RSpec.describe Dor::Workflow::Client do
   describe '#update_workflow_status' do
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.put("#{@repo}/objects/#{@druid}/workflows/etdSubmitWF/registrar-approval?current-status=queued") do |_env|
+        stub.put("objects/#{@druid}/workflows/etdSubmitWF/registrar-approval?current-status=queued") do |_env|
           [201, {}, '{"next_steps":["submit-marc"]}']
         end
 
-        stub.put("#{@repo}/objects/#{@druid}/workflows/etdSubmitWF/registrar-approval") do |env|
+        stub.put("objects/#{@druid}/workflows/etdSubmitWF/registrar-approval") do |env|
           expect(env.body).to eq "<?xml version=\"1.0\"?>\n<process name=\"registrar-approval\" status=\"completed\" elapsed=\"0\" note=\"annotation\" version=\"2\" laneId=\"lane2\"/>\n"
           [201, {}, '{"next_steps":["submit-marc"]}']
         end
 
-        stub.put("#{@repo}/objects/#{@druid}/workflows/errorWF/registrar-approval") do |_env|
+        stub.put("objects/#{@druid}/workflows/errorWF/registrar-approval") do |_env|
           [400, {}, '']
         end
       end
@@ -172,21 +171,21 @@ RSpec.describe Dor::Workflow::Client do
     end
 
     it 'should update workflow status and return true if successful' do
-      expect(client.update_workflow_status(@repo, @druid, 'etdSubmitWF', 'registrar-approval', 'completed', version: 2, note: 'annotation', lane_id: 'lane2')).to be_kind_of Dor::Workflow::Response::Update
+      expect(client.update_workflow_status(nil, @druid, 'etdSubmitWF', 'registrar-approval', 'completed', version: 2, note: 'annotation', lane_id: 'lane2')).to be_kind_of Dor::Workflow::Response::Update
     end
 
     it 'should return false if the PUT to the DOR workflow service throws an exception' do
-      expect { client.update_workflow_status(@repo, @druid, 'errorWF', 'registrar-approval', 'completed') }.to raise_error(Dor::WorkflowException, /status 400/)
+      expect { client.update_workflow_status(nil, @druid, 'errorWF', 'registrar-approval', 'completed') }.to raise_error(Dor::WorkflowException, /status 400/)
     end
 
     it 'performs a conditional update when current-status is passed as a parameter' do
-      expect(mock_http_connection).to receive(:put).with("#{@repo}/objects/#{@druid}/workflows/etdSubmitWF/registrar-approval?current-status=queued").and_call_original
+      expect(mock_http_connection).to receive(:put).with("/objects/#{@druid}/workflows/etdSubmitWF/registrar-approval?current-status=queued").and_call_original
 
-      expect(client.update_workflow_status(@repo, @druid, 'etdSubmitWF', 'registrar-approval', 'completed', version: 2, note: 'annotation', lane_id: 'lane1', current_status: 'queued')).to be_kind_of Dor::Workflow::Response::Update
+      expect(client.update_workflow_status(nil, @druid, 'etdSubmitWF', 'registrar-approval', 'completed', version: 2, note: 'annotation', lane_id: 'lane1', current_status: 'queued')).to be_kind_of Dor::Workflow::Response::Update
     end
 
     it 'should throw exception if invalid status provided' do
-      expect { client.update_workflow_status(@repo, @druid, 'accessionWF', 'publish', 'NOT_VALID_STATUS') }.to raise_error(ArgumentError)
+      expect { client.update_workflow_status(nil, @druid, 'accessionWF', 'publish', 'NOT_VALID_STATUS') }.to raise_error(ArgumentError)
     end
   end
 
@@ -209,10 +208,10 @@ RSpec.describe Dor::Workflow::Client do
     end
 
     it 'should update workflow status to error and return true if successful' do
-      client.update_workflow_error_status(@repo, @druid, 'etdSubmitWF', 'reader-approval', 'Some exception', error_text: 'The optional stacktrace')
+      client.update_workflow_error_status(nil, @druid, 'etdSubmitWF', 'reader-approval', 'Some exception', error_text: 'The optional stacktrace')
     end
     it 'should return false if the PUT to the DOR workflow service throws an exception' do
-      expect { client.update_workflow_error_status(@repo, @druid, 'errorWF', 'reader-approval', 'completed') }.to raise_error(Dor::WorkflowException, /status 400/)
+      expect { client.update_workflow_error_status(nil, @druid, 'errorWF', 'reader-approval', 'completed') }.to raise_error(Dor::WorkflowException, /status 400/)
     end
   end
 
@@ -255,7 +254,7 @@ RSpec.describe Dor::Workflow::Client do
   end
 
   describe '#workflow_status' do
-    let(:repo) { @repo }
+    let(:repo) { nil }
     let(:druid) { @druid }
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
@@ -401,6 +400,7 @@ RSpec.describe Dor::Workflow::Client do
     context 'with keyword args' do
       subject(:workflow_xml) { client.workflow_xml(druid: 'druid:123', workflow: workflow) }
 
+      # TODO: Remove this `context` block altogether when repos are wiped out for good
       context 'when a repo is provided' do
         subject(:workflow_xml) { client.workflow_xml(repo: 'dor', druid: 'druid:123', workflow: workflow) }
 
@@ -488,7 +488,7 @@ RSpec.describe Dor::Workflow::Client do
   describe '#lifecycle' do
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get('dor/objects/druid:123/lifecycle') do |_env|
+        stub.get('objects/druid:123/lifecycle') do |_env|
           [200, {}, <<-EOXML]
             <lifecycle objectId="druid:ct011cv6501">
                 <milestone date="2010-04-27T11:34:17-0700">registered</milestone>
@@ -498,7 +498,7 @@ RSpec.describe Dor::Workflow::Client do
           EOXML
         end
 
-        stub.get('dor/objects/druid:abc/lifecycle') do |_env|
+        stub.get('objects/druid:abc/lifecycle') do |_env|
           [200, {}, <<-EOXML]
             <lifecycle />
           EOXML
@@ -507,18 +507,18 @@ RSpec.describe Dor::Workflow::Client do
     end
 
     it 'returns a Time object reprenting when the milestone was reached' do
-      expect(client.lifecycle('dor', 'druid:123', 'released').beginning_of_day).to eq(Time.parse('2010-06-15T16:08:58-0700').beginning_of_day)
+      expect(client.lifecycle(druid: 'druid:123', milestone_name: 'released').beginning_of_day).to eq(Time.parse('2010-06-15T16:08:58-0700').beginning_of_day)
     end
 
     it "returns nil if the milestone hasn't been reached yet" do
-      expect(client.lifecycle('dor', 'druid:abc', 'inprocess')).to be_nil
+      expect(client.lifecycle(druid: 'druid:abc', milestone_name: 'inprocess')).to be_nil
     end
   end
 
   describe '#active_lifecycle' do
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get("dor/objects/#{@druid}/lifecycle") do |_env|
+        stub.get("objects/#{@druid}/lifecycle") do |_env|
           [200, {}, <<-EOXML]
             <lifecycle objectId="#{@druid}">
                 <milestone date="2010-04-27T11:34:17-0700">registered</milestone>
@@ -528,7 +528,7 @@ RSpec.describe Dor::Workflow::Client do
           EOXML
         end
 
-        stub.get("dor/objects/#{@druid}/lifecycle") do |_env|
+        stub.get("objects/#{@druid}/lifecycle") do |_env|
           [200, {}, <<-EOXML]
             <lifecycle />
           EOXML
@@ -537,17 +537,16 @@ RSpec.describe Dor::Workflow::Client do
     end
 
     it 'parses out the active lifecycle' do
-      expect(client.active_lifecycle('dor', @druid, 'released').beginning_of_day).to eq(Time.parse('2010-06-15T16:08:58-0700').beginning_of_day)
+      expect(client.active_lifecycle(druid: @druid, milestone_name: 'released').beginning_of_day).to eq(Time.parse('2010-06-15T16:08:58-0700').beginning_of_day)
     end
 
     it 'handles missing lifecycle' do
-      expect(client.active_lifecycle('dor', @druid, 'NOT_FOUND')).to be_nil
+      expect(client.active_lifecycle(druid: @druid, milestone_name: 'NOT_FOUND')).to be_nil
     end
   end
 
   context '#objects_for_workstep' do
     before(:all) do
-      @repository = 'dor'
       @workflow   = 'googleScannedBookWF'
       @completed  = 'google-download'
       @waiting    = 'process-content'
@@ -555,7 +554,7 @@ RSpec.describe Dor::Workflow::Client do
 
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&lane-id=default") do |_env|
+        stub.get("workflow_queue?waiting=#{@workflow}:#{@waiting}&completed=#{@workflow}:#{@completed}&lane-id=default") do |_env|
           [200, {}, '<objects count="1"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>']
         end
       end
@@ -563,7 +562,7 @@ RSpec.describe Dor::Workflow::Client do
 
     describe 'a query with one step completed and one waiting' do
       it 'creates the URI string with only the one completed step' do
-        expect(client.objects_for_workstep(@completed, @waiting, 'default', default_repository: @repository, default_workflow: @workflow)).to eq(['druid:ab123de4567', 'druid:ab123de9012'])
+        expect(client.objects_for_workstep(@completed, @waiting, 'default', default_workflow: @workflow)).to eq(['druid:ab123de4567', 'druid:ab123de9012'])
       end
     end
 
@@ -571,21 +570,21 @@ RSpec.describe Dor::Workflow::Client do
       it 'creates the URI string with the two completed steps correctly' do
         second_completed = 'google-convert'
         xml = %(<objects count="1"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>)
-        allow(mock_http_connection).to receive(:get).with("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&completed=#{@repository}:#{@workflow}:#{second_completed}&lane-id=default").and_return(double(Faraday::Response, body: xml))
-        expect(client.objects_for_workstep([@completed, second_completed], @waiting, 'default', default_repository: @repository, default_workflow: @workflow)).to eq(['druid:ab123de4567', 'druid:ab123de9012'])
+        allow(mock_http_connection).to receive(:get).with("workflow_queue?waiting=#{@workflow}:#{@waiting}&completed=#{@workflow}:#{@completed}&completed=#{@workflow}:#{second_completed}&lane-id=default").and_return(double(Faraday::Response, body: xml))
+        expect(client.objects_for_workstep([@completed, second_completed], @waiting, 'default', default_workflow: @workflow)).to eq(['druid:ab123de4567', 'druid:ab123de9012'])
       end
     end
 
     context 'a query using qualified workflow names for completed and waiting' do
       before :each do
-        @qualified_waiting   = "#{@repository}:#{@workflow}:#{@waiting}"
-        @qualified_completed = "#{@repository}:#{@workflow}:#{@completed}"
+        @qualified_waiting   = "#{@workflow}:#{@waiting}"
+        @qualified_completed = "#{@workflow}:#{@completed}"
       end
 
       RSpec.shared_examples 'lane-aware' do
         it 'creates the URI string with the two completed steps across repositories correctly' do
-          qualified_completed2 = 'sdr:sdrIngestWF:complete-deposit'
-          qualified_completed3 = 'sdr:sdrIngestWF:ingest-transfer'
+          qualified_completed2 = 'sdrIngestWF:complete-deposit'
+          qualified_completed3 = 'sdrIngestWF:ingest-transfer'
           xml = %(<objects count="2"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>)
           allow(mock_http_connection).to receive(:get).with("workflow_queue?waiting=#{@qualified_waiting}&completed=#{@qualified_completed}&completed=#{qualified_completed2}&completed=#{qualified_completed3}&lane-id=#{laneid}").and_return(double(Faraday::Response, body: xml))
           args = [[@qualified_completed, qualified_completed2, qualified_completed3], @qualified_waiting]
@@ -627,7 +626,6 @@ RSpec.describe Dor::Workflow::Client do
 
   context 'get empty workflow queue' do
     before(:all) do
-      @repository = 'dor'
       @workflow   = 'googleScannedBookWF'
       @completed  = 'google-download'
       @waiting    = 'process-content'
@@ -635,27 +633,26 @@ RSpec.describe Dor::Workflow::Client do
 
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&lane-id=default") do |_env|
+        stub.get("workflow_queue?waiting=#{@workflow}:#{@waiting}&completed=#{@workflow}:#{@completed}&lane-id=default") do |_env|
           [200, {}, '<objects count="0"/>']
         end
       end
     end
 
     it 'returns an empty list if it encounters an empty workflow queue' do
-      expect(client.objects_for_workstep(@completed, @waiting, 'default', default_repository: @repository, default_workflow: @workflow)).to eq([])
+      expect(client.objects_for_workstep(@completed, @waiting, 'default', default_workflow: @workflow)).to eq([])
     end
   end
 
   context 'get errored workflow steps' do
     before(:all) do
-      @repository = 'dor'
       @workflow   = 'accessionWF'
       @step       = 'publish'
     end
 
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get("/workflow_queue?error=#{@step}&repository=#{@repository}&workflow=#{@workflow}") do |_env|
+        stub.get("/workflow_queue?error=#{@step}&workflow=#{@workflow}") do |_env|
           [200, {}, <<-EOXML]
             <objects count="1">
                <object id="druid:ab123cd4567" errorMessage="This is an error message"/>
@@ -667,27 +664,26 @@ RSpec.describe Dor::Workflow::Client do
 
     describe 'errored_objects_for_workstep' do
       it 'returns error messages for errored objects' do
-        expect(client.errored_objects_for_workstep(@workflow, @step, @repository)).to eq('druid:ab123cd4567' => 'This is an error message')
+        expect(client.errored_objects_for_workstep(@workflow, @step)).to eq('druid:ab123cd4567' => 'This is an error message')
       end
     end
 
     describe 'count_errored_for_workstep' do
       it 'counts how many steps are errored out' do
-        expect(client.count_errored_for_workstep(@workflow, @step, @repository)).to eq(1)
+        expect(client.count_errored_for_workstep(@workflow, @step)).to eq(1)
       end
     end
   end
 
   describe '#count_queued_for_workstep' do
     before(:all) do
-      @repository = 'dor'
       @workflow   = 'accessionWF'
       @step       = 'publish'
     end
 
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get("/workflow_queue?queued=#{@step}&repository=#{@repository}&workflow=#{@workflow}") do |_env|
+        stub.get("/workflow_queue?queued=#{@step}&workflow=#{@workflow}") do |_env|
           [200, {}, <<-EOXML]
             <objects count="1">
                <object id="druid:ab123cd4567"/>
@@ -698,7 +694,7 @@ RSpec.describe Dor::Workflow::Client do
     end
 
     it 'counts how many steps are errored out' do
-      expect(client.count_queued_for_workstep(@workflow, @step, @repository)).to eq(1)
+      expect(client.count_queued_for_workstep(@workflow, @step)).to eq(1)
     end
   end
 
@@ -707,12 +703,11 @@ RSpec.describe Dor::Workflow::Client do
       @workflow   = 'sdrIngestWF'
       @step       = 'start-ingest'
       @type       = 'waiting'
-      @repository = 'sdr'
     end
 
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get("/workflow_queue?repository=#{@repository}&workflow=#{@workflow}&#{@type}=#{@step}") do |_env|
+        stub.get("/workflow_queue?workflow=#{@workflow}&#{@type}=#{@step}") do |_env|
           [200, {}, <<-EOXML]
             <objects count="1">
               <object id="druid:oo000ra0001" url="null/fedora/objects/druid:oo000ra0001"/>
@@ -723,29 +718,45 @@ RSpec.describe Dor::Workflow::Client do
     end
 
     it 'counts how many objects are at the type of step' do
-      expect(client.count_objects_in_step(@workflow, @step, @type, @repository)).to eq(1)
+      expect(client.count_objects_in_step(@workflow, @step, @type)).to eq(1)
     end
   end
 
   describe '#delete_workflow' do
-    let(:url) { "#{@repo}/objects/#{@druid}/workflows/accessionWF" }
-
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
         stub.delete(url) { |_env| [202, {}, ''] }
       end
     end
 
-    it 'sends a delete request to the workflow service' do
-      expect(mock_http_connection).to receive(:delete).with(url).and_call_original
-      client.delete_workflow(@repo, @druid, 'accessionWF')
+    context 'without a version' do
+      let(:url) { "/objects/#{@druid}/workflows/accessionWF" }
+
+      it 'sends a delete request to the workflow service' do
+        expect(Deprecation).to receive(:warn)
+        expect(mock_http_connection).to receive(:delete).with(url).and_call_original
+        client.delete_workflow(nil, @druid, 'accessionWF')
+      end
+    end
+
+    context 'with a version' do
+      let(:url) { "/objects/#{@druid}/workflows/accessionWF?version=5" }
+
+      it 'sends a delete request to the workflow service' do
+        expect(mock_http_connection).to receive(:delete).with(url).and_call_original
+        client.delete_workflow(nil, @druid, 'accessionWF', version: 5)
+      end
     end
   end
 
   describe '.stale_queued_workflows' do
+    before do
+      allow(Deprecation).to receive(:warn)
+    end
+
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get('workflow_queue/all_queued?repository=dor&hours-ago=24&limit=100') do |_env|
+        stub.get('workflow_queue/all_queued?hours-ago=24&limit=100') do |_env|
           [200, {}, <<-XML]
           <workflows>
               <workflow laneId="lane1" note="annotation" lifecycle="in-process" errorText="stacktrace" errorMessage="NullPointerException" elapsed="1.173" repository="dor" attempts="0" datetime="2008-11-15T13:30:00-0800" status="waiting" process="content-metadata" name="accessionWF" druid="dr:123"/>
@@ -758,6 +769,7 @@ RSpec.describe Dor::Workflow::Client do
 
     it 'returns an Array of Hashes containing each workflow step' do
       ah = client.stale_queued_workflows 'dor', hours_ago: 24, limit: 100
+      expect(Deprecation).to have_received(:warn).once
       expected = [
         { workflow: 'accessionWF', step: 'content-metadata', druid: 'dr:123', lane_id: 'lane1' },
         { workflow: 'assemblyWF',  step: 'jp2-create',       druid: 'dr:456', lane_id: 'lane2' }
@@ -767,9 +779,13 @@ RSpec.describe Dor::Workflow::Client do
   end
 
   describe '.count_stale_queued_workflows' do
+    before do
+      allow(Deprecation).to receive(:warn)
+    end
+
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get('workflow_queue/all_queued?repository=dor&hours-ago=48&count-only=true') do |_env|
+        stub.get('workflow_queue/all_queued?hours-ago=48&count-only=true') do |_env|
           [200, {}, '<objects count="10"/>']
         end
       end
@@ -777,10 +793,15 @@ RSpec.describe Dor::Workflow::Client do
 
     it 'returns the number of queued workflow steps' do
       expect(client.count_stale_queued_workflows('dor', hours_ago: 48)).to eq(10)
+      expect(Deprecation).to have_received(:warn).once
     end
   end
 
   describe '.lane_ids' do
+    before do
+      allow(Deprecation).to receive(:warn)
+    end
+
     let(:stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
         stub.get('workflow_queue/lane_ids?lane_ids?step=dor:accessionWF:shelve') do |_env|
@@ -796,6 +817,7 @@ RSpec.describe Dor::Workflow::Client do
 
     it 'returns the lane ids for a given workflow step' do
       expect(client.lane_ids('dor', 'accessionWF', 'shelve')).to eq(%w[lane1 lane2])
+      expect(Deprecation).to have_received(:warn).once
     end
   end
 end