summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 12:29:00 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 12:29:00 +0200
commit717fdd6d42f119dd1e0f457c40563cc35985fbae (patch)
treecdcb1a8167a809c8c203d50dcff65ef44d0eace2 /features
parentb2acebb4efdf8023f685cfd14489c49e56d126a7 (diff)
downloadgitlab-ce-717fdd6d42f119dd1e0f457c40563cc35985fbae.tar.gz
Rename Ci::Build commit to pipeline
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/commits/commits.rb2
-rw-r--r--features/steps/project/merge_requests.rb2
-rw-r--r--features/steps/shared/builds.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index bf01a78cb33..33d3eeab0d2 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -165,7 +165,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
step 'commit has ci status' do
@project.enable_ci
ci_commit = create :ci_commit, project: @project, sha: sample_commit.id
- create :ci_build, commit: ci_commit
+ create :ci_build, pipeline: ci_commit
end
step 'repository contains ".gitlab-ci.yml" file' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index b30346790eb..0ac7d3a250a 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -520,7 +520,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
project = merge_request.source_project
project.enable_ci
ci_commit = create :ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch
- create :ci_build, commit: ci_commit
+ create :ci_build, pipeline: ci_commit
end
step 'I should see merge request "Bug NS-05" with CI status' do
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index cf30e23b6bd..92d7bed0450 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -23,7 +23,7 @@ module SharedBuilds
end
step 'project has another build that is running' do
- create(:ci_build, commit: @ci_commit, name: 'second build', status: 'running')
+ create(:ci_build, pipeline: @ci_commit, name: 'second build', status: 'running')
end
step 'I visit recent build details page' do