From 9231b91a401245e44b57dbe688eeabfc45dd4bea Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 27 Jun 2014 00:37:04 +0300 Subject: [PATCH] Fix mentionable spec Signed-off-by: Dmitriy Zaporozhets --- spec/support/mentionable_shared_examples.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/spec/support/mentionable_shared_examples.rb b/spec/support/mentionable_shared_examples.rb index 3802e94ecf0..0d67e7ee4e6 100644 --- a/spec/support/mentionable_shared_examples.rb +++ b/spec/support/mentionable_shared_examples.rb @@ -11,7 +11,7 @@ def common_mentionable_setup let(:mentioned_issue) { create :issue, project: mproject } let(:other_issue) { create :issue, project: mproject } - let(:mentioned_mr) { create :merge_request, source_project: mproject, source_branch: 'different' } + let(:mentioned_mr) { create :merge_request, :simple, source_project: mproject } let(:mentioned_commit) { double('commit', sha: '1234567890abcdef').as_null_object } # Override to add known commits to the repository stub. @@ -29,11 +29,7 @@ def common_mentionable_setup # unrecognized commits. commitmap = { '123456' => mentioned_commit } extra_commits.each { |c| commitmap[c.sha[0..5]] = c } - - repo = double('repository') - repo.stub(:commit) { |sha| commitmap[sha] } - mproject.stub(repository: repo) - + mproject.repository.stub(:commit) { |sha| commitmap[sha] } set_mentionable_text.call(ref_string) end end