diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:22 +0300 |
commit | 286fe61013674fe2d245ffc8d2233baf09923e70 (patch) | |
tree | 2037291f5863105e54e75be056b49f7d62007cae /spec/javascripts/ide/components/repo_commit_section_spec.js | |
parent | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/ide/components/repo_commit_section_spec.js')
-rw-r--r-- | spec/javascripts/ide/components/repo_commit_section_spec.js | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/spec/javascripts/ide/components/repo_commit_section_spec.js b/spec/javascripts/ide/components/repo_commit_section_spec.js index 917eb1438bd..0ba8c86a036 100644 --- a/spec/javascripts/ide/components/repo_commit_section_spec.js +++ b/spec/javascripts/ide/components/repo_commit_section_spec.js @@ -30,19 +30,13 @@ describe('RepoCommitSection', () => { const files = [file('file1'), file('file2')].map(f => Object.assign(f, { type: 'blob', + content: 'orginal content', }), ); vm.$store.state.rightPanelCollapsed = false; vm.$store.state.currentBranch = 'master'; - vm.$store.state.changedFiles = [...files]; - vm.$store.state.changedFiles.forEach(f => - Object.assign(f, { - changed: true, - content: 'changedFile testing', - }), - ); - + vm.$store.state.changedFiles = []; vm.$store.state.stagedFiles = [{ ...files[0] }, { ...files[1] }]; vm.$store.state.stagedFiles.forEach(f => Object.assign(f, { @@ -51,7 +45,7 @@ describe('RepoCommitSection', () => { }), ); - vm.$store.state.changedFiles.forEach(f => { + files.forEach(f => { vm.$store.state.entries[f.path] = f; }); @@ -96,7 +90,7 @@ describe('RepoCommitSection', () => { const changedFileElements = [...vm.$el.querySelectorAll('.multi-file-commit-list > li')]; const allFiles = vm.$store.state.changedFiles.concat(vm.$store.state.stagedFiles); - expect(changedFileElements.length).toEqual(4); + expect(changedFileElements).toHaveLength(2); changedFileElements.forEach((changedFile, i) => { expect(changedFile.textContent.trim()).toContain(allFiles[i].path); |