From 93ab5856e4de9a13e730cf9d200e4f0934f4bece Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Wed, 21 Sep 2016 01:03:47 +0800
Subject: [PATCH] Use factory instead of using new directly. Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6414#note_15765156
---
spec/models/merge_request_spec.rb | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index fce236bcb5d..38c2a28d3e1 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -524,18 +524,11 @@ describe MergeRequest, models: true do
end
context 'with unsaved merge request' do
- let(:project) { create(:project) }
-
- subject do
- MergeRequest.new(source_project: project,
- target_project: project,
- source_branch: 'master',
- target_branch: 'feature')
- end
+ subject { build(:merge_request) }
let!(:pipeline) do
create(:ci_empty_pipeline,
- project: project,
+ project: subject.project,
sha: subject.diff_head_sha,
ref: subject.source_branch)
end
--
GitLab