Sort roles/groups (numerically by id) with space separator

Author: jrafanie

app/helpers/report_helper.rb

@@ -30,7 +30,7 @@ def visibility_options(widget)
     if values.first == "_ALL_"
       _("To All Users")
     else
-      display_values = widget.visibility_values.join(',')
+      display_values = widget.visibility_values.sort.join(', ')
       _("By %{typ}: %{values}") % {:typ => typ.to_s.titleize, :values => display_values}
     end
   end

spec/helpers/report_helper_spec.rb

@@ -75,22 +75,36 @@ def create_and_generate_report_for_user(report_name, user)
       expect(helper.visibility_options(widget)).to eq('To All Users')
     end
 
-    it 'converts role IDs to role names for display' do
+    it 'converts role IDs to role names and sorts alphabetically by name' do
       widget = FactoryBot.create(:miq_widget, :visibility => {:roles => [role1.id, role2.id]})
       result = helper.visibility_options(widget)
-      expect(result).to include('EvmRole-auditor')
-      expect(result).to include('EvmRole-desktop')
-      expect(result).to include('By Roles:')
+      expect(result).to eq('By Roles: EvmRole-auditor, EvmRole-desktop')
     end
 
-    it 'converts group IDs to group descriptions for display' do
+    it 'sorts role names alphabetically regardless of ID order' do
+      role3 = FactoryBot.create(:miq_user_role, :name => 'EvmRole-zebra')
+      role4 = FactoryBot.create(:miq_user_role, :name => 'EvmRole-alpha')
+      widget = FactoryBot.create(:miq_widget, :visibility => {:roles => [role3.id, role4.id]})
+      result = helper.visibility_options(widget)
+      # IDs are in order [zebra, alpha] but output should be alphabetically sorted
+      expect(result).to eq('By Roles: EvmRole-alpha, EvmRole-zebra')
+    end
+
+    it 'converts group IDs to group descriptions and sorts alphabetically by description' do
       group1 = FactoryBot.create(:miq_group, :description => 'Group1')
       group2 = FactoryBot.create(:miq_group, :description => 'Group2')
       widget = FactoryBot.create(:miq_widget, :visibility => {:groups => [group1.id, group2.id]})
       result = helper.visibility_options(widget)
-      expect(result).to include('Group1')
-      expect(result).to include('Group2')
-      expect(result).to include('By Groups:')
+      expect(result).to eq('By Groups: Group1, Group2')
+    end
+
+    it 'sorts group descriptions alphabetically regardless of ID order' do
+      group3 = FactoryBot.create(:miq_group, :description => 'Zebra Group')
+      group4 = FactoryBot.create(:miq_group, :description => 'Alpha Group')
+      widget = FactoryBot.create(:miq_widget, :visibility => {:groups => [group3.id, group4.id]})
+      result = helper.visibility_options(widget)
+      # IDs are in order [Zebra, Alpha] but output should be alphabetically sorted
+      expect(result).to eq('By Groups: Alpha Group, Zebra Group')
     end
   end
 end