diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-12-18 13:17:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-18 13:17:37 +0100 |
commit | 3b9a6049adf3ee6844a81622c297dd893836f79d (patch) | |
tree | faf39c54064077baa984998a589803ecb7ecf230 /spec/policies | |
parent | fec4ed507466617ef34304b7d00d0383e8a958bb (diff) | |
parent | e061ea5f71109edbbf7869265f443448cace4f60 (diff) |
Merge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/policies')
-rw-r--r-- | spec/policies/account_policy_spec.rb | 2 | ||||
-rw-r--r-- | spec/policies/instance_policy_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/policies/account_policy_spec.rb b/spec/policies/account_policy_spec.rb index 1347ca4a0..8a5e62c06 100644 --- a/spec/policies/account_policy_spec.rb +++ b/spec/policies/account_policy_spec.rb @@ -37,7 +37,7 @@ RSpec.describe AccountPolicy do end end - permissions :unsuspend? do + permissions :unsuspend?, :unblock_email? do before do alice.suspend! end diff --git a/spec/policies/instance_policy_spec.rb b/spec/policies/instance_policy_spec.rb index 77a3bde3f..72cf25f56 100644 --- a/spec/policies/instance_policy_spec.rb +++ b/spec/policies/instance_policy_spec.rb @@ -8,7 +8,7 @@ RSpec.describe InstancePolicy do let(:admin) { Fabricate(:user, admin: true).account } let(:john) { Fabricate(:user).account } - permissions :index? do + permissions :index?, :show?, :destroy? do context 'admin' do it 'permits' do expect(subject).to permit(admin, Instance) |