diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-08-07 12:29:37 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-08-07 13:20:33 +1000 |
| commit | bce029a23bc0c46088da989aa053f20438b2f2db (patch) | |
| tree | f6947ce68995053ab1426f39ed2ef1abc6b22a39 /spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js | |
| parent | 4b3011e1c20077470ce946d703d98259f88ef268 (diff) | |
| download | gitlab-ce-bce029a23bc0c46088da989aa053f20438b2f2db.tar.gz | |
clean up merge request widget UI
Diffstat (limited to 'spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js index 47b4ba893e0..6042d7384d5 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js @@ -24,8 +24,8 @@ describe('MRWidgetAutoMergeFailed', () => { it('should have correct elements', () => { expect(vm.$el.classList.contains('mr-widget-body')).toBeTruthy(); - expect(vm.$el.querySelector('button').getAttribute('disabled')).toBeTruthy(); - expect(vm.$el.innerText).toContain('This merge request failed to be merged automatically.'); + expect(vm.$el.querySelector('button').getAttribute('disabled')).toBeFalsy(); + expect(vm.$el.innerText).toContain('This merge request failed to be merged automatically'); expect(vm.$el.innerText).toContain(mergeError); }); }); |