Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-03-28 23:04:14 +0300
committerFelipe Artur <felipefac@gmail.com>2017-05-08 17:29:10 +0300
commitd9bebd89dfcf7e4b163b271eea3d7a5c3e99fb5d (patch)
tree94a54961d28098ea0675f2cb15ea19bbe27166e6 /spec/services/merge_requests
parent1bf2dacf2002fabf3b7bd364031d9020e5d0b624 (diff)
Fix specs 2
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r--spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb2
-rw-r--r--spec/services/merge_requests/update_service_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
index b0304b3b73f..3ef5135e6a3 100644
--- a/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb
@@ -128,7 +128,7 @@ describe MergeRequests::MergeWhenPipelineSucceedsService do
sha: mr_conflict.diff_head_sha, status: 'success')
end
- before { mr_conflict.update(head_pipeline_id: conflict_pipeline.id) }
+ before { mr_conflict.update(head_pipeline: conflict_pipeline) }
it 'does not merge the merge request' do
expect(MergeWorker).not_to receive(:perform_async)
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index e5071c2f447..07f5440cc36 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -179,7 +179,7 @@ describe MergeRequests::UpdateService, services: true do
ref: merge_request.source_branch,
sha: merge_request.diff_head_sha)
- merge_request.update(head_pipeline_id: pipeline.id)
+ merge_request.update(head_pipeline: pipeline)
expect(MergeRequests::MergeWhenPipelineSucceedsService).to receive(:new).with(project, user).
and_return(service_mock)