Merge branch '60808-only-show-target-branch-advanced-error-before-merge' into 'master'

Don't show the "target branch advanced" error message after merge

Closes #60808

See merge request gitlab-org/gitlab-ce!27588

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
index 690fcd3e224..a0628fdcebe 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -228,6 +228,7 @@ describe('mrWidgetOptions', () => {
     describe('showTargetBranchAdvancedError', () => {
       describe(`when the pipeline's target_sha property doesn't exist`, () => {
         beforeEach(done => {
+          Vue.set(vm.mr, 'isOpen', true);
           Vue.set(vm.mr.pipeline, 'target_sha', undefined);
           Vue.set(vm.mr, 'targetBranchSha', 'abcd');
           vm.$nextTick(done);
@@ -240,6 +241,7 @@ describe('mrWidgetOptions', () => {
 
       describe(`when the pipeline's target_sha matches the target branch's sha`, () => {
         beforeEach(done => {
+          Vue.set(vm.mr, 'isOpen', true);
           Vue.set(vm.mr.pipeline, 'target_sha', 'abcd');
           Vue.set(vm.mr, 'targetBranchSha', 'abcd');
           vm.$nextTick(done);
@@ -250,8 +252,22 @@ describe('mrWidgetOptions', () => {
         });
       });
 
+      describe(`when the merge request is not open`, () => {
+        beforeEach(done => {
+          Vue.set(vm.mr, 'isOpen', false);
+          Vue.set(vm.mr.pipeline, 'target_sha', 'abcd');
+          Vue.set(vm.mr, 'targetBranchSha', 'bcde');
+          vm.$nextTick(done);
+        });
+
+        it('should be false', () => {
+          expect(vm.showTargetBranchAdvancedError).toEqual(false);
+        });
+      });
+
       describe(`when the pipeline's target_sha does not match the target branch's sha`, () => {
         beforeEach(done => {
+          Vue.set(vm.mr, 'isOpen', true);
           Vue.set(vm.mr.pipeline, 'target_sha', 'abcd');
           Vue.set(vm.mr, 'targetBranchSha', 'bcde');
           vm.$nextTick(done);