diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 08:58:32 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 08:58:32 +0100 |
commit | b2915613fb247597d3de2f80c2c007b3369ac5bb (patch) | |
tree | 745c245cb4c2d16dcada37d1fb1cf5b13f4e2493 /spec/policies/instance_policy_spec.rb | |
parent | ad6ddb9bdd3ceae3f9d5dde7b351081f0dfa2a9a (diff) | |
parent | e38fc319dc6897ca867a509b0c7a5878d34d0f00 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream.
Diffstat (limited to 'spec/policies/instance_policy_spec.rb')
-rw-r--r-- | spec/policies/instance_policy_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/policies/instance_policy_spec.rb b/spec/policies/instance_policy_spec.rb index 72cf25f56..71ef1fe50 100644 --- a/spec/policies/instance_policy_spec.rb +++ b/spec/policies/instance_policy_spec.rb @@ -6,7 +6,7 @@ require 'pundit/rspec' RSpec.describe InstancePolicy do let(:subject) { described_class } let(:admin) { Fabricate(:user, admin: true).account } - let(:john) { Fabricate(:user).account } + let(:john) { Fabricate(:account) } permissions :index?, :show?, :destroy? do context 'admin' do |