Add latest changes from gitlab-org/gitlab@master

1 files changed, 28 insertions, 0 deletions

diff --git a/spec/finders/context_commits_finder_spec.rb b/spec/finders/context_commits_finder_spec.rb
new file mode 100644
index 00000000000..13cfa32ecfc
--- /dev/null
+++ b/spec/finders/context_commits_finder_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ContextCommitsFinder do
+  describe "#execute" do
+    let(:project) { create(:project, :repository) }
+    let(:merge_request) { create(:merge_request) }
+    let(:commit) { create(:commit, id: '6d394385cf567f80a8fd85055db1ab4c5295806f') }
+
+    it 'filters commits by valid sha/commit message' do
+      params = { search: commit.id }
+
+      commits = described_class.new(project, merge_request, params).execute
+
+      expect(commits.length).to eq(1)
+      expect(commits[0].id).to eq(commit.id)
+    end
+
+    it 'returns nothing when searched by invalid sha/commit message' do
+      params = { search: 'zzz' }
+
+      commits = described_class.new(project, merge_request, params).execute
+
+      expect(commits).to be_empty
+    end
+  end
+end