diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-11-07 18:20:26 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-11-07 18:20:26 +0300 |
commit | 3f35ba769a6db924b82939b996fdd7631ddf2377 (patch) | |
tree | b82f4f04743fd504ec007f41fd1cf651de025548 /spec | |
parent | d45fef88f7f0aa249893f9f151185eac5b9bb870 (diff) | |
parent | a97cd2906e33c7a66aa4982ae90ba5ac6fe68440 (diff) |
Merge branch '39831-warning-icon-in-jobs-dropdown-has-incorrect-style' into 'master'
Resolve "Warning icon in jobs dropdown has incorrect style"
Closes #39831
See merge request gitlab-org/gitlab-ce!15221
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/ci/status/build/factory_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb index 2b32e47e9ba..d196bc6a4c2 100644 --- a/spec/lib/gitlab/ci/status/build/factory_spec.rb +++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb @@ -84,7 +84,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 'warning' + expect(status.icon).to eq 'status_warning' expect(status.favicon).to eq 'favicon_status_failed' expect(status.label).to eq 'failed (allowed to fail)' expect(status).to have_details 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 79a65fc67e8..99a5a7e4aca 100644 --- a/spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb +++ b/spec/lib/gitlab/ci/status/build/failed_allowed_spec.rb @@ -18,7 +18,7 @@ describe Gitlab::Ci::Status::Build::FailedAllowed do describe '#icon' do it 'returns a warning icon' do - expect(subject.icon).to eq 'warning' + expect(subject.icon).to eq 'status_warning' end end |