Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/views/projects/commits/_commit.html.haml_spec.rb b/spec/views/projects/commits/_commit.html.haml_spec.rb
index abbb3a168c3..ed93240abc1 100644
--- a/spec/views/projects/commits/_commit.html.haml_spec.rb
+++ b/spec/views/projects/commits/_commit.html.haml_spec.rb
@@ -11,6 +11,24 @@ RSpec.describe 'projects/commits/_commit.html.haml' do
     allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings)
   end
 
+  context 'with different committer' do
+    let(:ref) { 'master' }
+    let(:committer) { create(:user) }
+
+    it 'renders committed by user' do
+      allow(commit).to receive(:different_committer?).and_return(true)
+      allow(commit).to receive(:committer).and_return(committer)
+
+      render partial: template, locals: {
+        project: project,
+        ref: ref,
+        commit: commit
+      }
+
+      expect(rendered).to have_text("#{committer.name} committed")
+    end
+  end
+
   context 'with a signed commit' do
     let(:ref) { GpgHelpers::SIGNED_COMMIT_SHA }