summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 13:34:03 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 13:34:03 +0200
commit08baa9983ee586c10b4fa28f68b10ba8e7807125 (patch)
tree4c9fe02b24c3896058ee34bb3157da0cd16f479e /spec/requests
parent0a51c954641c99610e9eddd9323398fb00d273e2 (diff)
downloadgitlab-ce-08baa9983ee586c10b4fa28f68b10ba8e7807125.tar.gz
Use pipelines in context of Project
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/builds_spec.rb2
-rw-r--r--spec/requests/api/commits_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index 35eb23c2a9b..534b82dc34f 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -59,7 +59,7 @@ describe API::API, api: true do
describe 'GET /projects/:id/repository/commits/:sha/builds' do
before do
- project.ensure_ci_commit(commit.sha, 'master')
+ project.ensure_pipeline(commit.sha, 'master')
get api("/projects/#{project.id}/repository/commits/#{commit.sha}/builds", api_user)
end
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index cb82ca7802d..2336ec97ed0 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -90,7 +90,7 @@ describe API::API, api: true do
end
it "should return status for CI" do
- ci_commit = project.ensure_ci_commit(project.repository.commit.sha, 'master')
+ ci_commit = project.ensure_pipeline(project.repository.commit.sha, 'master')
get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
expect(response.status).to eq(200)
expect(json_response['status']).to eq(ci_commit.status)