From c01444a79bc1d1dc1576b1d1e71680b27199f48d Mon Sep 17 00:00:00 2001
From: Harry Kiselev <harry.kiselev@gmail.com>
Date: Tue, 25 Dec 2018 23:41:32 +0300
Subject: Update condition to visibility collaboration status text, #44642.

---
 .../vue_mr_widget/mr_widget_options_spec.js        | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'spec')

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 f72bf627c10..47198d069ee 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -132,6 +132,53 @@ describe('mrWidgetOptions', () => {
         expect(vm.shouldRenderSourceBranchRemovalStatus).toEqual(false);
       });
     });
+
+    describe('shouldRenderCollaborationStatus', () => {
+      describe('when collaboration is allowed', () => {
+        beforeEach(() => {
+          vm.mr.allowCollaboration = true;
+        });
+
+        describe('when merge request is opened', () => {
+          beforeEach(done => {
+            vm.mr.isOpen = true;
+            vm.$nextTick(done);
+          });
+
+          it('should render collaboration status', () => {
+            expect(vm.$el.textContent).toContain('Allows commits from members');
+          });
+        });
+
+        describe('when merge request is not opened', () => {
+          beforeEach(done => {
+            vm.mr.isOpen = false;
+            vm.$nextTick(done);
+          });
+
+          it('should not render collaboration status', () => {
+            expect(vm.$el.textContent).not.toContain('Allows commits from members');
+          });
+        });
+      });
+
+      describe('when collaboration is not allowed', () => {
+        beforeEach(() => {
+          vm.mr.allowCollaboration = false;
+        });
+
+        describe('when merge request is opened', () => {
+          beforeEach(done => {
+            vm.mr.isOpen = true;
+            vm.$nextTick(done);
+          });
+
+          it('should not render collaboration status', () => {
+            expect(vm.$el.textContent).not.toContain('Allows commits from members');
+          });
+        });
+      });
+    });
   });
 
   describe('methods', () => {
-- 
cgit v1.2.3


From 8a7a9506a1f2fec0995aa15a1da12de8dbbf4eb8 Mon Sep 17 00:00:00 2001
From: Harry Kiselev <harry.kiselev@gmail.com>
Date: Thu, 27 Dec 2018 16:58:40 +0300
Subject: Move merge request collaboration message into a constant.

---
 spec/javascripts/vue_mr_widget/mr_widget_options_spec.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'spec')

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 47198d069ee..99b80df766a 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -18,6 +18,8 @@ describe('mrWidgetOptions', () => {
   let vm;
   let MrWidgetOptions;
 
+  const COLLABORATION_MESSAGE = 'Allows commits from members who can merge to the target branch';
+
   beforeEach(() => {
     // Prevent component mounting
     delete mrWidgetOptions.el;
@@ -146,7 +148,7 @@ describe('mrWidgetOptions', () => {
           });
 
           it('should render collaboration status', () => {
-            expect(vm.$el.textContent).toContain('Allows commits from members');
+            expect(vm.$el.textContent).toContain(COLLABORATION_MESSAGE);
           });
         });
 
@@ -157,7 +159,7 @@ describe('mrWidgetOptions', () => {
           });
 
           it('should not render collaboration status', () => {
-            expect(vm.$el.textContent).not.toContain('Allows commits from members');
+            expect(vm.$el.textContent).not.toContain(COLLABORATION_MESSAGE);
           });
         });
       });
@@ -174,7 +176,7 @@ describe('mrWidgetOptions', () => {
           });
 
           it('should not render collaboration status', () => {
-            expect(vm.$el.textContent).not.toContain('Allows commits from members');
+            expect(vm.$el.textContent).not.toContain(COLLABORATION_MESSAGE);
           });
         });
       });
-- 
cgit v1.2.3