Define CI status icon colors in SCSS instead of a helper
This commit is contained in:
parent
a5e449571b
commit
3084c8c370
3 changed files with 24 additions and 26 deletions
|
@ -35,3 +35,20 @@
|
|||
border-color: $gl-warning;
|
||||
}
|
||||
}
|
||||
|
||||
.ci-status-icon-success {
|
||||
@extend .cgreen;
|
||||
}
|
||||
.ci-status-icon-failed {
|
||||
@extend .cred;
|
||||
}
|
||||
.ci-status-icon-running,
|
||||
.ci-status-icon-pending {
|
||||
// These are standard text color
|
||||
}
|
||||
.ci-status-icon-canceled,
|
||||
.ci-status-icon-disabled,
|
||||
.ci-status-icon-not-found,
|
||||
.ci-status-icon-skipped {
|
||||
@extend .cgray;
|
||||
}
|
||||
|
|
|
@ -12,19 +12,6 @@ module CiStatusHelper
|
|||
ci_label_for_status(ci_commit.status)
|
||||
end
|
||||
|
||||
def ci_status_color(ci_commit)
|
||||
case ci_commit.status
|
||||
when 'success'
|
||||
'green'
|
||||
when 'failed'
|
||||
'red'
|
||||
when 'running', 'pending'
|
||||
'yellow'
|
||||
else
|
||||
'gray'
|
||||
end
|
||||
end
|
||||
|
||||
def ci_status_with_icon(status)
|
||||
content_tag :span, class: "ci-status ci-#{status}" do
|
||||
ci_icon_for_status(status) + ' '.html_safe + ci_label_for_status(status)
|
||||
|
@ -56,11 +43,10 @@ module CiStatusHelper
|
|||
end
|
||||
|
||||
def render_ci_status(ci_commit)
|
||||
link_to ci_status_path(ci_commit),
|
||||
class: "c#{ci_status_color(ci_commit)}",
|
||||
link_to ci_status_icon(ci_commit),
|
||||
ci_status_path(ci_commit),
|
||||
class: "ci-status-icon-#{ci_commit.status.dasherize}",
|
||||
title: "Build #{ci_status_label(ci_commit)}",
|
||||
data: { toggle: 'tooltip', placement: 'left' } do
|
||||
ci_status_icon(ci_commit)
|
||||
end
|
||||
data: { toggle: 'tooltip', placement: 'left' }
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,13 +6,8 @@ describe CiStatusHelper do
|
|||
let(:success_commit) { double("Ci::Commit", status: 'success') }
|
||||
let(:failed_commit) { double("Ci::Commit", status: 'failed') }
|
||||
|
||||
describe 'ci_status_color' do
|
||||
it { expect(ci_status_icon(success_commit)).to include('fa-check') }
|
||||
it { expect(ci_status_icon(failed_commit)).to include('fa-close') }
|
||||
end
|
||||
|
||||
describe 'ci_status_color' do
|
||||
it { expect(ci_status_color(success_commit)).to eq('green') }
|
||||
it { expect(ci_status_color(failed_commit)).to eq('red') }
|
||||
describe 'ci_status_icon' do
|
||||
it { expect(helper.ci_status_icon(success_commit)).to include('fa-check') }
|
||||
it { expect(helper.ci_status_icon(failed_commit)).to include('fa-close') }
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue