From 9559165e058a62d1825a2150df08be182457e9ec Mon Sep 17 00:00:00 2001 From: Roman Blanco Date: Tue, 13 Mar 2018 12:08:29 +0100 Subject: [PATCH 1/3] Generalized case statement so it responds to the method change in the core --- .../application_controller/ci_processing.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/application_controller/ci_processing.rb b/app/controllers/application_controller/ci_processing.rb index 5422dead4d5..f71b74a6f2e 100644 --- a/app/controllers/application_controller/ci_processing.rb +++ b/app/controllers/application_controller/ci_processing.rb @@ -348,14 +348,8 @@ def check_supports_task(items, klass, task, display_name) def cloud_object_store_button_operation(klass, task) display_name = _(task.capitalize) - - # Map task to instance method name - case task - when 'delete' - method = "#{task}_#{klass.name.underscore.to_sym}" - else - method = task = "#{klass.name.underscore.to_sym}_#{task}" - end + method = "#{klass.name.underscore.to_sym}_#{task}" + task = method unless task == 'delete' items = [] # Either a list or coming from a different controller From a3e050fc7481f7cb05e04e618b74749c24b93379 Mon Sep 17 00:00:00 2001 From: Roman Blanco Date: Tue, 13 Mar 2018 12:31:49 +0100 Subject: [PATCH 2/3] Correct renamed method in specs --- .../application_controller/ci_processing_spec.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/controllers/application_controller/ci_processing_spec.rb b/spec/controllers/application_controller/ci_processing_spec.rb index 3e677ff3a8d..8e3fa67234f 100644 --- a/spec/controllers/application_controller/ci_processing_spec.rb +++ b/spec/controllers/application_controller/ci_processing_spec.rb @@ -212,7 +212,7 @@ controller.params[:miq_grid_checks] = "#{object1.id}, #{object2.id}" expect(controller).to receive(:process_objects).with( [object1.id, object2.id], - "delete_cloud_object_store_object", + "cloud_object_store_object_delete", "Delete" ) controller.send(:cloud_object_store_button_operation, CloudObjectStoreObject, "delete") @@ -222,17 +222,17 @@ controller.params[:miq_grid_checks] = "#{object1.id}, #{object2.id}" expect(CloudObjectStoreObject).to receive(:process_tasks).with( :ids => [object1.id, object2.id], - :task => "delete_cloud_object_store_object", + :task => "cloud_object_store_object_delete", :userid => anything ) - controller.send(:process_objects, [object1.id, object2.id], "delete_cloud_object_store_object", "delete") + controller.send(:process_objects, [object1.id, object2.id], "cloud_object_store_object_delete", "delete") end it "invokes process_tasks overall (when selected)" do controller.params[:miq_grid_checks] = "#{object1.id}, #{object2.id}" expect(CloudObjectStoreObject).to receive(:process_tasks).with( :ids => [object1.id, object2.id], - :task => "delete_cloud_object_store_object", + :task => "cloud_object_store_object_delete", :userid => anything ) controller.send(:process_cloud_object_storage_buttons, "cloud_object_store_object_delete") @@ -289,7 +289,7 @@ controller.params[:id] = object.id.to_s expect(controller).to receive(:process_objects).with( [object.id.to_s], - "delete_cloud_object_store_object", + "cloud_object_store_object_delete", "Delete" ) controller.send(:cloud_object_store_button_operation, CloudObjectStoreObject, "delete") @@ -299,17 +299,17 @@ controller.params[:id] = object.id.to_s expect(CloudObjectStoreObject).to receive(:process_tasks).with( :ids => [object.id.to_s], - :task => "delete_cloud_object_store_object", + :task => "cloud_object_store_object_delete", :userid => anything ) - controller.send(:process_objects, [object.id.to_s], "delete_cloud_object_store_object", "delete") + controller.send(:process_objects, [object.id.to_s], "cloud_object_store_object_delete", "delete") end it "invokes process_tasks overall" do controller.params[:id] = object.id.to_s expect(CloudObjectStoreObject).to receive(:process_tasks).with( :ids => [object.id.to_s], - :task => "delete_cloud_object_store_object", + :task => "cloud_object_store_object_delete", :userid => anything ) controller.send(:process_cloud_object_storage_buttons, "cloud_object_store_object_delete") From 5934489009e1e129e2d99a525c2f99e4e95b7024 Mon Sep 17 00:00:00 2001 From: Roman Blanco Date: Wed, 9 May 2018 18:30:32 +0200 Subject: [PATCH 3/3] Corrected method name for containers --- .../application_controller/ci_processing_spec.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/controllers/application_controller/ci_processing_spec.rb b/spec/controllers/application_controller/ci_processing_spec.rb index 8e3fa67234f..02c589b4bac 100644 --- a/spec/controllers/application_controller/ci_processing_spec.rb +++ b/spec/controllers/application_controller/ci_processing_spec.rb @@ -55,7 +55,7 @@ controller.params[:miq_grid_checks] = "#{container1.id}, #{container2.id}" expect(controller).to receive(:process_objects).with( [container1.id, container2.id], - 'delete_cloud_object_store_container', + 'cloud_object_store_container_delete', 'Delete' ) controller.send(:cloud_object_store_button_operation, CloudObjectStoreContainer, 'delete') @@ -64,10 +64,10 @@ it "invokes process_tasks on container class" do expect(CloudObjectStoreContainer).to receive(:process_tasks).with( :ids => [container1.id, container2.id], - :task => 'delete_cloud_object_store_container', + :task => 'cloud_object_store_container_delete', :userid => anything ) - controller.send(:process_objects, [container1.id, container2.id], 'delete_cloud_object_store_container', + controller.send(:process_objects, [container1.id, container2.id], 'cloud_object_store_container_delete', 'delete') end @@ -75,7 +75,7 @@ controller.params[:miq_grid_checks] = "#{container1.id}, #{container2.id}" expect(CloudObjectStoreContainer).to receive(:process_tasks).with( :ids => [container1.id, container2.id], - :task => 'delete_cloud_object_store_container', + :task => 'cloud_object_store_container_delete', :userid => anything ) controller.send(:process_cloud_object_storage_buttons, "cloud_object_store_container_delete") @@ -132,7 +132,7 @@ controller.params[:id] = container.id expect(controller).to receive(:process_objects).with( [container.id], - 'delete_cloud_object_store_container', + 'cloud_object_store_container_delete', 'Delete' ) controller.send(:cloud_object_store_button_operation, CloudObjectStoreContainer, 'delete') @@ -141,17 +141,17 @@ it "invokes process_tasks on container class" do expect(CloudObjectStoreContainer).to receive(:process_tasks).with( :ids => [container.id], - :task => 'delete_cloud_object_store_container', + :task => 'cloud_object_store_container_delete', :userid => anything ) - controller.send(:process_objects, [container.id], 'delete_cloud_object_store_container', 'delete') + controller.send(:process_objects, [container.id], 'cloud_object_store_container_delete', 'delete') end it "invokes process_tasks overall" do controller.params[:id] = container.id expect(CloudObjectStoreContainer).to receive(:process_tasks).with( :ids => [container.id], - :task => 'delete_cloud_object_store_container', + :task => 'cloud_object_store_container_delete', :userid => anything ) controller.send(:process_cloud_object_storage_buttons, "cloud_object_store_container_delete")