From 580dfe5af9c84feafaad1f870d53e2a49d27e0be Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 6 Nov 2013 19:13:45 +0200 Subject: Replace assign with stub for default_branch Signed-off-by: Dmitriy Zaporozhets --- spec/models/merge_request_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index b17183a281c..fe65096fd1e 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -116,13 +116,13 @@ describe MergeRequest do end it 'accesses the set of issues that will be closed on acceptance' do - subject.project.default_branch = subject.target_branch + subject.project.stub(default_branch: subject.target_branch) subject.closes_issues.should == [issue0, issue1].sort_by(&:id) end it 'only lists issues as to be closed if it targets the default branch' do - subject.project.default_branch = 'master' + subject.project.stub(default_branch: 'master') subject.target_branch = 'something-else' subject.closes_issues.should be_empty -- cgit v1.2.1