diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-13 16:45:48 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-13 16:45:48 +0000 |
commit | 013e681625ada14ba977c5a66ab104924a9fdce6 (patch) | |
tree | 6c2b0c51a4c3e1e52d00e3f3e427e81837cf1339 /spec/models/merge_request_spec.rb | |
parent | 87f7309c5deaa0f329f4bdf7da46f53ad2313861 (diff) | |
parent | 504f77b43a92362b07899e946855dc689b45b3ae (diff) | |
download | gitlab-ce-013e681625ada14ba977c5a66ab104924a9fdce6.tar.gz |
Merge branch 'issue_41021' into 'master'
Prevent worker that updates merge requests head pipeline from failing jobs
Closes #41021
See merge request gitlab-org/gitlab-ce!15870
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r-- | spec/models/merge_request_spec.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 6b98d013ded..98a39c33319 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1857,4 +1857,20 @@ describe MergeRequest do it_behaves_like 'throttled touch' do subject { create(:merge_request, updated_at: 1.hour.ago) } end + + context 'state machine transitions' do + describe '#unlock_mr' do + subject { create(:merge_request, state: 'locked', merge_jid: 123) } + + it 'updates merge request head pipeline and sets merge_jid to nil' do + pipeline = create(:ci_empty_pipeline, project: subject.project, ref: subject.source_branch, sha: subject.source_branch_sha) + + subject.unlock_mr + + subject.reload + expect(subject.head_pipeline).to eq(pipeline) + expect(subject.merge_jid).to be_nil + end + end + end end |