diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 01:43:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 01:43:31 +0000 |
commit | e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d (patch) | |
tree | cf76b0527f1909eaf1ecac057a4ccc7591cce4f6 /spec/frontend | |
parent | 5fc725def41e6973e92bc32095774edd60fd154f (diff) | |
download | gitlab-ce-e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d.tar.gz |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'spec/frontend')
-rw-r--r-- | spec/frontend/diffs/store/getters_versions_dropdowns_spec.js | 9 | ||||
-rw-r--r-- | spec/frontend/ide/stores/mutations_spec.js | 4 |
2 files changed, 12 insertions, 1 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', () => { diff --git a/spec/frontend/ide/stores/mutations_spec.js b/spec/frontend/ide/stores/mutations_spec.js index d9ce59ad378..5d0fe35a10e 100644 --- a/spec/frontend/ide/stores/mutations_spec.js +++ b/spec/frontend/ide/stores/mutations_spec.js @@ -273,7 +273,7 @@ describe('Multi-file store mutations', () => { expect(localState.changedFiles).toEqual([]); }); - it('removes tempFile from changedFiles when deleted', () => { + it('removes tempFile from changedFiles and stagedFiles when deleted', () => { localState.entries.filePath = { path: 'filePath', deleted: false, @@ -282,10 +282,12 @@ describe('Multi-file store mutations', () => { }; localState.changedFiles.push({ ...localState.entries.filePath }); + localState.stagedFiles.push({ ...localState.entries.filePath }); mutations.DELETE_ENTRY(localState, 'filePath'); expect(localState.changedFiles).toEqual([]); + expect(localState.stagedFiles).toEqual([]); }); it('bursts unused seal', () => { |