diff options
Diffstat (limited to 'spec/javascripts/ide/components')
3 files changed, 15 insertions, 31 deletions
diff --git a/spec/javascripts/ide/components/commit_sidebar/form_spec.js b/spec/javascripts/ide/components/commit_sidebar/form_spec.js index 5cb804938ed..f5d1a9de59c 100644 --- a/spec/javascripts/ide/components/commit_sidebar/form_spec.js +++ b/spec/javascripts/ide/components/commit_sidebar/form_spec.js @@ -52,7 +52,7 @@ describe('IDE commit form', () => { vm.$store.state.stagedFiles.push('test'); vm.$nextTick(() => { - expect(vm.$el.querySelector('p').textContent).toContain('1 staged and 1 unstaged changes'); + expect(vm.$el.querySelector('p').textContent).toContain('1 changed file'); done(); }); }); diff --git a/spec/javascripts/ide/components/file_row_extra_spec.js b/spec/javascripts/ide/components/file_row_extra_spec.js index f498d8251c8..9fd014b50ef 100644 --- a/spec/javascripts/ide/components/file_row_extra_spec.js +++ b/spec/javascripts/ide/components/file_row_extra_spec.js @@ -41,30 +41,20 @@ describe('IDE extra file row component', () => { describe('folderChangesTooltip', () => { it('returns undefined when changes count is 0', () => { - expect(vm.folderChangesTooltip).toBe(undefined); - }); - - it('returns unstaged changes text', () => { - changesCount = 1; - unstagedFilesCount = 1; - - expect(vm.folderChangesTooltip).toBe('1 unstaged change'); - }); + changesCount = 0; - it('returns staged changes text', () => { - changesCount = 1; - stagedFilesCount = 1; - - expect(vm.folderChangesTooltip).toBe('1 staged change'); + expect(vm.folderChangesTooltip).toBe(undefined); }); - it('returns staged and unstaged changes text', () => { - changesCount = 1; - stagedFilesCount = 1; - unstagedFilesCount = 1; + [{ input: 1, output: '1 changed file' }, { input: 2, output: '2 changed files' }].forEach( + ({ input, output }) => { + it('returns changed files count if changes count is not 0', () => { + changesCount = input; - expect(vm.folderChangesTooltip).toBe('1 staged and 1 unstaged changes'); - }); + expect(vm.folderChangesTooltip).toBe(output); + }); + }, + ); }); describe('show tree changes count', () => { 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); |