diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-18 15:59:36 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-18 15:59:36 +0000 |
| commit | 80351981d244911716ac1283c3c0c77b7a205899 (patch) | |
| tree | 0050bcece612ae6d3c6eafa300a9b123ea17cae2 | |
| parent | dfee19c42a26a49ce45a2a7207fcec46c2c19002 (diff) | |
| parent | d6b684e42cfaec67887b97385cf819ea8afa91b8 (diff) | |
| download | gitlab-ce-80351981d244911716ac1283c3c0c77b7a205899.tar.gz | |
Merge branch '52886-fix-broken-master' into 'master'
Fixes broken test in master for ci status bagde
Closes #52886
See merge request gitlab-org/gitlab-ce!22465
| -rw-r--r-- | changelogs/unreleased/52886-fix-broken-master.yml | 5 | ||||
| -rw-r--r-- | spec/javascripts/vue_shared/components/ci_badge_link_spec.js | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/52886-fix-broken-master.yml b/changelogs/unreleased/52886-fix-broken-master.yml new file mode 100644 index 00000000000..c6488c83e3b --- /dev/null +++ b/changelogs/unreleased/52886-fix-broken-master.yml @@ -0,0 +1,5 @@ +--- +title: Fixes broken test in master +merge_request: +author: +type: fixed diff --git a/spec/javascripts/vue_shared/components/ci_badge_link_spec.js b/spec/javascripts/vue_shared/components/ci_badge_link_spec.js index 21e7afaf78f..4b0b7ba66e5 100644 --- a/spec/javascripts/vue_shared/components/ci_badge_link_spec.js +++ b/spec/javascripts/vue_shared/components/ci_badge_link_spec.js @@ -86,7 +86,7 @@ describe('CI Badge Link Component', () => { expect(vm.$el.getAttribute('href')).toEqual(statuses[status].details_path); expect(vm.$el.textContent.trim()).toEqual(statuses[status].text); - expect(vm.$el.getAttribute('class')).toEqual(`ci-status ci-${statuses[status].group}`); + expect(vm.$el.getAttribute('class')).toContain(`ci-status ci-${statuses[status].group}`); expect(vm.$el.querySelector('svg')).toBeDefined(); return vm; }); |