summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2016-01-11 10:20:45 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2016-01-11 10:20:45 +0100
commit96bbc145f31ad029e080ad8903445d81d6c31968 (patch)
tree216c132372a172594af3a509f5c536b510988c69
parent4eb27d7c72d57015c7551a00e34a54cefc2d3db9 (diff)
downloadgitlab-ce-96bbc145f31ad029e080ad8903445d81d6c31968.tar.gz
Change commit builds URL in builds API
-rw-r--r--lib/api/builds.rb4
-rw-r--r--spec/requests/api/builds_spec.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/api/builds.rb b/lib/api/builds.rb
index 05d1b8d92ea..8c21754596b 100644
--- a/lib/api/builds.rb
+++ b/lib/api/builds.rb
@@ -28,8 +28,8 @@ module API
# scope (optional) - The scope of builds to show (one or array of: pending, running, failed, success, canceled;
# if none provided showing all builds)
# Example Request:
- # GET /projects/:id/builds/commit/:sha
- get ':id/builds/commit/:sha' do
+ # GET /projects/:id/repository/commits/:sha/builds
+ get ':id/repository/commits/:sha/builds' do
commit = user_project.ci_commits.find_by_sha(params[:sha])
return not_found! unless commit
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index 799558d1bdd..587fb74750d 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -46,11 +46,11 @@ describe API::API, api: true do
end
end
- describe 'GET /projects/:id/builds/commit/:sha' do
+ describe 'GET /projects/:id/repository/commits/:sha/builds' do
context 'authorized user' do
it 'should return project builds for specific commit' do
project.ensure_ci_commit(commit.sha)
- get api("/projects/#{project.id}/builds/commit/#{commit.sha}", user)
+ get api("/projects/#{project.id}/repository/commits/#{commit.sha}/builds", user)
expect(response.status).to eq(200)
expect(json_response).to be_an Array
@@ -60,7 +60,7 @@ describe API::API, api: true do
context 'unauthorized user' do
it 'should not return project builds' do
project.ensure_ci_commit(commit.sha)
- get api("/projects/#{project.id}/builds/commit/#{commit.sha}")
+ get api("/projects/#{project.id}/repository/commits/#{commit.sha}/builds")
expect(response.status).to eq(401)
end