diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-18 19:43:23 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-18 19:43:23 +0000 |
commit | afa47b7c481210df659706930a9f43d53023ce5e (patch) | |
tree | a9db304c04bd2f79fe0147b3dd587fd48499aa23 /spec | |
parent | bfa7983dd6f90d6de6c29d7d3f58685566a90f38 (diff) | |
parent | 1533dbf9018fc4ed91725b369a779b7d4c40f99f (diff) | |
download | gitlab-ce-afa47b7c481210df659706930a9f43d53023ce5e.tar.gz |
Merge branch '48050-add-full-commit-sha' into 'master'
Resolve "Use long sha version in MR widget copy to clipboard button"
Closes #48050
See merge request gitlab-org/gitlab-ce!19955
Diffstat (limited to 'spec')
-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', () => { |