Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 6 insertions, 3 deletions

diff --git a/spec/frontend/diffs/components/compare_versions_spec.js b/spec/frontend/diffs/components/compare_versions_spec.js
index a01ec1db35c..80a51ee137a 100644
--- a/spec/frontend/diffs/components/compare_versions_spec.js
+++ b/spec/frontend/diffs/components/compare_versions_spec.js
@@ -19,8 +19,11 @@ describe('CompareVersions', () => {
   const targetBranchName = 'tmp-wine-dev';
   const { commit } = getDiffWithCommit();
 
-  const createWrapper = (props = {}, commitArgs = {}) => {
-    store.state.diffs.commit = { ...store.state.diffs.commit, ...commitArgs };
+  const createWrapper = (props = {}, commitArgs = {}, createCommit = true) => {
+    if (createCommit) {
+      store.state.diffs.commit = { ...store.state.diffs.commit, ...commitArgs };
+    }
+
     wrapper = mount(CompareVersionsComponent, {
       localVue,
       store,
@@ -59,7 +62,7 @@ describe('CompareVersions', () => {
 
   describe('template', () => {
     beforeEach(() => {
-      createWrapper();
+      createWrapper({}, {}, false);
     });
 
     it('should render Tree List toggle button with correct attribute values', () => {