Default MR checkbox to true in most cases60034-default-web-ide-s-merge-request-checkbox-to-true

- Pull the new MR option out into it's own component
- Default MR checkbox to true when creating a new MR and committing to a
  branch that does not have an MR
- Still change the MR checkbox to false when a user is on a branch that
  already has an MR
- Hide MR option when on a branch that already has an MR and committing
  to current branch
- Don't default to true when committing directly to master

7 files changed, 276 insertions, 74 deletions

diff --git a/spec/frontend/ide/stores/modules/commit/mutations_spec.js b/spec/frontend/ide/stores/modules/commit/mutations_spec.js
index 40d47aaad03..246500a2f34 100644
--- a/spec/frontend/ide/stores/modules/commit/mutations_spec.js
+++ b/spec/frontend/ide/stores/modules/commit/mutations_spec.js
@@ -54,5 +54,20 @@ describe('IDE commit module mutations', () => {
 
       expect(state.shouldCreateMR).toBe(false);
     });
+
+    it('sets shouldCreateMR to given value when passed in', () => {
+      state.shouldCreateMR = false;
+      mutations.TOGGLE_SHOULD_CREATE_MR(state, false);
+
+      expect(state.shouldCreateMR).toBe(false);
+    });
+  });
+
+  describe('INTERACT_WITH_NEW_MR', () => {
+    it('sets interactedWithNewMR to true', () => {
+      mutations.INTERACT_WITH_NEW_MR(state);
+
+      expect(state.interactedWithNewMR).toBe(true);
+    });
   });
 });
diff --git a/spec/javascripts/ide/components/commit_sidebar/actions_spec.js b/spec/javascripts/ide/components/commit_sidebar/actions_spec.js
index 23e6a055518..b903abe63fc 100644
--- a/spec/javascripts/ide/components/commit_sidebar/actions_spec.js
+++ b/spec/javascripts/ide/components/commit_sidebar/actions_spec.js
@@ -73,47 +73,4 @@ describe('IDE commit sidebar actions', () => {
       expect(vm.commitToCurrentBranchText).not.toContain(injectedSrc);
     });
   });
-
-  describe('create new MR checkbox', () => {
-    it('disables `createMR` button when an MR already exists and committing to current branch', () => {
-      createComponent({ hasMR: true, commitAction: consts.COMMIT_TO_CURRENT_BRANCH });
-
-      expect(vm.$el.querySelector('input[type="checkbox"]').disabled).toBe(true);
-    });
-
-    it('does not disable checkbox if MR does not exist', () => {
-      createComponent({ hasMR: false });
-
-      expect(vm.$el.querySelector('input[type="checkbox"]').disabled).toBe(false);
-    });
-
-    it('does not disable checkbox when creating a new branch', () => {
-      createComponent({ commitAction: consts.COMMIT_TO_NEW_BRANCH });
-
-      expect(vm.$el.querySelector('input[type="checkbox"]').disabled).toBe(false);
-    });
-
-    it('toggles off new MR when switching back to commit to current branch and MR exists', () => {
-      createComponent({
-        commitAction: consts.COMMIT_TO_NEW_BRANCH,
-        shouldCreateMR: true,
-      });
-      const currentBranchRadio = vm.$el.querySelector(
-        `input[value="${consts.COMMIT_TO_CURRENT_BRANCH}"`,
-      );
-      currentBranchRadio.click();
-
-      vm.$nextTick(() => {
-        expect(vm.$store.state.commit.shouldCreateMR).toBe(false);
-      });
-    });
-
-    it('toggles `shouldCreateMR` when clicking checkbox', () => {
-      createComponent();
-      const el = vm.$el.querySelector('input[type="checkbox"]');
-      el.dispatchEvent(new Event('change'));
-
-      expect(vm.$store.state.commit.shouldCreateMR).toBe(true);
-    });
-  });
 });
