Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-04-13 06:34:08 +0300
committerTimothy Andrew <mail@timothyandrew.net>2016-04-13 06:34:08 +0300
commit8dd1a6fc917231e83fb64dbfa65e1edbe9ab3fee (patch)
treeb824c30f8fac16368f6348ff2e2d843a3b63bcea /spec/models/issue_spec.rb
parent66ca80181bcb5aef97296fde567b899603186be6 (diff)
Fix the rubocop check.
Diffstat (limited to 'spec/models/issue_spec.rb')
-rw-r--r--spec/models/issue_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 22dabaa0404..202ce846dca 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -192,8 +192,6 @@ describe Issue, models: true do
describe '#related_branches' do
let(:user) { build(:user, :admin) }
- let(:merge_request) { create(:merge_request, description: "Closes ##{subject.iid}",
- source_project: subject.project, source_branch: "branch-#{subject.iid}") }
before(:each) do
allow(subject.project.repository).to receive(:branch_names).
@@ -210,6 +208,9 @@ describe Issue, models: true do
end
it "selects the right branches when there is a referenced merge request" do
+ merge_request = create(:merge_request, { description: "Closes ##{subject.iid}",
+ source_project: subject.project,
+ source_branch: "branch-#{subject.iid}" })
merge_request.create_cross_references!(user)
expect(subject.referenced_merge_requests).to_not be_empty
expect(subject.related_branches(user)).to eq([subject.to_branch_name])