diff options
Diffstat (limited to 'spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js')
-rw-r--r-- | spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js index fee78d3af94..e1bce7f0474 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js @@ -199,7 +199,7 @@ describe('MRWidgetConflicts', () => { }); expect(removeBreakLine(wrapper.text()).trim()).toContain( - 'Fast-forward merge is not possible. To merge this request, first rebase locally.', + 'Merge blocked: fast-forward merge is not possible. To merge this request, first rebase locally.', ); }); }); |