diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-04 19:44:46 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-04 19:44:46 +0100 |
| commit | 59db98a0cabea4421434655d7f7873110363d21a (patch) | |
| tree | f3f72bca43724e230090aeae7aa0c15e56b707bf /spec/workers | |
| parent | 5c80bbb33c12490bc5fa711642a40fc16bdb79a4 (diff) | |
| parent | 025015048f7eaad29ee7816c6040fb3e0c06eb8d (diff) | |
| download | gitlab-ce-59db98a0cabea4421434655d7f7873110363d21a.tar.gz | |
Merge dev master into GitLab.com master
Diffstat (limited to 'spec/workers')
| -rw-r--r-- | spec/workers/update_head_pipeline_for_merge_request_worker_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/workers/update_head_pipeline_for_merge_request_worker_spec.rb b/spec/workers/update_head_pipeline_for_merge_request_worker_spec.rb index a13a3046f55..d20d926f5a0 100644 --- a/spec/workers/update_head_pipeline_for_merge_request_worker_spec.rb +++ b/spec/workers/update_head_pipeline_for_merge_request_worker_spec.rb @@ -18,7 +18,7 @@ describe UpdateHeadPipelineForMergeRequestWorker do context 'when merge request sha does not equal pipeline sha' do before do - merge_request.merge_request_diff.update(head_commit_sha: 'different_sha') + merge_request.merge_request_diff.update(head_commit_sha: Digest::SHA1.hexdigest(SecureRandom.hex)) end it 'does not update head pipeline' do |