Add latest changes from gitlab-org/gitlab@master

4 files changed, 47 insertions, 0 deletions

diff --git a/spec/models/user_mentions/commit_user_mention_spec.rb b/spec/models/user_mentions/commit_user_mention_spec.rb
new file mode 100644
index 00000000000..ebad3902d6b
--- /dev/null
+++ b/spec/models/user_mentions/commit_user_mention_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe CommitUserMention do
+  describe 'associations' do
+    it { is_expected.to belong_to(:note) }
+  end
+
+  it_behaves_like 'has user mentions'
+end
diff --git a/spec/models/user_mentions/issue_user_mention_spec.rb b/spec/models/user_mentions/issue_user_mention_spec.rb
new file mode 100644
index 00000000000..ac29f3084b4
--- /dev/null
+++ b/spec/models/user_mentions/issue_user_mention_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe IssueUserMention do
+  describe 'associations' do
+    it { is_expected.to belong_to(:issue) }
+    it { is_expected.to belong_to(:note) }
+  end
+
+  it_behaves_like 'has user mentions'
+end
diff --git a/spec/models/user_mentions/merge_request_user_mention_spec.rb b/spec/models/user_mentions/merge_request_user_mention_spec.rb
new file mode 100644
index 00000000000..c5c7cebfaa5
--- /dev/null
+++ b/spec/models/user_mentions/merge_request_user_mention_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe MergeRequestUserMention do
+  describe 'associations' do
+    it { is_expected.to belong_to(:merge_request) }
+    it { is_expected.to belong_to(:note) }
+  end
+
+  it_behaves_like 'has user mentions'
+end
diff --git a/spec/models/user_mentions/snippet_user_mention_spec.rb b/spec/models/user_mentions/snippet_user_mention_spec.rb
new file mode 100644
index 00000000000..0e34a2dd5a1
--- /dev/null
+++ b/spec/models/user_mentions/snippet_user_mention_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe SnippetUserMention do
+  describe 'associations' do
+    it { is_expected.to belong_to(:snippet) }
+    it { is_expected.to belong_to(:note) }
+  end
+
+  it_behaves_like 'has user mentions'
+end