diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
| commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
| tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/frontend/ide/stores/mutations/file_spec.js | |
| parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/frontend/ide/stores/mutations/file_spec.js')
| -rw-r--r-- | spec/frontend/ide/stores/mutations/file_spec.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/frontend/ide/stores/mutations/file_spec.js b/spec/frontend/ide/stores/mutations/file_spec.js index 825d2a546cd..1453f26c1d9 100644 --- a/spec/frontend/ide/stores/mutations/file_spec.js +++ b/spec/frontend/ide/stores/mutations/file_spec.js @@ -319,8 +319,8 @@ describe('IDE store file mutations', () => { localFile.content = 'test'; localFile.changed = true; localState.currentProjectId = 'gitlab-ce'; - localState.currentBranchId = 'master'; - localState.trees['gitlab-ce/master'] = { + localState.currentBranchId = 'main'; + localState.trees['gitlab-ce/main'] = { tree: [], }; }); @@ -337,7 +337,7 @@ describe('IDE store file mutations', () => { mutations.DISCARD_FILE_CHANGES(localState, localFile.path); - expect(localState.trees['gitlab-ce/master'].tree).toEqual([{ ...localFile, deleted: false }]); + expect(localState.trees['gitlab-ce/main'].tree).toEqual([{ ...localFile, deleted: false }]); }); it('adds to parent tree if deleted', () => { |