From ed545d9f754374c7a5fe98a81544f0d1cdc88cf0 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 25 Oct 2016 01:56:39 +0800 Subject: Make sure merge request was created before deleting source --- spec/models/merge_request_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'spec/models') diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 6e5137602aa..6f66a0ebe75 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1286,7 +1286,8 @@ describe MergeRequest, models: true do let(:project) { create(:project) } let(:user) { create(:user) } let(:fork_project) { create(:project, forked_from_project: project, namespace: user.namespace) } - let(:merge_request) do + + let!(:merge_request) do create(:closed_merge_request, source_project: fork_project, target_project: project) -- cgit v1.2.1