diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 16:22:26 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 16:22:26 +0200 |
| commit | 20c7144ed20bad499b878425d5fbab408ad066b5 (patch) | |
| tree | 8b25261fa12fc36abca7639664329724d2a4302d /spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb | |
| parent | 8ce1896b46f893de62528e44172be8c128b27c9b (diff) | |
| download | gitlab-ce-20c7144ed20bad499b878425d5fbab408ad066b5.tar.gz | |
Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features
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 6d6539a0e71..4da8146e3d6 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 @@ -10,7 +10,7 @@ describe MergeRequests::MergeWhenBuildSucceedsService do source_project: project, target_project: project, state: "opened") end - let(:pipeline) { create(:ci_commit_with_one_job, ref: mr_merge_if_green_enabled.source_branch, project: project) } + let(:pipeline) { create(:ci_pipeline_with_one_job, ref: mr_merge_if_green_enabled.source_branch, project: project) } let(:service) { MergeRequests::MergeWhenBuildSucceedsService.new(project, user, commit_message: 'Awesome message') } describe "#execute" do |