Merge branch '1656-fix-admin-user-email-recipient-select-list' into 'master'

Fix admin email notification recipient group select list

Closes #1656

See merge request !1277

app/assets/javascripts/admin_email_select.js

@@ -25,7 +25,7 @@
                 all = {
                   id: "all"
                 };
-                data = $.merge([all], groups[0], projects[0]);
+                data = [all].concat(groups[0], projects[0]);
                 return query.callback({
                   results: data
                 });

changelogs/unreleased-ee/1656-fix-admin-user-email-recipient-select-list.yml

+---
+title: Fix admin email notification recipient group select list
+merge_request:
+author:

spec/features/admin/admin_emails_spec.rb

+require 'spec_helper'
+
+describe "Admin::Emails", feature: true, js: true do
+  include WaitForAjax
+
+  let!(:current_user) { login_as :admin }
+  let!(:group) { create(:group) }
+  let!(:project) { create(:project, namespace: group) }
+
+  describe "GET /admin/email" do
+    before do
+      visit admin_email_path
+    end
+
+    describe 'Recipient group select' do
+      it "includes groups and projects" do
+        find('.ajax-admin-email-select').click
+        wait_for_ajax
+
+        expect(page).to have_selector('.ajax-admin-email-dropdown li', count: 3)
+        group_names = page.all('.ajax-admin-email-dropdown li .group-name')
+        expect(group_names[0].text).to eq('All')
+        expect(group_names[1].text).to eq(group.name)
+        expect(find('.ajax-admin-email-dropdown li .project-name').text).to eq(project.name)
+      end
+    end
+  end
+end