Add customizable user roles (#18641)
* Add customizable user roles * Various fixes and improvements * Add migration for old settings and fix tootctl role management
This commit is contained in:
		@@ -5,7 +5,7 @@ require 'pundit/rspec'
 | 
			
		||||
 | 
			
		||||
RSpec.describe UserPolicy do
 | 
			
		||||
  let(:subject) { described_class }
 | 
			
		||||
  let(:admin)   { Fabricate(:user, admin: true).account }
 | 
			
		||||
  let(:admin)   { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
 | 
			
		||||
  let(:john)    { Fabricate(:account) }
 | 
			
		||||
 | 
			
		||||
  permissions :reset_password?, :change_email? do
 | 
			
		||||
@@ -111,57 +111,4 @@ RSpec.describe UserPolicy do
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  permissions :promote? do
 | 
			
		||||
    context 'admin?' do
 | 
			
		||||
      context 'promotable?' do
 | 
			
		||||
        it 'permits' do
 | 
			
		||||
          expect(subject).to permit(admin, john.user)
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      context '!promotable?' do
 | 
			
		||||
        it 'denies' do
 | 
			
		||||
          expect(subject).to_not permit(admin, admin.user)
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context '!admin?' do
 | 
			
		||||
      it 'denies' do
 | 
			
		||||
        expect(subject).to_not permit(john, User)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  permissions :demote? do
 | 
			
		||||
    context 'admin?' do
 | 
			
		||||
      context '!record.admin?' do
 | 
			
		||||
        context 'demoteable?' do
 | 
			
		||||
          it 'permits' do
 | 
			
		||||
            john.user.update(moderator: true)
 | 
			
		||||
            expect(subject).to permit(admin, john.user)
 | 
			
		||||
          end
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
        context '!demoteable?' do
 | 
			
		||||
          it 'denies' do
 | 
			
		||||
            expect(subject).to_not permit(admin, john.user)
 | 
			
		||||
          end
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      context 'record.admin?' do
 | 
			
		||||
        it 'denies' do
 | 
			
		||||
          expect(subject).to_not permit(admin, admin.user)
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    context '!admin?' do
 | 
			
		||||
      it 'denies' do
 | 
			
		||||
        expect(subject).to_not permit(john, User)
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user