From bcc70301531b6c3118120173389f2aaa7452bf11 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 23 Jul 2020 18:27:09 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-2-stable-ee --- spec/models/concerns/approvable_base_spec.rb | 34 +++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) (limited to 'spec/models') diff --git a/spec/models/concerns/approvable_base_spec.rb b/spec/models/concerns/approvable_base_spec.rb index 8fda8bccf09..a9e944cf220 100644 --- a/spec/models/concerns/approvable_base_spec.rb +++ b/spec/models/concerns/approvable_base_spec.rb @@ -3,10 +3,10 @@ require 'spec_helper' RSpec.describe ApprovableBase do - describe '#approved_by?' do - let(:merge_request) { create(:merge_request) } - let(:user) { create(:user) } + let(:merge_request) { create(:merge_request) } + let(:user) { create(:user) } + describe '#approved_by?' do subject { merge_request.approved_by?(user) } context 'when a user has not approved' do @@ -31,4 +31,32 @@ RSpec.describe ApprovableBase do end end end + + describe '#can_be_approved_by?' do + subject { merge_request.can_be_approved_by?(user) } + + before do + merge_request.project.add_developer(user) + end + + it 'returns true' do + is_expected.to be_truthy + end + + context 'when a user has approved' do + let!(:approval) { create(:approval, merge_request: merge_request, user: user) } + + it 'returns false' do + is_expected.to be_falsy + end + end + + context 'when a user is nil' do + let(:user) { nil } + + it 'returns false' do + is_expected.to be_falsy + end + end + end end -- cgit v1.2.1