Fix some of tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
989329c9d9
commit
abd2bc00f9
|
@ -67,7 +67,7 @@ describe SlackService do
|
|||
opts = {
|
||||
title: 'Awesome merge_request',
|
||||
description: 'please fix',
|
||||
source_branch: 'stable',
|
||||
source_branch: 'feature',
|
||||
target_branch: 'master'
|
||||
}
|
||||
merge_service = MergeRequests::CreateService.new(project,
|
||||
|
|
|
@ -36,13 +36,13 @@ describe Repository do
|
|||
|
||||
describe :can_be_merged? do
|
||||
context 'mergeable branches' do
|
||||
subject { repository.can_be_merged?('feature', 'master') }
|
||||
subject { repository.can_be_merged?('0b4bc9a49b562e85de7cc9e834518ea6828729b9', 'master') }
|
||||
|
||||
it { is_expected.to be_truthy }
|
||||
end
|
||||
|
||||
context 'non-mergeable branches' do
|
||||
subject { repository.can_be_merged?('feature_conflict', 'feature') }
|
||||
subject { repository.can_be_merged?('bb5206fee213d983da88c47f9cf4cc6caf9c66dc', 'feature') }
|
||||
|
||||
it { is_expected.to be_falsey }
|
||||
end
|
||||
|
|
|
@ -9,7 +9,7 @@ def common_mentionable_setup
|
|||
let(:author) { subject.author }
|
||||
|
||||
let(:mentioned_issue) { create(:issue, project: project) }
|
||||
let(:mentioned_mr) { create(:merge_request, :simple, source_project: project) }
|
||||
let!(:mentioned_mr) { create(:merge_request, :simple, source_project: project) }
|
||||
let(:mentioned_commit) { project.commit }
|
||||
|
||||
let(:ext_proj) { create(:project, :public) }
|
||||
|
|
Loading…
Reference in New Issue