diff --git a/spec/javascripts/ide/components/commit_sidebar/new_merge_request_option_spec.js b/spec/javascripts/ide/components/commit_sidebar/new_merge_request_option_spec.js
new file mode 100644
index 00000000000..7017bfcd6a6
--- /dev/null
+++ b/spec/javascripts/ide/components/commit_sidebar/new_merge_request_option_spec.js
@@ -0,0 +1,73 @@
+import Vue from 'vue';
+import store from '~/ide/stores';
+import consts from '~/ide/stores/modules/commit/constants';
+import NewMergeRequestOption from '~/ide/components/commit_sidebar/new_merge_request_option.vue';
+import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
+import { projectData } from 'spec/ide/mock_data';
+import { resetStore } from 'spec/ide/helpers';
+
+describe('create new MR checkbox', () => {
+  let vm;
+  const createComponent = ({
+    hasMR = false,
+    commitAction = consts.COMMIT_TO_NEW_BRANCH,
+    currentBranchId = 'master',
+  } = {}) => {
+    const Component = Vue.extend(NewMergeRequestOption);
+
+    vm = createComponentWithStore(Component, store);
+
+    vm.$store.state.currentBranchId = currentBranchId;
+    vm.$store.state.currentProjectId = 'abcproject';
+    vm.$store.state.commit.commitAction = commitAction;
+    Vue.set(vm.$store.state.projects, 'abcproject', { ...projectData });
+
+    if (hasMR) {
+      vm.$store.state.currentMergeRequestId = '1';
+      vm.$store.state.projects[store.state.currentProjectId].mergeRequests[
+        store.state.currentMergeRequestId
+      ] = { foo: 'bar' };
+    }
+
+    return vm.$mount();
+  };
+
+  afterEach(() => {
+    vm.$destroy();
+
+    resetStore(vm.$store);
+  });
+
+  it('is hidden when an MR already exists and committing to current branch', () => {
+    createComponent({
+      hasMR: true,
+      commitAction: consts.COMMIT_TO_CURRENT_BRANCH,
+      currentBranchId: 'feature',
+    });
+
+    expect(vm.$el.textContent).toBe('');
+  });
+
+  it('does not hide checkbox if MR does not exist', () => {
+    createComponent({ hasMR: false });
+
+    expect(vm.$el.querySelector('input[type="checkbox"]').hidden).toBe(false);
+  });
+
+  it('does not hide checkbox when creating a new branch', () => {
+    createComponent({ commitAction: consts.COMMIT_TO_NEW_BRANCH });
+
+    expect(vm.$el.querySelector('input[type="checkbox"]').hidden).toBe(false);
+  });
+
+  it('dispatches toggleShouldCreateMR when clicking checkbox', () => {
+    createComponent();
+    const el = vm.$el.querySelector('input[type="checkbox"]');
+    spyOn(vm.$store, 'dispatch');
+    el.dispatchEvent(new Event('change'));
+
+    expect(vm.$store.dispatch.calls.allArgs()).toEqual(
+      jasmine.arrayContaining([['commit/toggleShouldCreateMR', jasmine.any(Object)]]),
+    );
+  });
+});
diff --git a/spec/javascripts/ide/mock_data.js b/spec/javascripts/ide/mock_data.js
index 4fe826943b2..570a396c5e3 100644
--- a/spec/javascripts/ide/mock_data.js
+++ b/spec/javascripts/ide/mock_data.js
@@ -16,6 +16,7 @@ export const projectData = {
   },
   mergeRequests: {},
   merge_requests_enabled: true,
+  default_branch: 'master',
 };
 
 export const pipelines = [
diff --git a/spec/javascripts/ide/stores/getters_spec.js b/spec/javascripts/ide/stores/getters_spec.js
index 9c135661997..735bbd47f55 100644
--- a/spec/javascripts/ide/stores/getters_spec.js
+++ b/spec/javascripts/ide/stores/getters_spec.js
@@ -180,6 +180,38 @@ describe('IDE store getters', () => {
     });
   });
 
