diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-02 16:19:18 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-02 16:59:04 +0200 |
| commit | 021d3810c300d1e0514f21ccb6f1439f59e20565 (patch) | |
| tree | 771a663395f39530559c73016f26087a0489fae2 /spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb | |
| parent | 5accd87ad7b0d960e504910d896a832288e51c8d (diff) | |
| download | gitlab-ce-021d3810c300d1e0514f21ccb6f1439f59e20565.tar.gz | |
Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline
Diffstat (limited to 'spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 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 0861d74aede..7f8ea8d7c25 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 @@ -116,7 +116,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do before do # This behavior of MergeRequest: we instantiate a new object allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_wrap_original do - Ci::Commit.find(ci_commit.id) + Ci::Pipeline.find(ci_commit.id) end # We create test after the build |