diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-07 08:52:27 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-07 08:52:27 +0000 |
commit | 855df0ceaaee3e6ff75a4a21d838588086e1a3a9 (patch) | |
tree | a7e6c02e2d7ab6822f2c16418c6e3719fef8324a | |
parent | db0b2381fefecfe3b67fe23bd7e97f522148a3d2 (diff) | |
parent | f635fbdef61acdb9505eabb36709c45296cb6831 (diff) | |
download | gitlab-ce-855df0ceaaee3e6ff75a4a21d838588086e1a3a9.tar.gz |
Merge branch 'fl-releases-fix-author' into 'master'
Fixes if case to render author info in releases
See merge request gitlab-org/gitlab-ce!23989
-rw-r--r-- | app/assets/javascripts/releases/components/release_block.vue | 2 | ||||
-rw-r--r-- | spec/javascripts/releases/components/release_block_spec.js | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue index 34b97826cdb..4295fef8f0a 100644 --- a/app/assets/javascripts/releases/components/release_block.vue +++ b/app/assets/javascripts/releases/components/release_block.vue @@ -45,7 +45,7 @@ export default { return this.release.author || {}; }, hasAuthor() { - return _.isEmpty(this.author); + return !_.isEmpty(this.author); }, }, }; diff --git a/spec/javascripts/releases/components/release_block_spec.js b/spec/javascripts/releases/components/release_block_spec.js index 29420216bc4..1268cdad08d 100644 --- a/spec/javascripts/releases/components/release_block_spec.js +++ b/spec/javascripts/releases/components/release_block_spec.js @@ -133,4 +133,8 @@ describe('Release block', () => { release.assets.links[0].name, ); }); + + it('renders author avatar', () => { + expect(vm.$el.querySelector('.user-avatar-link')).not.toBeNull(); + }); }); |