Merge branch 'ide-hide-merge-request-if-disabled' into 'master'

Hide merge request option in IDE when merge requests are disabled

Closes #45698

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

3 files changed, 18 insertions, 0 deletions

diff --git a/spec/javascripts/ide/components/commit_sidebar/actions_spec.js b/spec/javascripts/ide/components/commit_sidebar/actions_spec.js
index 144e78d14b5..27f10caccb1 100644
--- a/spec/javascripts/ide/components/commit_sidebar/actions_spec.js
+++ b/spec/javascripts/ide/components/commit_sidebar/actions_spec.js
@@ -3,6 +3,7 @@ import store from '~/ide/stores';
 import commitActions from '~/ide/components/commit_sidebar/actions.vue';
 import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
 import { resetStore } from 'spec/ide/helpers';
+import { projectData } from 'spec/ide/mock_data';
 
 describe('IDE commit sidebar actions', () => {
   let vm;
@@ -13,6 +14,8 @@ describe('IDE commit sidebar actions', () => {
     vm = createComponentWithStore(Component, store);
 
     vm.$store.state.currentBranchId = 'master';
+    vm.$store.state.currentProjectId = 'abcproject';
+    Vue.set(vm.$store.state.projects, 'abcproject', { ...projectData });
 
     vm.$mount();
 
@@ -32,4 +35,15 @@ describe('IDE commit sidebar actions', () => {
   it('renders current branch text', () => {
     expect(vm.$el.textContent).toContain('Commit to master branch');
   });
+
+  it('hides merge request option when project merge requests are disabled', done => {
+    vm.$store.state.projects.abcproject.merge_requests_enabled = false;
+
+    vm.$nextTick(() => {
+      expect(vm.$el.querySelectorAll('input[type="radio"]').length).toBe(2);
+      expect(vm.$el.textContent).not.toContain('Create a new branch and merge request');
+
+      done();
+    });
+  });
 });
diff --git a/spec/javascripts/ide/components/commit_sidebar/form_spec.js b/spec/javascripts/ide/components/commit_sidebar/form_spec.js
index ce7c134bc97..8b47a365582 100644
--- a/spec/javascripts/ide/components/commit_sidebar/form_spec.js
+++ b/spec/javascripts/ide/components/commit_sidebar/form_spec.js
@@ -4,6 +4,7 @@ import CommitForm from '~/ide/components/commit_sidebar/form.vue';
 import { activityBarViews } from '~/ide/constants';
 import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
 import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
+import { projectData } from 'spec/ide/mock_data';
 import { resetStore } from '../../helpers';
 
 describe('IDE commit form', () => {
@@ -14,6 +15,8 @@ describe('IDE commit form', () => {
     spyOnProperty(window, 'innerHeight').and.returnValue(800);
 
     store.state.changedFiles.push('test');
+    store.state.currentProjectId = 'abcproject';
+    Vue.set(store.state.projects, 'abcproject', { ...projectData });
 
     vm = createComponentWithStore(Component, store).$mount();
   });
diff --git a/spec/javascripts/ide/mock_data.js b/spec/javascripts/ide/mock_data.js
index 3c6d75ab5e4..c059862b9d1 100644
--- a/spec/javascripts/ide/mock_data.js
+++ b/spec/javascripts/ide/mock_data.js
@@ -12,4 +12,5 @@ export const projectData = {
     },
   },
   mergeRequests: {},
+  merge_requests_enabled: true,
 };