summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-01-02 15:39:45 +0900
committerShinya Maeda <shinya@gitlab.com>2019-01-04 19:36:45 +0900
commit0d9b801a5ff9d98948954da61569668a57dde99a (patch)
treedc2851716075f28da4de4c68b1d50ddd57b58414 /spec/workers
parentc50b0e58feb208fd26129548ad086c3ef50df604 (diff)
downloadgitlab-ce-0d9b801a5ff9d98948954da61569668a57dde99a.tar.gz
Refactor the logic of updating head pipelines
Sort out some logic
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/update_head_pipeline_for_merge_request_worker_spec.rb10
1 files changed, 5 insertions, 5 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 a2bc264b0f6..963237ceadf 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
@@ -21,17 +21,17 @@ describe UpdateHeadPipelineForMergeRequestWorker do
merge_request.merge_request_diff.update(head_commit_sha: 'different_sha')
end
- it 'does not update head_pipeline_id' do
- expect { subject.perform(merge_request.id) }.not_to raise_error
-
- expect(merge_request.reload.head_pipeline_id).to eq(nil)
+ it 'does not update head pipeline' do
+ expect { subject.perform(merge_request.id) }
+ .not_to change { merge_request.reload.head_pipeline_id }
end
end
end
context 'when pipeline does not exist for the source project and branch' do
it 'does not update the head_pipeline_id of the merge_request' do
- expect { subject.perform(merge_request.id) }.not_to change { merge_request.reload.head_pipeline_id }
+ expect { subject.perform(merge_request.id) }
+ .not_to change { merge_request.reload.head_pipeline_id }
end
end