Commit e1dd76d5a52391626d538bf9803a32c1f0e83287
1 parent
c31b7031
Exists in
spb-stable
and in
3 other branches
Fix tests that dont respect project-fork relation. pt2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
spec/lib/gitlab/satellite/merge_action_spec.rb
| @@ -13,7 +13,7 @@ describe 'Gitlab::Satellite::MergeAction' do | @@ -13,7 +13,7 @@ describe 'Gitlab::Satellite::MergeAction' do | ||
| 13 | end | 13 | end |
| 14 | 14 | ||
| 15 | let(:project) { create(:project, namespace: create(:group)) } | 15 | let(:project) { create(:project, namespace: create(:group)) } |
| 16 | - let(:fork_project) { create(:project, namespace: create(:group)) } | 16 | + let(:fork_project) { create(:project, namespace: create(:group), forked_from_project: project) } |
| 17 | let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } | 17 | let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } |
| 18 | let(:merge_request_fork) { create(:merge_request, source_project: fork_project, target_project: project) } | 18 | let(:merge_request_fork) { create(:merge_request, source_project: fork_project, target_project: project) } |
| 19 | 19 |