diff options
Diffstat (limited to 'spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js index b453d180a40..25763634671 100644 --- a/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js +++ b/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js @@ -40,6 +40,7 @@ describe('Merge request widget rebase component', () => { it('it should render rebase button and warning message', () => { const text = vm.$el.querySelector('.rebase-state-find-class-convention span').textContent.trim(); + expect(text).toContain('Fast-forward merge is not possible.'); expect(text).toContain('Rebase the source branch onto the target branch or merge target'); expect(text).toContain('branch into source branch to allow this merge request to be merged.'); |