Merge pull request #5933 from hstastna/Error_changing_Role_adding_Group

Disable <Choose a Role> option to prevent error while adding Group

(cherry picked from commit 8538572)

https://bugzilla.redhat.com/show_bug.cgi?id=1730402

app/views/ops/_rbac_group_details.html.haml

@@ -69,9 +69,11 @@
             %i.ff.ff-user-role{params}
             = link_to(@group.miq_user_role.name, "#", params)
         - else
+          - disabled_item = ["<Choose a Role>", nil]
+          - selected_item = @edit[:new][:role] || disabled_item
           = select_tag('group_role',
-              options_for_select(@edit[:roles].sort, @edit[:new][:role]),
-              :class  => "selectpicker")
+                       options_for_select(@edit[:roles], :selected => selected_item, :disabled => disabled_item),
+                       :class => "selectpicker")
           :javascript
             miqInitSelectPicker();
             miqSelectPickerEvent("group_role", "#{combo_url}")

spec/views/ops/_rbac_group_details.html.haml_spec.rb

@@ -82,5 +82,14 @@
       expect(rendered).not_to have_selector('input#lookup')
       expect(rendered).not_to include('Look up External Authentication Groups')
     end
+
+    context 'choosing Role from the drop down while adding Group' do
+      before { view.instance_variable_set(:@edit, :ldap_groups_by_user => [], :new => {}, :roles => {'<Choose a Role>' => nil}, :projects_tenants => []) }
+
+      it 'disables Choose a Role option' do
+        render :partial => 'ops/rbac_group_details'
+        expect(rendered).to include('<option selected="selected" disabled="disabled" value="">&lt;Choose a Role&gt;</option>')
+      end
+    end
   end
 end