Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/frontend/diffs/store/getters_versions_dropdowns_spec.js b/spec/frontend/diffs/store/getters_versions_dropdowns_spec.js
index 0343ef75732..eb0f2364a50 100644
--- a/spec/frontend/diffs/store/getters_versions_dropdowns_spec.js
+++ b/spec/frontend/diffs/store/getters_versions_dropdowns_spec.js
@@ -18,6 +18,7 @@ describe('Compare diff version dropdowns', () => {
     };
     localState.targetBranchName = 'baseVersion';
     localState.mergeRequestDiffs = diffsMockData;
+    gon.features = { diffCompareWithHead: true };
   });
 
   describe('selectedTargetIndex', () => {
@@ -128,6 +129,14 @@ describe('Compare diff version dropdowns', () => {
       });
       assertVersions(targetVersions);
     });
+
+    it('does not list head version if feature flag is not enabled', () => {
+      gon.features = { diffCompareWithHead: false };
+      setupTest();
+      const targetVersions = getters.diffCompareDropdownTargetVersions(localState, getters);
+
+      expect(targetVersions.find(version => version.isHead)).toBeUndefined();
+    });
   });
 
   it('diffCompareDropdownSourceVersions', () => {