Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-04-10 15:27:34 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-04-11 11:52:09 +0300
commit2ea25cbcaff0ca62b0570a129771f08bca532820 (patch)
treeb3f27851d6c81059ecb769a7ae73b8bd6c7e4767 /spec/lib
parent199e31eb24ae314428c2801454f9de676a78496c (diff)
Revert adding `Empty` extended status to avoid N+1 queries
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/ci/status/build/empty_spec.rb31
-rw-r--r--spec/lib/gitlab/ci/status/build/factory_spec.rb6
2 files changed, 2 insertions, 35 deletions
diff --git a/spec/lib/gitlab/ci/status/build/empty_spec.rb b/spec/lib/gitlab/ci/status/build/empty_spec.rb
deleted file mode 100644
index 379a5a9849b..00000000000
--- a/spec/lib/gitlab/ci/status/build/empty_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-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
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb
index 83d48f1bc73..d53a7d468e3 100644
--- a/spec/lib/gitlab/ci/status/build/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb
@@ -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