Merge branch 'master' into 1827-prevent-concurrent-editing-wiki

 Conflicts:
	app/controllers/projects/wikis_controller.rb
	app/views/projects/wikis/edit.html.haml
	spec/features/projects/wiki/user_updates_wiki_page_spec.rb

1 files changed, 33 insertions, 0 deletions

diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index 84db26a958a..ddf38967dd7 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -22,4 +22,37 @@ describe Admin::GroupsController do
       expect(response).to redirect_to(admin_groups_path)
     end
   end
+
+  describe 'PUT #members_update' do
+    let(:group_user) { create(:user) }
+
+    it 'adds user to members' do
+      put :members_update, id: group,
+                           user_ids: group_user.id,
+                           access_level: Gitlab::Access::GUEST
+
+      expect(response).to set_flash.to 'Users were successfully added.'
+      expect(response).to redirect_to(admin_group_path(group))
+      expect(group.users).to include group_user
+    end
+
+    it 'can add unlimited members' do
+      put :members_update, id: group,
+                           user_ids: 1.upto(1000).to_a.join(','),
+                           access_level: Gitlab::Access::GUEST
+
+      expect(response).to set_flash.to 'Users were successfully added.'
+      expect(response).to redirect_to(admin_group_path(group))
+    end
+
+    it 'adds no user to members' do
+      put :members_update, id: group,
+                           user_ids: '',
+                           access_level: Gitlab::Access::GUEST
+
+      expect(response).to set_flash.to 'No users specified.'
+      expect(response).to redirect_to(admin_group_path(group))
+      expect(group.users).not_to include group_user
+    end
+  end
 end