diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 14:11:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 14:11:44 +0300 |
commit | 25989ab7ef1a444ed2abd5479f176d58e1d9462a (patch) | |
tree | 271bb24f3c7178f320cb9de0be0833a285327d09 /spec/policies | |
parent | 9bbb32b29703f3ce33dd35d5101145774b793a6d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/policies')
-rw-r--r-- | spec/policies/identity_provider_policy_spec.rb | 1 | ||||
-rw-r--r-- | spec/policies/merge_request_policy_spec.rb | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/spec/policies/identity_provider_policy_spec.rb b/spec/policies/identity_provider_policy_spec.rb index 2520469d4e7..52b6d2c89ba 100644 --- a/spec/policies/identity_provider_policy_spec.rb +++ b/spec/policies/identity_provider_policy_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' describe IdentityProviderPolicy do subject(:policy) { described_class.new(user, provider) } + let(:user) { User.new } let(:provider) { :a_provider } diff --git a/spec/policies/merge_request_policy_spec.rb b/spec/policies/merge_request_policy_spec.rb index 87205f56589..af4c9703eb4 100644 --- a/spec/policies/merge_request_policy_spec.rb +++ b/spec/policies/merge_request_policy_spec.rb @@ -53,21 +53,25 @@ describe MergeRequestPolicy do describe 'the author' do subject { author } + it_behaves_like 'a denied user' end describe 'a guest' do subject { guest } + it_behaves_like 'a denied user' end describe 'a developer' do subject { developer } + it_behaves_like 'a denied user' end describe 'any other user' do subject { non_team_member } + it_behaves_like 'a denied user' end end @@ -82,11 +86,13 @@ describe MergeRequestPolicy do describe 'a non-team-member' do subject { non_team_member } + it_behaves_like 'a denied user' end describe 'a developer' do subject { developer } + it_behaves_like 'a user with access' end end |