diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-18 10:18:40 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-18 10:43:57 +0100 |
| commit | 1533dbf9018fc4ed91725b369a779b7d4c40f99f (patch) | |
| tree | c012ad644a3c8bcf2ab61bab7ae2fee46b23c2c5 /spec/javascripts/vue_mr_widget/components | |
| parent | 2a82179e102159b8416f4a20d3349ef208c58738 (diff) | |
| download | gitlab-ce-1533dbf9018fc4ed91725b369a779b7d4c40f99f.tar.gz | |
Uses long sha version of the merged commit in MR widget copy to clipboard button48050-add-full-commit-sha
Diffstat (limited to 'spec/javascripts/vue_mr_widget/components')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js | 5 |
1 files changed, 3 insertions, 2 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 3e2fd71b5b8..efa5c878678 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 @@ -39,7 +39,8 @@ describe('MRWidgetMerged', () => { readableClosedAt: '', }, updatedAt: 'mergedUpdatedAt', - shortMergeCommitSha: 'asdf1234', + shortMergeCommitSha: '958c0475', + mergeCommitSha: '958c047516e182dfc52317f721f696e8a1ee85ed', mergeCommitPath: 'http://localhost:3000/root/nautilus/commit/f7ce827c314c9340b075657fd61c789fb01cf74d', sourceBranch: 'bar', targetBranch, @@ -153,7 +154,7 @@ describe('MRWidgetMerged', () => { it('shows button to copy commit SHA to clipboard', () => { expect(selectors.copyMergeShaButton).toExist(); - expect(selectors.copyMergeShaButton.getAttribute('data-clipboard-text')).toBe(vm.mr.shortMergeCommitSha); + expect(selectors.copyMergeShaButton.getAttribute('data-clipboard-text')).toBe(vm.mr.mergeCommitSha); }); it('shows merge commit SHA link', () => { |