diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 12:29:00 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-03 12:29:00 +0200 |
| commit | 717fdd6d42f119dd1e0f457c40563cc35985fbae (patch) | |
| tree | cdcb1a8167a809c8c203d50dcff65ef44d0eace2 /spec/features/merge_requests | |
| parent | b2acebb4efdf8023f685cfd14489c49e56d126a7 (diff) | |
| download | gitlab-ce-717fdd6d42f119dd1e0f457c40563cc35985fbae.tar.gz | |
Rename Ci::Build commit to pipeline
Diffstat (limited to 'spec/features/merge_requests')
| -rw-r--r-- | spec/features/merge_requests/merge_when_build_succeeds_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb index 7aa7eb965e9..eaa3e6b1471 100644 --- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb +++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb @@ -13,7 +13,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do context "Active build for Merge Request" do let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) } - let!(:ci_build) { create(:ci_build, commit: ci_commit) } + let!(:ci_build) { create(:ci_build, pipeline: ci_commit) } before do login_as user @@ -48,7 +48,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do end let!(:ci_commit) { create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) } - let!(:ci_build) { create(:ci_build, commit: ci_commit) } + let!(:ci_build) { create(:ci_build, pipeline: ci_commit) } before do login_as user |