diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 09:09:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 09:09:21 +0300 |
commit | c8df22c555ab707a705e57c4257fd3ed1ce7c3b0 (patch) | |
tree | 009fb7c1ff12a6192921212cae404b790fd7d66b /spec/frontend | |
parent | 9345f69894862e02f3491ea3136c3ed2b23fd5b8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
-rw-r--r-- | spec/frontend/diffs/components/diff_file_row_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/vue_shared/components/changed_file_icon_spec.js | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/frontend/diffs/components/diff_file_row_spec.js b/spec/frontend/diffs/components/diff_file_row_spec.js index 9b7a16d0cb5..856622b89cb 100644 --- a/spec/frontend/diffs/components/diff_file_row_spec.js +++ b/spec/frontend/diffs/components/diff_file_row_spec.js @@ -44,12 +44,14 @@ describe('Diff File Row component', () => { level: 4, file: {}, hideFileStats: false, + showTooltip: true, }); expect(wrapper.find(ChangedFileIcon).props()).toEqual( expect.objectContaining({ file: {}, size: 16, + showTooltip: true, }), ); }); 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 b77116be464..03519a6f803 100644 --- a/spec/frontend/vue_shared/components/changed_file_icon_spec.js +++ b/spec/frontend/vue_shared/components/changed_file_icon_spec.js @@ -5,6 +5,7 @@ import Icon from '~/vue_shared/components/icon.vue'; const changedFile = () => ({ changed: true }); const stagedFile = () => ({ changed: true, staged: true }); const newFile = () => ({ changed: true, tempFile: true }); +const deletedFile = () => ({ changed: false, tempFile: false, staged: false, deleted: true }); const unchangedFile = () => ({ changed: false, tempFile: false, staged: false, deleted: false }); describe('Changed file icon', () => { @@ -58,6 +59,7 @@ describe('Changed file icon', () => { ${changedFile()} | ${'file-modified'} | ${'Modified'} | ${'with file changed'} ${stagedFile()} | ${'file-modified-solid'} | ${'Modified'} | ${'with file staged'} ${newFile()} | ${'file-addition'} | ${'Added'} | ${'with file new'} + ${deletedFile()} | ${'file-deletion'} | ${'Deleted'} | ${'with file deleted'} `('$desc', ({ file, iconName, tooltipText }) => { beforeEach(() => { factory({ file }); |