diff options
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js | 4 |
1 files changed, 0 insertions, 4 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 70724c2d13f..7216ad00cc1 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 @@ -97,10 +97,6 @@ describe('Merge request widget rebase component', () => { const elem = vm.$el.querySelector('.rebase-state-find-class-convention span'); - expect(elem.textContent.trim()).toContain( - `Fast-forward merge is not possible. Rebase the source branch onto ${targetBranch} to allow this merge request to be merged.`, - ); - expect(elem.innerHTML).toContain( `Fast-forward merge is not possible. Rebase the source branch onto <span class="label-branch">${targetBranch}</span> to allow this merge request to be merged.`, ); |