Remove admin group management pages.

spec/controllers/admin/groups_controller_spec.rb

@@ -1,128 +0,0 @@
-require 'rails_helper'
-
-describe Admin::GroupsController do
-  let(:user) { Fabricate(:user) }
-  let(:group) { Fabricate(:group) }
-
-  before do
-    @admin = log_in(:admin)
-  end
-
-  it "is a subclass of AdminController" do
-    expect(Admin::GroupsController < Admin::AdminController).to eq(true)
-  end
-
-  context ".bulk" do
-    it "can assign users to a group by email or username" do
-      group = Fabricate(:group, name: "test", primary_group: true, title: 'WAT', grant_trust_level: 3)
-      user = Fabricate(:user, trust_level: 2)
-      user2 = Fabricate(:user, trust_level: 4)
-
-      put :bulk_perform, params: {
-        group_id: group.id, users: [user.username.upcase, user2.email, 'doesnt_exist']
-      }, format: :json
-
-      expect(response).to be_success
-
-      user.reload
-      expect(user.primary_group).to eq(group)
-      expect(user.title).to eq("WAT")
-      expect(user.trust_level).to eq(3)
-
-      user2.reload
-      expect(user2.primary_group).to eq(group)
-      expect(user2.title).to eq("WAT")
-      expect(user2.trust_level).to eq(4)
-
-      # verify JSON response
-      json = ::JSON.parse(response.body)
-      expect(json['message']).to eq("2 users have been added to the group.")
-      expect(json['users_not_added'][0]).to eq("doesnt_exist")
-    end
-  end
-
-  context "#update" do
-    it 'should update a group' do
-      group.add_owner(user)
-
-      expect do
-        put :update, params: {
-          id: group.id,
-          group: {
-            visibility_level: Group.visibility_levels[:owners],
-            allow_membership_requests: "true"
-          }
-        }, format: :json
-
-      end.to change { GroupHistory.count }.by(2)
-
-      expect(response).to be_success
-
-      group.reload
-
-      expect(group.visibility_level).to eq(Group.visibility_levels[:owners])
-      expect(group.allow_membership_requests).to eq(true)
-    end
-
-    it "ignore name change on automatic group" do
-      put :update, params: { id: 1, group: { name: "WAT" } }, format: :json
-      expect(response).to be_success
-
-      group = Group.find(1)
-      expect(group.name).not_to eq("WAT")
-    end
-
-    it "doesn't launch the 'automatic group membership' job when it's not retroactive" do
-      Jobs.expects(:enqueue).never
-      group = Fabricate(:group)
-
-      put :update, params: {
-        id: group.id, group: { automatic_membership_retroactive: "false" }
-      }, format: :json
-
-      expect(response).to be_success
-    end
-
-    it "launches the 'automatic group membership' job when it's retroactive" do
-      group = Fabricate(:group)
-      Jobs.expects(:enqueue).with(:automatic_group_membership, group_id: group.id)
-
-      put :update, params: {
-        id: group.id, group: { automatic_membership_retroactive: "true" }
-      }, format: :json
-
-      expect(response).to be_success
-    end
-
-  end
-
-  context ".destroy" do
-
-    it "returns a 422 if the group is automatic" do
-      group = Fabricate(:group, automatic: true)
-      delete :destroy, params: { id: group.id }, format: :json
-      expect(response.status).to eq(422)
-      expect(Group.where(id: group.id).count).to eq(1)
-    end
-
-    it "is able to destroy a non-automatic group" do
-      group = Fabricate(:group)
-      delete :destroy, params: { id: group.id }, format: :json
-      expect(response.status).to eq(200)
-      expect(Group.where(id: group.id).count).to eq(0)
-    end
-
-  end
-
-  context ".refresh_automatic_groups" do
-
-    it "is able to refresh automatic groups" do
-      Group.expects(:refresh_automatic_groups!).returns(true)
-
-      post :refresh_automatic_groups, format: :json
-      expect(response.status).to eq(200)
-    end
-
-  end
-
-end

spec/models/group_spec.rb

@@ -6,6 +6,21 @@ describe Group do
   let(:group) { Fabricate(:group) }
 
   context 'validations' do
+    describe '#grant_trust_level' do
+      describe 'when trust level is not valid' do
+        it 'should not be valid' do
+          group.grant_trust_level = 123456
+
+          expect(group.valid?).to eq(false)
+
+          expect(group.errors.full_messages.join(",")).to eq(I18n.t(
+            'groups.errors.grant_trust_level_not_valid',
+            trust_level: 123456
+          ))
+        end
+      end
+    end
+
     describe '#username' do
       context 'when a user with a similar name exists' do
         it 'should not be valid' do

spec/requests/admin/groups_controller_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Admin::GroupsController do
         }
       }
 
-      expect(response).to be_success
+      expect(response.status).to eq(200)
 
       group = Group.last
 
@@ -50,4 +50,68 @@ RSpec.describe Admin::GroupsController do
         .to contain_exactly(user, admin)
     end
   end
+
+  describe "#bulk_perform" do
+    let(:group) do
+      Fabricate(:group,
+        name: "test",
+        primary_group: true,
+        title: 'WAT',
+        grant_trust_level: 3
+      )
+    end
+
+    let(:user) { Fabricate(:user, trust_level: 2) }
+    let(:user2) { Fabricate(:user, trust_level: 4) }
+
+    it "can assign users to a group by email or username" do
+      put "/admin/groups/bulk.json", params: {
+        group_id: group.id, users: [user.username.upcase, user2.email, 'doesnt_exist']
+      }
+
+      expect(response.status).to eq(200)
+
+      user.reload
+      expect(user.primary_group).to eq(group)
+      expect(user.title).to eq("WAT")
+      expect(user.trust_level).to eq(3)
+
+      user2.reload
+      expect(user2.primary_group).to eq(group)
+      expect(user2.title).to eq("WAT")
+      expect(user2.trust_level).to eq(4)
+
+      json = ::JSON.parse(response.body)
+      expect(json['message']).to eq("2 users have been added to the group.")
+      expect(json['users_not_added'][0]).to eq("doesnt_exist")
+    end
+  end
+
+  context "#destroy" do
+    it 'should return the right response for an invalid group_id' do
+      delete "/admin/groups/123.json"
+
+      expect(response.status).to eq(404)
+    end
+
+    describe 'when group is automatic' do
+      it "returns the right response" do
+        group.update!(automatic: true)
+
+        delete "/admin/groups/#{group.id}.json"
+
+        expect(response.status).to eq(422)
+        expect(Group.find(group.id)).to eq(group)
+      end
+    end
+
+    describe 'for a non automatic group' do
+      it "returns the right response" do
+        delete "/admin/groups/#{group.id}.json"
+
+        expect(response.status).to eq(200)
+        expect(Group.find_by(id: group.id)).to eq(nil)
+      end
+    end
+  end
 end

spec/requests/groups_controller_spec.rb

@@ -473,6 +473,7 @@ describe GroupsController do
       before do
         user.update_attributes!(admin: true)
         sign_in(user)
+        SiteSetting.queue_jobs = true
       end
 
       it 'should be able to update the group' do
@@ -506,6 +507,9 @@ describe GroupsController do
         expect(group.automatic_membership_email_domains).to eq('test.org')
         expect(group.automatic_membership_retroactive).to eq(true)
         expect(group.grant_trust_level).to eq(2)
+
+        expect(Jobs::AutomaticGroupMembership.jobs.first["args"].first["group_id"])
+          .to eq(group.id)
       end
 
       it "should be able to update an automatic group" do