summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-10-25 01:56:39 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-10-25 01:56:39 +0800
commited545d9f754374c7a5fe98a81544f0d1cdc88cf0 (patch)
tree943aa4f431ecff75450950354f3b8298aacfcbb8
parent78de8816f587bd90725e7b46fcbd3860d3eb2889 (diff)
downloadgitlab-ce-show-commit-status-from-source-project.tar.gz
Make sure merge request was created before deleting sourceshow-commit-status-from-source-project
-rw-r--r--spec/models/merge_request_spec.rb3
1 files changed, 2 insertions, 1 deletions
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)