From 448c695c2afeb9b69fa274244a7ac6b85ef50f00 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Sat, 11 Mar 2017 22:24:36 +0900 Subject: [PATCH] Revert adding favicon to extended statuses. Change extended statues specs to use core status --- lib/gitlab/ci/status/build/failed_allowed.rb | 4 ---- lib/gitlab/ci/status/success_warning.rb | 4 ---- spec/lib/gitlab/ci/status/build/factory_spec.rb | 2 +- spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb | 6 ------ spec/lib/gitlab/ci/status/success_warning_spec.rb | 4 ---- 5 files changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/gitlab/ci/status/build/failed_allowed.rb b/lib/gitlab/ci/status/build/failed_allowed.rb index 8693bd5849f..807afe24bd5 100644 --- a/lib/gitlab/ci/status/build/failed_allowed.rb +++ b/lib/gitlab/ci/status/build/failed_allowed.rb @@ -13,10 +13,6 @@ module Gitlab 'icon_status_warning' end - def favicon - 'favicon_status_warning' - end - def group 'failed_with_warnings' end diff --git a/lib/gitlab/ci/status/success_warning.rb b/lib/gitlab/ci/status/success_warning.rb index 9b735ed235a..d4cdab6957a 100644 --- a/lib/gitlab/ci/status/success_warning.rb +++ b/lib/gitlab/ci/status/success_warning.rb @@ -20,10 +20,6 @@ module Gitlab 'icon_status_warning' end - def favicon - 'favicon_status_warning' - end - def group 'success_with_warnings' end diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb index f6bc3eac9e3..e648a3ac3a2 100644 --- a/spec/lib/gitlab/ci/status/build/factory_spec.rb +++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb @@ -81,7 +81,7 @@ describe Gitlab::Ci::Status::Build::Factory do it 'fabricates status with correct details' do expect(status.text).to eq 'failed' expect(status.icon).to eq 'icon_status_warning' - expect(status.favicon).to eq 'favicon_status_warning' + expect(status.favicon).to eq 'favicon_status_failed' expect(status.label).to eq 'failed (allowed to fail)' expect(status).to have_details expect(status).to have_action diff --git a/spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb b/spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb index b39ccbb1f60..20f71459738 100644 --- a/spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb +++ b/spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb @@ -22,12 +22,6 @@ describe Gitlab::Ci::Status::Build::FailedAllowed do end end - describe '#favicon' do - it 'returns a warning favicon' do - expect(subject.favicon).to eq 'favicon_status_warning' - end - end - describe '#label' do it 'returns information about failed but allowed to fail status' do expect(subject.label).to eq 'failed (allowed to fail)' diff --git a/spec/lib/gitlab/ci/status/success_warning_spec.rb b/spec/lib/gitlab/ci/status/success_warning_spec.rb index 19d0da499f9..7e2269397c6 100644 --- a/spec/lib/gitlab/ci/status/success_warning_spec.rb +++ b/spec/lib/gitlab/ci/status/success_warning_spec.rb @@ -17,10 +17,6 @@ describe Gitlab::Ci::Status::SuccessWarning do it { expect(subject.icon).to eq 'icon_status_warning' } end - describe '#favicon' do - it { expect(subject.favicon).to eq 'favicon_status_warning' } - end - describe '#group' do it { expect(subject.group).to eq 'success_with_warnings' } end