diff options
author | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-16 08:58:14 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-08-16 08:58:14 +0000 |
commit | 79bdb155b629fde0a68d8825759a40cfcfe215f6 (patch) | |
tree | 549372ee1f731cea4804322030979a72efa5140d /app/assets | |
parent | a0ec8e9c7dbc7e175cf9313f5704828c23ef3b6b (diff) | |
download | gitlab-ce-79bdb155b629fde0a68d8825759a40cfcfe215f6.tar.gz |
Rewrite changed_file_icon_spec in Jest
- Uses vue-test-utils
- More complete coverage with parameterized tests
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/ide/components/file_row_extra.vue | 1 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/changed_file_icon.vue | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/javascripts/ide/components/file_row_extra.vue b/app/assets/javascripts/ide/components/file_row_extra.vue index 80a6ab9598a..7254c50a568 100644 --- a/app/assets/javascripts/ide/components/file_row_extra.vue +++ b/app/assets/javascripts/ide/components/file_row_extra.vue @@ -87,7 +87,6 @@ export default { :file="file" :show-tooltip="true" :show-staged-icon="true" - :force-modified-icon="true" /> <new-dropdown :type="file.type" diff --git a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue index cdf2d1020ba..beb2ac09992 100644 --- a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue +++ b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue @@ -26,11 +26,6 @@ export default { required: false, default: false, }, - forceModifiedIcon: { - type: Boolean, - required: false, - default: false, - }, size: { type: Number, required: false, @@ -48,8 +43,6 @@ export default { // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings const suffix = !this.file.changed && this.file.staged && !this.showStagedIcon ? '-solid' : ''; - if (this.forceModifiedIcon) return `file-modified${suffix}`; - return `${getCommitIconMap(this.file).icon}${suffix}`; }, changedIconClass() { @@ -88,7 +81,7 @@ export default { v-gl-tooltip.right :title="tooltipTitle" :class="{ 'ml-auto': isCentered }" - class="file-changed-icon" + class="file-changed-icon d-inline-block" > <icon v-if="showIcon" :name="changedIcon" :size="size" :css-classes="changedIconClass" /> </span> |