Allow custom squash commit messages

2 files changed, 40 insertions, 3 deletions

diff --git a/spec/serializers/merge_request_widget_commit_entity_spec.rb b/spec/serializers/merge_request_widget_commit_entity_spec.rb
new file mode 100644
index 00000000000..ce83978c49a
--- /dev/null
+++ b/spec/serializers/merge_request_widget_commit_entity_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe MergeRequestWidgetCommitEntity do
+  let(:project) { create(:project, :repository) }
+  let(:commit) { project.commit }
+  let(:request) { double('request') }
+
+  let(:entity) do
+    described_class.new(commit, request: request)
+  end
+
+  context 'as json' do
+    subject { entity.as_json }
+
+    it { expect(subject[:message]).to eq(commit.safe_message) }
+    it { expect(subject[:short_id]).to eq(commit.short_id) }
+    it { expect(subject[:title]).to eq(commit.title) }
+  end
+end
diff --git a/spec/serializers/merge_request_widget_entity_spec.rb b/spec/serializers/merge_request_widget_entity_spec.rb
index 376698a16df..4dbd79f2fc0 100644
--- a/spec/serializers/merge_request_widget_entity_spec.rb
+++ b/spec/serializers/merge_request_widget_entity_spec.rb
@@ -188,9 +188,14 @@ describe MergeRequestWidgetEntity do
       .to eq("/#{resource.project.full_path}/merge_requests/#{resource.iid}.diff")
   end
 
-  it 'has merge_commit_message_with_description' do
-    expect(subject[:merge_commit_message_with_description])
-      .to eq(resource.merge_commit_message(include_description: true))
+  it 'has default_merge_commit_message_with_description' do
+    expect(subject[:default_merge_commit_message_with_description])
+      .to eq(resource.default_merge_commit_message(include_description: true))
+  end
+
+  it 'has default_squash_commit_message' do
+    expect(subject[:default_squash_commit_message])
+      .to eq(resource.default_squash_commit_message)
   end
 
   describe 'new_blob_path' do
@@ -272,4 +277,15 @@ describe MergeRequestWidgetEntity do
       expect(entity[:rebase_path]).to be_nil
     end
   end
+
+  describe 'commits_without_merge_commits' do
+    it 'should not include merge commits' do
+      # Mock all but the first 5 commits to be merge commits
+      resource.commits.each_with_index do |commit, i|
+        expect(commit).to receive(:merge_commit?).at_least(:once).and_return(i > 4)
+      end
+
+      expect(subject[:commits_without_merge_commits].size).to eq(5)
+    end
+  end
 end