From 889832578afcf668a15deca1fe3c84b9498bcd1d Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 21 Apr 2015 18:38:26 +0200 Subject: Fix small issues. --- app/models/note.rb | 8 ++++---- spec/support/mentionable_shared_examples.rb | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/models/note.rb b/app/models/note.rb index f2a9680ff57..cbce6786683 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -238,7 +238,7 @@ class Note < ActiveRecord::Base # Determine whether or not a cross-reference note already exists. def cross_reference_exists?(noteable, mentioner) - gfm_reference = mentioner_gfm_ref(noteable, mentioner, nil) + gfm_reference = mentioner_gfm_ref(noteable, mentioner, true) notes = if noteable.is_a?(Commit) where(commit_id: noteable.id, noteable_type: 'Commit') else @@ -271,12 +271,12 @@ class Note < ActiveRecord::Base # Prepend the mentioner's namespaced project path to the GFM reference for # cross-project references. For same-project references, return the # unmodified GFM reference. - def mentioner_gfm_ref(noteable, mentioner, mentioner_project = mentioner.project) - if mentioner.is_a?(Commit) && mentioner_project.nil? + def mentioner_gfm_ref(noteable, mentioner, cross_reference = false) + if mentioner.is_a?(Commit) && cross_reference return mentioner.gfm_reference.sub('commit ', 'commit %') end - full_gfm_reference(mentioner_project, noteable.project, mentioner) + full_gfm_reference(mentioner.project, noteable.project, mentioner) end # Return the +mentioner+ GFM reference. If the mentioner and noteable diff --git a/spec/support/mentionable_shared_examples.rb b/spec/support/mentionable_shared_examples.rb index dde80b1e1dd..63800602e01 100644 --- a/spec/support/mentionable_shared_examples.rb +++ b/spec/support/mentionable_shared_examples.rb @@ -52,9 +52,10 @@ def common_mentionable_setup } extra_commits.each { |c| commitmap[c.short_id] = c } - allow(project.repository).to receive(:commit) { |sha| commitmap[sha] } - + allow(project).to receive(:commit) { |sha| commitmap[sha] } + set_mentionable_text.call(ref_string) + subject.save end end -- cgit v1.2.1