diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 14:46:17 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 14:46:17 +0200 |
commit | 4d5f7aa00827f425dd3d2c3bd5a395c8e948f0ba (patch) | |
tree | dc5446ac09424f48cd5b59df67ab7059ac60aa49 /spec/services | |
parent | bcd009e661291554cffe404123de629860519602 (diff) | |
download | gitlab-ce-4d5f7aa00827f425dd3d2c3bd5a395c8e948f0ba.tar.gz |
Fix more places where we should rename ci_commit to pipeline
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb index 7f8ea8d7c25..d050f4cd95c 100644 --- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb +++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb @@ -110,8 +110,8 @@ describe MergeRequests::MergeWhenBuildSucceedsService do context 'properly handles multiple stages' do let(:ref) { mr_merge_if_green_enabled.source_branch } - let(:build) { create(:ci_build, commit: ci_commit, ref: ref, name: 'build', stage: 'build') } - let(:test) { create(:ci_build, commit: ci_commit, ref: ref, name: 'test', stage: 'test') } + let(:build) { create(:ci_build, pipeline: ci_commit, ref: ref, name: 'build', stage: 'build') } + let(:test) { create(:ci_build, pipeline: ci_commit, ref: ref, name: 'test', stage: 'test') } before do # This behavior of MergeRequest: we instantiate a new object |