diff options
| author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-08-21 13:28:12 +0000 |
|---|---|---|
| committer | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-08-21 23:30:19 +1000 |
| commit | 6c7b5f565f5601269c2a7009fd050198e09c7262 (patch) | |
| tree | 828f77d6dbf60e06113244d81c915200e56546c3 | |
| parent | cd2518acae92054e52357307ad1f9b6fc571f059 (diff) | |
| download | gitlab-ce-66331-html-code-shown-in-merge-request.tar.gz | |
Removed extra assertion in spec66331-html-code-shown-in-merge-request
| -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.`, ); |