diff options
author | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
---|---|---|
committer | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
commit | 58f29d5f855ea2e1411b99804a74710483a13f90 (patch) | |
tree | 0b06ecd3c0bb1bcf3d3c6660c2bc49eefaff08b2 /spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js | |
parent | 0572da24c990fc01d88acfbd32728221e3e3a711 (diff) | |
parent | a9827357186e38e5732d8dae23d9d02b1f4c7218 (diff) | |
download | gitlab-ce-58f29d5f855ea2e1411b99804a74710483a13f90.tar.gz |
Merge branch 'master' into 48746-fix-files-uploaded-in-base6448746-fix-files-uploaded-in-base64
Diffstat (limited to 'spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js')
-rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js index efa5c878678..033cb694249 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js @@ -157,6 +157,16 @@ describe('MRWidgetMerged', () => { expect(selectors.copyMergeShaButton.getAttribute('data-clipboard-text')).toBe(vm.mr.mergeCommitSha); }); + it('hides button to copy commit SHA if SHA does not exist', (done) => { + vm.mr.mergeCommitSha = null; + + Vue.nextTick(() => { + expect(selectors.copyMergeShaButton).not.toExist(); + expect(vm.$el.querySelector('.mr-info-list').innerText).not.toContain('with'); + done(); + }); + }); + it('shows merge commit SHA link', () => { expect(selectors.mergeCommitShaLink).toExist(); expect(selectors.mergeCommitShaLink.text).toContain(vm.mr.shortMergeCommitSha); |