Merge branch...

Merge branch '198621-actionview-template-error-missing-partial-notify-links-projects-generic_commit_statuses' into 'master'

Fix Pipeline failed notification email not being delivered if the failed job is a bridge job

Closes #198621

See merge request gitlab-org/gitlab!23668

app/views/notify/links/projects/generic_commit_statuses/_generic_commit_status.html.haml

+= build.name

app/views/notify/links/projects/generic_commit_statuses/_generic_commit_status.text.erb

+Job #<%= build.id %>

changelogs/unreleased/198621-actionview-template-error-missing-partial-notify-links-projects-ge.yml

+---
+title: Fix Pipeline failed notification email not being delivered if the failed job
+  is a bridge job
+merge_request: 23668
+author:
+type: fixed

spec/views/notify/pipeline_failed_email.html.haml_spec.rb

@@ -15,7 +15,7 @@ describe 'notify/pipeline_failed_email.html.haml' do
            user: user,
            ref: project.default_branch,
            sha: project.commit.sha,
-           status: :success)
+           status: :failed)
   end
 
   before do
@@ -24,35 +24,51 @@ describe 'notify/pipeline_failed_email.html.haml' do
     assign(:merge_request, merge_request)
   end
 
-  context 'pipeline with user' do
-    it 'renders the email correctly' do
-      render
+  shared_examples_for 'renders the pipeline failed email correctly' do
+    context 'pipeline with user' do
+      it 'renders the email correctly' do
+        render
 
-      expect(rendered).to have_content "Your pipeline has failed"
-      expect(rendered).to have_content pipeline.project.name
-      expect(rendered).to have_content pipeline.git_commit_message.truncate(50).gsub(/\s+/, ' ')
-      expect(rendered).to have_content pipeline.commit.author_name
-      expect(rendered).to have_content "##{pipeline.id}"
-      expect(rendered).to have_content pipeline.user.name
+        expect(rendered).to have_content "Your pipeline has failed"
+        expect(rendered).to have_content pipeline.project.name
+        expect(rendered).to have_content pipeline.git_commit_message.truncate(50).gsub(/\s+/, ' ')
+        expect(rendered).to have_content pipeline.commit.author_name
+        expect(rendered).to have_content "##{pipeline.id}"
+        expect(rendered).to have_content pipeline.user.name
+        expect(rendered).to have_content build.name
+      end
+
+      it_behaves_like 'correct pipeline information for pipelines for merge requests'
     end
 
-    it_behaves_like 'correct pipeline information for pipelines for merge requests'
-  end
+    context 'pipeline without user' do
+      before do
+        pipeline.update_attribute(:user, nil)
+      end
 
-  context 'pipeline without user' do
-    before do
-      pipeline.update_attribute(:user, nil)
+      it 'renders the email correctly' do
+        render
+
+        expect(rendered).to have_content "Your pipeline has failed"
+        expect(rendered).to have_content pipeline.project.name
+        expect(rendered).to have_content pipeline.git_commit_message.truncate(50).gsub(/\s+/, ' ')
+        expect(rendered).to have_content pipeline.commit.author_name
+        expect(rendered).to have_content "##{pipeline.id}"
+        expect(rendered).to have_content "by API"
+        expect(rendered).to have_content build.name
+      end
     end
+  end
 
-    it 'renders the email correctly' do
-      render
+  context 'when the pipeline contains a failed job' do
+    let!(:build) { create(:ci_build, :failed, pipeline: pipeline, project: pipeline.project) }
 
-      expect(rendered).to have_content "Your pipeline has failed"
-      expect(rendered).to have_content pipeline.project.name
-      expect(rendered).to have_content pipeline.git_commit_message.truncate(50).gsub(/\s+/, ' ')
-      expect(rendered).to have_content pipeline.commit.author_name
-      expect(rendered).to have_content "##{pipeline.id}"
-      expect(rendered).to have_content "by API"
-    end
+    it_behaves_like 'renders the pipeline failed email correctly'
+  end
+
+  context 'when the latest failed job is a bridge job' do
+    let!(:build) { create(:ci_bridge, status: :failed, pipeline: pipeline, project: pipeline.project) }
+
+    it_behaves_like 'renders the pipeline failed email correctly'
   end
 end

spec/views/notify/pipeline_failed_email.text.erb_spec.rb

@@ -23,19 +23,31 @@ describe 'notify/pipeline_failed_email.text.erb' do
     assign(:merge_request, merge_request)
   end
 
-  it 'renders the email correctly' do
-    job = create(:ci_build, :failed, pipeline: pipeline, project: pipeline.project)
-
-    render
-
-    expect(rendered).to have_content('Your pipeline has failed')
-    expect(rendered).to have_content(pipeline.project.name)
-    expect(rendered).to have_content(pipeline.git_commit_message.truncate(50).gsub(/\s+/, ' '))
-    expect(rendered).to have_content(pipeline.commit.author_name)
-    expect(rendered).to have_content("##{pipeline.id}")
-    expect(rendered).to have_content(pipeline.user.name)
-    expect(rendered).to have_content("/-/jobs/#{job.id}/raw")
+  shared_examples_for 'renders the pipeline failed email correctly' do
+    it 'renders the email correctly' do
+      render
+
+      expect(rendered).to have_content('Your pipeline has failed')
+      expect(rendered).to have_content(pipeline.project.name)
+      expect(rendered).to have_content(pipeline.git_commit_message.truncate(50).gsub(/\s+/, ' '))
+      expect(rendered).to have_content(pipeline.commit.author_name)
+      expect(rendered).to have_content("##{pipeline.id}")
+      expect(rendered).to have_content(pipeline.user.name)
+      expect(rendered).to have_content(build.id)
+    end
+
+    it_behaves_like 'correct pipeline information for pipelines for merge requests'
   end
 
-  it_behaves_like 'correct pipeline information for pipelines for merge requests'
+  context 'when the pipeline contains a failed job' do
+    let!(:build) { create(:ci_build, :failed, pipeline: pipeline, project: pipeline.project) }
+
+    it_behaves_like 'renders the pipeline failed email correctly'
+  end
+
+  context 'when the latest failed job is a bridge job' do
+    let!(:build) { create(:ci_bridge, status: :failed, pipeline: pipeline, project: pipeline.project) }
+
+    it_behaves_like 'renders the pipeline failed email correctly'
+  end
 end