summaryrefslogtreecommitdiff
path: root/spec/javascripts
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-01-22 08:49:09 +0000
committerPhil Hughes <me@iamphill.com>2018-01-22 08:49:09 +0000
commitbd7a387b4348adac36e2b3aa9b908a4d3dc01606 (patch)
tree68865245addf76b2441879ec9b8fef864d0412a0 /spec/javascripts
parent6a1da5673187617abb4c61afab998fc6fbfb3238 (diff)
parent33233123bafb2dbc455cea730aa5cc45abc95e35 (diff)
downloadgitlab-ce-bd7a387b4348adac36e2b3aa9b908a4d3dc01606.tar.gz
Merge branch '42225-mr-icons' into 'master'
Resolve "MR widget components have different icons in CE and EE" Closes #42225 See merge request gitlab-org/gitlab-ce!16587
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
index 9230b5874df..073f26cc78f 100644
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
@@ -170,14 +170,14 @@ describe('MRWidgetReadyToMerge', () => {
expect(vm.iconClass).toEqual('success');
});
- it('shows x for failed status', () => {
+ it('shows warning icon for failed status', () => {
vm.mr.hasCI = true;
- expect(vm.iconClass).toEqual('failed');
+ expect(vm.iconClass).toEqual('warning');
});
- it('shows x for merge not allowed', () => {
+ it('shows warning icon for merge not allowed', () => {
vm.mr.hasCI = true;
- expect(vm.iconClass).toEqual('failed');
+ expect(vm.iconClass).toEqual('warning');
});
});