Commit 2ea25cbc authored by Grzegorz Bizon's avatar Grzegorz Bizon

Revert adding `Empty` extended status to avoid N+1 queries

parent 199e31eb
......@@ -6,7 +6,8 @@ module Gitlab
def illustration
{
image: 'illustrations/skipped-job_empty.svg',
size: 'svg-430'
size: 'svg-430',
title: _('This job does not have a trace.'),
}
end
......
module Gitlab
module Ci
module Status
module Build
class Empty < Status::Extended
def illustration
{
image: 'illustrations/skipped-job_empty.svg',
size: 'svg-430',
title: _('This job does not have a trace.')
}
end
def self.matches?(build, user)
!build.has_trace?
end
end
end
end
end
end
......@@ -9,8 +9,7 @@ module Gitlab
Status::Build::Canceled,
Status::Build::Created,
Status::Build::Pending,
Status::Build::Skipped,
Status::Build::Empty],
Status::Build::Skipped],
[Status::Build::Cancelable,
Status::Build::Retryable],
[Status::Build::Failed],
......
require 'spec_helper'
describe Gitlab::Ci::Status::Build::Empty do
let(:build) { create(:ci_build, :running) }
let(:status) { double('core status') }
let(:user) { double('user') }
subject { described_class.new(status) }
describe '#illustration' do
it 'provides an empty state illustration' do
expect(subject.illustration).not_to be_empty
end
end
describe '.matches?' do
subject { described_class.matches?(build, user) }
context 'when a build has trace' do
let(:build) { create(:ci_build, :trace_artifact) }
it { is_expected.to be_falsy }
end
context 'with a build that has not been retried' do
let(:build) { create(:ci_build, :running) }
it { is_expected.to be_truthy }
end
end
end
......@@ -75,8 +75,7 @@ describe Gitlab::Ci::Status::Build::Factory do
it 'matches correct extended statuses' do
expect(factory.extended_statuses)
.to eq [Gitlab::Ci::Status::Build::Empty,
Gitlab::Ci::Status::Build::Retryable,
.to eq [Gitlab::Ci::Status::Build::Retryable,
Gitlab::Ci::Status::Build::Failed]
end
......@@ -162,8 +161,7 @@ describe Gitlab::Ci::Status::Build::Factory do
it 'matches correct extended statuses' do
expect(factory.extended_statuses)
.to eq [Gitlab::Ci::Status::Build::Empty,
Gitlab::Ci::Status::Build::Cancelable]
.to eq [Gitlab::Ci::Status::Build::Cancelable]
end
it 'fabricates a canceable build status' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment