Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 18 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 212519743aa..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
@@ -83,6 +83,24 @@ describe('Merge request widget rebase component', () => {
       expect(text).toContain('foo');
       expect(text.replace(/\s\s+/g, ' ')).toContain('to allow this merge request to be merged.');
     });
+
+    it('should render the correct target branch name', () => {
+      const targetBranch = 'fake-branch-to-test-with';
+      vm = mountComponent(Component, {
+        mr: {
+          rebaseInProgress: false,
+          canPushToSourceBranch: false,
+          targetBranch,
+        },
+        service: {},
+      });
+
+      const elem = vm.$el.querySelector('.rebase-state-find-class-convention span');
+
+      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.`,
+      );
+    });
   });
 
   describe('methods', () => {