Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'
Fix empty state for build that does not have a trace Closes #45204 See merge request gitlab-org/gitlab-ce!18278
This commit is contained in:
commit
b9d868e33d
|
@ -55,7 +55,7 @@
|
|||
- else
|
||||
Job has been erased #{time_ago_with_tooltip(@build.erased_at)}
|
||||
|
||||
- if @build.has_trace?
|
||||
- if @build.running? || @build.has_trace?
|
||||
.build-trace-container.prepend-top-default
|
||||
.top-bar.js-top-bar
|
||||
.js-truncated-info.truncated-info.hidden-xs.pull-left.hidden<
|
||||
|
|
|
@ -3,6 +3,14 @@ module Gitlab
|
|||
module Status
|
||||
module Build
|
||||
module Common
|
||||
def illustration
|
||||
{
|
||||
image: 'illustrations/skipped-job_empty.svg',
|
||||
size: 'svg-430',
|
||||
title: _('This job does not have a trace.')
|
||||
}
|
||||
end
|
||||
|
||||
def has_details?
|
||||
can?(user, :read_build, subject)
|
||||
end
|
||||
|
|
|
@ -464,6 +464,17 @@ feature 'Jobs' do
|
|||
expect(page).to have_content('This job has been skipped')
|
||||
end
|
||||
end
|
||||
|
||||
context 'when job is failed but has no trace' do
|
||||
let(:job) { create(:ci_build, :failed, pipeline: pipeline) }
|
||||
|
||||
it 'renders empty state' do
|
||||
visit project_job_path(project, job)
|
||||
|
||||
expect(job).not_to have_trace
|
||||
expect(page).to have_content('This job does not have a trace.')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "POST /:project/jobs/:id/cancel", :js do
|
||||
|
|
|
@ -38,4 +38,10 @@ describe Gitlab::Ci::Status::Build::Common do
|
|||
expect(subject.details_path).to include "jobs/#{build.id}"
|
||||
end
|
||||
end
|
||||
|
||||
describe '#illustration' do
|
||||
it 'provides a fallback empty state illustration' do
|
||||
expect(subject.illustration).not_to be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -75,7 +75,8 @@ describe Gitlab::Ci::Status::Build::Factory do
|
|||
|
||||
it 'matches correct extended statuses' do
|
||||
expect(factory.extended_statuses)
|
||||
.to eq [Gitlab::Ci::Status::Build::Retryable, Gitlab::Ci::Status::Build::Failed]
|
||||
.to eq [Gitlab::Ci::Status::Build::Retryable,
|
||||
Gitlab::Ci::Status::Build::Failed]
|
||||
end
|
||||
|
||||
it 'fabricates a failed build status' do
|
||||
|
@ -94,7 +95,7 @@ describe Gitlab::Ci::Status::Build::Factory do
|
|||
end
|
||||
|
||||
context 'when build is allowed to fail' do
|
||||
let(:build) { create(:ci_build, :failed, :allowed_to_fail) }
|
||||
let(:build) { create(:ci_build, :failed, :allowed_to_fail, :trace_artifact) }
|
||||
|
||||
it 'matches correct core status' do
|
||||
expect(factory.core_status).to be_a Gitlab::Ci::Status::Failed
|
||||
|
|
Loading…
Reference in New Issue