From 4cde3593b91b2aff4681bc8a3cece8be3d194b42 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 23 Jan 2014 13:21:58 +0200 Subject: [PATCH] Fix satellites specs --- spec/lib/gitlab/satellite/merge_action_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/lib/gitlab/satellite/merge_action_spec.rb b/spec/lib/gitlab/satellite/merge_action_spec.rb index 1808935..25ddf87 100644 --- a/spec/lib/gitlab/satellite/merge_action_spec.rb +++ b/spec/lib/gitlab/satellite/merge_action_spec.rb @@ -12,9 +12,10 @@ describe 'Gitlab::Satellite::MergeAction' do @close_commit2 = ['scss_refactoring', 'f0f14c8eaba69ebddd766498a9d0b0e79becd633'] end - let(:project) { create(:project) } + let(:project) { create(:project, namespace: create(:group)) } + let(:fork_project) { create(:project, namespace: create(:group)) } let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } - let(:merge_request_fork) { create(:merge_request) } + let(:merge_request_fork) { create(:merge_request, source_project: fork_project, target_project: project) } describe '#commits_between' do def verify_commits(commits, first_commit_sha, last_commit_sha) -- libgit2 0.21.2