summaryrefslogtreecommitdiff
path: root/spec/javascripts/jobs/components
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-03-26 00:55:02 +0000
committerFatih Acet <acetfatih@gmail.com>2019-03-26 00:55:02 +0000
commit22f2879b9b304ee72cf17356e1b4071a0a394809 (patch)
treeb58555777ef252dd3f88dd43a2350491593ddb8a /spec/javascripts/jobs/components
parent61b2f70fdcbc8dce7504c6599f57e2db703cc5ae (diff)
parentfbf638a49446faae96dad4ad1538a010906f975a (diff)
downloadgitlab-ce-22f2879b9b304ee72cf17356e1b4071a0a394809.tar.gz
Merge branch 'MaxWinterstein-unify-copy-comit-sha' into 'master'
Unify behaviour of 'Copy commit SHA to clipboard' on job view Closes #58343 See merge request gitlab-org/gitlab-ce!25829
Diffstat (limited to 'spec/javascripts/jobs/components')
-rw-r--r--spec/javascripts/jobs/components/commit_block_spec.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/javascripts/jobs/components/commit_block_spec.js b/spec/javascripts/jobs/components/commit_block_spec.js
index 98eba3ac976..c02f564d01a 100644
--- a/spec/javascripts/jobs/components/commit_block_spec.js
+++ b/spec/javascripts/jobs/components/commit_block_spec.js
@@ -9,6 +9,7 @@ describe('Commit block', () => {
const props = {
commit: {
short_id: '1f0fb84f',
+ id: '1f0fb84fb6770d74d97eee58118fd3909cd4f48c',
commit_path: 'commit/1f0fb84fb6770d74d97eee58118fd3909cd4f48c',
title: 'Update README.md',
},
@@ -42,7 +43,7 @@ describe('Commit block', () => {
it('renders clipboard button', () => {
expect(vm.$el.querySelector('button').getAttribute('data-clipboard-text')).toEqual(
- props.commit.short_id,
+ props.commit.id,
);
});
});