Commit 4cde3593b91b2aff4681bc8a3cece8be3d194b42
1 parent
9db8cb3f
Exists in
spb-stable
and in
3 other branches
Fix satellites specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
3 additions
and
2 deletions
Show diff stats
spec/lib/gitlab/satellite/merge_action_spec.rb
| @@ -12,9 +12,10 @@ describe 'Gitlab::Satellite::MergeAction' do | @@ -12,9 +12,10 @@ describe 'Gitlab::Satellite::MergeAction' do | ||
| 12 | @close_commit2 = ['scss_refactoring', 'f0f14c8eaba69ebddd766498a9d0b0e79becd633'] | 12 | @close_commit2 = ['scss_refactoring', 'f0f14c8eaba69ebddd766498a9d0b0e79becd633'] |
| 13 | end | 13 | end |
| 14 | 14 | ||
| 15 | - let(:project) { create(:project) } | 15 | + let(:project) { create(:project, namespace: create(:group)) } |
| 16 | + let(:fork_project) { create(:project, namespace: create(:group)) } | ||
| 16 | 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) } |
| 17 | - let(:merge_request_fork) { create(:merge_request) } | 18 | + let(:merge_request_fork) { create(:merge_request, source_project: fork_project, target_project: project) } |
| 18 | 19 | ||
| 19 | describe '#commits_between' do | 20 | describe '#commits_between' do |
| 20 | def verify_commits(commits, first_commit_sha, last_commit_sha) | 21 | def verify_commits(commits, first_commit_sha, last_commit_sha) |