2 files changed, 20 insertions, 2 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index d3e6a6648cc..95054228d72 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -21,7 +21,7 @@ describe Commit, models: true do
 
     it 'caches the author' do
       user = create(:user, email: commit.author_email)
-      expect(RequestStore).to receive(:active?).twice.and_return(true)
+      expect(RequestStore).to receive(:active?).and_return(true)
       expect_any_instance_of(Commit).to receive(:find_author_by_any_email).and_call_original
 
       expect(commit.author).to eq(user)
diff --git a/spec/models/concerns/mentionable_spec.rb b/spec/models/concerns/mentionable_spec.rb
index 132858950d5..320d59a37df 100644
--- a/spec/models/concerns/mentionable_spec.rb
+++ b/spec/models/concerns/mentionable_spec.rb
@@ -4,8 +4,9 @@ describe Mentionable do
   class Example
     include Mentionable
 
-    attr_accessor :project, :message
+    attr_accessor :project, :message, :safe_message
     attr_mentionable :message
+    attr_mentionable :safe_message, pipeline: :single_line
 
     def author
       nil
@@ -21,9 +22,26 @@ describe Mentionable do
 
       mentionable.project = project
       mentionable.message = 'JIRA-123'
+      mentionable.safe_message = 'JIRA-123'
       expect(mentionable.referenced_mentionables).to be_empty
     end
   end
+
+  describe '::mentionable_options_for' do
+    subject { Example }
+
+    it 'returns the options' do
+      expect(subject.mentionable_options_for(:safe_message)).to eq(pipeline: :single_line)
+    end
+
+    it 'returns empty hash when no options specified' do
+      expect(subject.mentionable_options_for(:message)).to eq({})
+    end
+
+    it 'returns empty hash when no a mentionable attribute' do
+      expect(subject.mentionable_options_for(:unknwon_attr)).to eq({})
+    end
+  end
 end
 
 describe Issue, "Mentionable" do