diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 21:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 21:08:47 +0300 |
| commit | 6b9d3a4e8351e662c4586b24bb152de78ae9e3bf (patch) | |
| tree | 883e9db60c047c54418fc1d2b1c5517f97e0f185 /spec/frontend/vue_shared/components/changed_file_icon_spec.js | |
| parent | 23288f62da73fb0e30d8e7ce306665e8fda1b932 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/vue_shared/components/changed_file_icon_spec.js')
| -rw-r--r-- | spec/frontend/vue_shared/components/changed_file_icon_spec.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/spec/frontend/vue_shared/components/changed_file_icon_spec.js b/spec/frontend/vue_shared/components/changed_file_icon_spec.js index 5d2aec6734f..8258eb8204c 100644 --- a/spec/frontend/vue_shared/components/changed_file_icon_spec.js +++ b/spec/frontend/vue_shared/components/changed_file_icon_spec.js @@ -3,8 +3,7 @@ import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; import Icon from '~/vue_shared/components/icon.vue'; const changedFile = () => ({ changed: true }); -const stagedFile = () => ({ changed: false, staged: true }); -const changedAndStagedFile = () => ({ changed: true, staged: true }); +const stagedFile = () => ({ changed: true, staged: true }); const newFile = () => ({ changed: true, tempFile: true }); const unchangedFile = () => ({ changed: false, tempFile: false, staged: false, deleted: false }); @@ -55,11 +54,10 @@ describe('Changed file icon', () => { }); describe.each` - file | iconName | tooltipText | desc - ${changedFile()} | ${'file-modified'} | ${'Unstaged modification'} | ${'with file changed'} - ${stagedFile()} | ${'file-modified-solid'} | ${'Staged modification'} | ${'with file staged'} - ${changedAndStagedFile()} | ${'file-modified'} | ${'Unstaged and staged modification'} | ${'with file changed and staged'} - ${newFile()} | ${'file-addition'} | ${'Unstaged addition'} | ${'with file new'} + file | iconName | tooltipText | desc + ${changedFile()} | ${'file-modified'} | ${'Unstaged modification'} | ${'with file changed'} + ${stagedFile()} | ${'file-modified-solid'} | ${'Staged modification'} | ${'with file staged'} + ${newFile()} | ${'file-addition'} | ${'Unstaged addition'} | ${'with file new'} `('$desc', ({ file, iconName, tooltipText }) => { beforeEach(() => { factory({ file }); |