Address some Rubocop issues

https://bugzilla.redhat.com/show_bug.cgi?id=1240742
ManageIQ · Jul 23, 2015 · 082300e · 082300e
1 parent 7a29724
commit 082300e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/app/models/miq_request_workflow.rb b/app/models/miq_request_workflow.rb
@@ -239,18 +239,22 @@ def get_buttons
   end
 
   def provisioning_tab_list
-    dialog_names = @dialogs[:dialog_order].map { |dialog| dialog.to_s }
-    dialog_descriptions = dialog_names.map { |dialog_name| @dialogs.fetch_path(:dialogs, dialog_name.to_sym, :description) }
-    dialog_display = dialog_names.map { |dialog_name| @dialogs.fetch_path(:dialogs, dialog_name.to_sym, :display) }
+    dialog_names = @dialogs[:dialog_order].collect(&:to_s)
+    dialog_descriptions = dialog_names.collect do |dialog_name|
+      @dialogs.fetch_path(:dialogs, dialog_name.to_sym, :description)
+    end
+    dialog_display = dialog_names.collect do |dialog_name|
+      @dialogs.fetch_path(:dialogs, dialog_name.to_sym, :display)
+    end
 
     tab_list = []
     dialog_names.each_with_index do |dialog_name, index|
-      unless dialog_display[index] == :hide || dialog_display[index] == :ignore
-        tab_list << {
-          :name => dialog_name,
-          :description => dialog_descriptions[index]
-        }
-      end
+      next if dialog_display[index] == :hide || dialog_display[index] == :ignore
+
+      tab_list << {
+        :name        => dialog_name,
+        :description => dialog_descriptions[index]
+      }
     end
 
     tab_list

diff --git a/app/views/miq_request/_prov_wf.html.haml b/app/views/miq_request/_prov_wf.html.haml
@@ -18,12 +18,14 @@
             - if dialog_name == current_tab
               - dialog = wf.get_dialog(dialog_name)
               - unless dialog.blank? || dialog[:display] == :ignore
+                - partial_locals = {:wf => wf, :dialog => dialog_name}
+
                 - if wf.kind_of?(MiqProvisionWorkflow)
-                  = render :partial => "/shared/views/prov_dialog", :locals => {:wf => wf, :dialog => dialog_name}
+                  = render :partial => "/shared/views/prov_dialog", :locals => partial_locals
                 - elsif wf.kind_of?(VmMigrateWorkflow)
-                  = render :partial => "/miq_request/prov_vm_migrate_dialog", :locals => {:wf => wf, :dialog => dialog_name}
+                  = render :partial => "/miq_request/prov_vm_migrate_dialog", :locals => partial_locals
                 - else
-                  = render :partial => "/miq_request/prov_host_dialog", :locals => {:wf => wf, :dialog => dialog_name}
+                  = render :partial => "/miq_request/prov_host_dialog", :locals => partial_locals
 
 :javascript
   miq_tabs_init('#prov_tabs', '/miq_request/prov_field_changed');

diff --git a/spec/models/miq_request_workflow_spec.rb b/spec/models/miq_request_workflow_spec.rb
@@ -114,7 +114,7 @@
         before do
           dialogs[:dialogs].keys.each do |dialog_name|
             workflow.get_all_fields(dialog_name).each_pair do |_, field_values|
-              field_values[:values] = [["test", "100"], ["test2", "0"]]
+              field_values[:values] = [%w(test 100), %w(test2 0)]
             end
           end
         end