Pass selected workflow from AS controller to ASCreateService

* Allow AS controller to pass workflow_name param to service (thanks, @hortongn!) * Default ASCreateService to the default workflow if `nil` is passed Fixes #3161
samvera-deprecated · Apr 25, 2017 · 4ca3598 · 4ca3598
1 parent 6bd3530
commit 4ca3598
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/sufia/admin/admin_sets_controller.rb b/app/controllers/sufia/admin/admin_sets_controller.rb
@@ -95,7 +95,7 @@ def list_search_builder
       end
 
       def create_admin_set
-        AdminSetCreateService.new(@admin_set, current_user).create
+        AdminSetCreateService.new(@admin_set, current_user, params[:admin_set][:workflow_name]).create
       end
 
       def setup_form

diff --git a/app/services/sufia/admin_set_create_service.rb b/app/services/sufia/admin_set_create_service.rb
@@ -19,7 +19,7 @@ def self.create_default!
     def initialize(admin_set, creating_user, workflow_name)
       @admin_set = admin_set
       @creating_user = creating_user
-      @workflow_name = workflow_name
+      @workflow_name = workflow_name || AdminSet::DEFAULT_WORKFLOW_NAME
     end
 
     attr_reader :creating_user, :admin_set, :workflow_name

diff --git a/spec/controllers/sufia/admin/admin_sets_controller_spec.rb b/spec/controllers/sufia/admin/admin_sets_controller_spec.rb
@@ -58,7 +58,7 @@
       let(:service) { instance_double(Sufia::AdminSetCreateService) }
       before do
         allow(Sufia::AdminSetCreateService).to receive(:new)
-          .with(AdminSet, user)
+          .with(an_instance_of(AdminSet), user, nil)
           .and_return(service)
       end