+  describe('isOnDefaultBranch', () => {
+    it('returns false when no project exists', () => {
+      const localGetters = {
+        currentProject: undefined,
+      };
+
+      expect(getters.isOnDefaultBranch({}, localGetters)).toBeFalsy();
+    });
+
+    it("returns true when project's default branch matches current branch", () => {
+      const localGetters = {
+        currentProject: {
+          default_branch: 'master',
+        },
+        branchName: 'master',
+      };
+
+      expect(getters.isOnDefaultBranch({}, localGetters)).toBeTruthy();
+    });
+
+    it("returns false when project's default branch doesn't match current branch", () => {
+      const localGetters = {
+        currentProject: {
+          default_branch: 'master',
+        },
+        branchName: 'feature',
+      };
+
+      expect(getters.isOnDefaultBranch({}, localGetters)).toBeFalsy();
+    });
+  });
+
   describe('packageJson', () => {
     it('returns package.json entry', () => {
       localState.entries['package.json'] = { name: 'package.json' };
diff --git a/spec/javascripts/ide/stores/modules/commit/actions_spec.js b/spec/javascripts/ide/stores/modules/commit/actions_spec.js
index 4413a12fac4..5f7272311c8 100644
--- a/spec/javascripts/ide/stores/modules/commit/actions_spec.js
+++ b/spec/javascripts/ide/stores/modules/commit/actions_spec.js
@@ -1,9 +1,12 @@
-import actions from '~/ide/stores/actions';
+import rootActions from '~/ide/stores/actions';
 import store from '~/ide/stores';
 import service from '~/ide/services';
 import router from '~/ide/ide_router';
 import eventHub from '~/ide/eventhub';
 import consts from '~/ide/stores/modules/commit/constants';
+import * as mutationTypes from '~/ide/stores/modules/commit/mutation_types';
+import * as actions from '~/ide/stores/modules/commit/actions';
+import testAction from '../../../../helpers/vuex_action_helper';
 import { commitActionTypes } from '~/ide/constants';
 import { resetStore, file } from 'spec/ide/helpers';
 
@@ -225,7 +228,7 @@ describe('IDE commit module actions', () => {
     let visitUrl;
 
     beforeEach(() => {
-      visitUrl = spyOnDependency(actions, 'visitUrl');
+      visitUrl = spyOnDependency(rootActions, 'visitUrl');
 
       document.body.innerHTML += '<div class="flash-container"></div>';
 
@@ -523,4 +526,154 @@ describe('IDE commit module actions', () => {
       });
     });
   });
+
+  describe('toggleShouldCreateMR', () => {
+    it('commits both toggle and interacting with MR checkbox actions', done => {
+      testAction(
+        actions.toggleShouldCreateMR,
+        {},
+        store.state,
+        [
+          { type: mutationTypes.TOGGLE_SHOULD_CREATE_MR },
+          { type: mutationTypes.INTERACT_WITH_NEW_MR },
+        ],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('setShouldCreateMR', () => {
+    beforeEach(() => {
+      store.state.projects = {
+        project: {
+          default_branch: 'master',
+          branches: {
+            master: {
+              name: 'master',
+            },
+            feature: {
+              name: 'feature',
+            },
+          },
+        },
+      };
+
+      store.state.currentProjectId = 'project';
+    });
+
+    it('sets to false when the current branch already has an MR', done => {
+      store.state.commit.currentMergeRequestId = 1;
+      store.state.commit.commitAction = consts.COMMIT_TO_CURRENT_BRANCH;
+      store.state.currentMergeRequestId = '1';
+      store.state.currentBranchId = 'feature';
+      spyOn(store, 'commit').and.callThrough();
+
+      store
+        .dispatch('commit/setShouldCreateMR')
+        .then(() => {
+          expect(store.commit.calls.allArgs()[0]).toEqual(
+            jasmine.arrayContaining([`commit/${mutationTypes.TOGGLE_SHOULD_CREATE_MR}`, false]),
+          );
+          done();
+        })
+        .catch(done.fail);
+    });
+
+    it('changes to false when current branch is the default branch and user has not interacted', done => {
+      store.state.commit.interactedWithNewMR = false;
+      store.state.currentBranchId = 'master';
+      store.state.commit.commitAction = consts.COMMIT_TO_CURRENT_BRANCH;
+      spyOn(store, 'commit').and.callThrough();
+
+      store
+        .dispatch('commit/setShouldCreateMR')
+        .then(() => {
+          expect(store.commit.calls.allArgs()[0]).toEqual(
+            jasmine.arrayContaining([`commit/${mutationTypes.TOGGLE_SHOULD_CREATE_MR}`, false]),
+          );
+          done();
+        })
+        .catch(done.fail);
+    });
+
+    it('changes to true when "create new branch" is selected and user has not interacted', done => {
+      store.state.commit.commitAction = consts.COMMIT_TO_NEW_BRANCH;
+      store.state.commit.interactedWithNewMR = false;
+      spyOn(store, 'commit').and.callThrough();
+
+      store
+        .dispatch('commit/setShouldCreateMR')
+        .then(() => {
+          expect(store.commit.calls.allArgs()[0]).toEqual(
+            jasmine.arrayContaining([`commit/${mutationTypes.TOGGLE_SHOULD_CREATE_MR}`, true]),
+          );
+          done();
+        })
+        .catch(done.fail);
+    });
+
+    it('does not change anything if user has interacted and comitting to new branch', done => {
+      store.state.commit.commitAction = consts.COMMIT_TO_NEW_BRANCH;
+      store.state.commit.interactedWithNewMR = true;
+      spyOn(store, 'commit').and.callThrough();
+
+      store
+        .dispatch('commit/setShouldCreateMR')
+        .then(() => {
+          expect(store.commit).not.toHaveBeenCalled();
+          done();
+        })
+        .catch(done.fail);
+    });
+
+    it('does not change anything if user has interacted and comitting to branch without MR', done => {
+      store.state.commit.commitAction = consts.COMMIT_TO_CURRENT_BRANCH;
+      store.state.commit.currentMergeRequestId = null;
+      store.state.commit.interactedWithNewMR = true;
+      spyOn(store, 'commit').and.callThrough();
+
+      store
+        .dispatch('commit/setShouldCreateMR')
+        .then(() => {
+          expect(store.commit).not.toHaveBeenCalled();
+          done();
+        })
+        .catch(done.fail);
+    });
+
+    it('still changes to false if hiding the checkbox', done => {
+      store.state.currentBranchId = 'feature';
+      store.state.commit.commitAction = consts.COMMIT_TO_CURRENT_BRANCH;
+      store.state.currentMergeRequestId = '1';
+      store.state.commit.interactedWithNewMR = true;
+      spyOn(store, 'commit').and.callThrough();
+
+      store
+        .dispatch('commit/setShouldCreateMR')
+        .then(() => {
+          expect(store.commit.calls.allArgs()[0]).toEqual(
+            jasmine.arrayContaining([`commit/${mutationTypes.TOGGLE_SHOULD_CREATE_MR}`, false]),
+          );
+          done();
+        })
+        .catch(done.fail);
+    });
+
+    it('does not change to false when on master and user has interacted even if MR exists', done => {
+      store.state.currentBranchId = 'master';
+      store.state.commit.commitAction = consts.COMMIT_TO_CURRENT_BRANCH;
+      store.state.currentMergeRequestId = '1';
+      store.state.commit.interactedWithNewMR = true;
+      spyOn(store, 'commit').and.callThrough();
+
+      store
+        .dispatch('commit/setShouldCreateMR')
+        .then(() => {
+          expect(store.commit).not.toHaveBeenCalled();
+          done();
+        })
+        .catch(done.fail);
+    });
+  });
 });
diff --git a/spec/javascripts/ide/stores/modules/commit/getters_spec.js b/spec/javascripts/ide/stores/modules/commit/getters_spec.js
index e00fd7199d7..6e71a790deb 100644
--- a/spec/javascripts/ide/stores/modules/commit/getters_spec.js
+++ b/spec/javascripts/ide/stores/modules/commit/getters_spec.js
@@ -144,33 +144,4 @@ describe('IDE commit module getters', () => {
       });
     });
   });
-
-  describe('shouldDisableNewMrOption', () => {
-    it('returns false if commitAction `COMMIT_TO_NEW_BRANCH`', () => {
-      state.commitAction = consts.COMMIT_TO_NEW_BRANCH;
-      const rootState = {
-        currentMergeRequest: { foo: 'bar' },
-      };
-
-      expect(getters.shouldDisableNewMrOption(state, null, null, rootState)).toBeFalsy();
-    });
-
-    it('returns false if there is no current merge request', () => {
-      state.commitAction = consts.COMMIT_TO_CURRENT_BRANCH;
-      const rootState = {
-        currentMergeRequest: null,
-      };
-
-      expect(getters.shouldDisableNewMrOption(state, null, null, rootState)).toBeFalsy();
-    });
-
-    it('returns true an MR exists and commit action is `COMMIT_TO_CURRENT_BRANCH`', () => {
-      state.commitAction = consts.COMMIT_TO_CURRENT_BRANCH;
-      const rootState = {
-        currentMergeRequest: { foo: 'bar' },
-      };
-
-      expect(getters.shouldDisableNewMrOption(state, null, null, rootState)).toBeTruthy();
-    });
-  });
 });