From 4eb27d7c72d57015c7551a00e34a54cefc2d3db9 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Fri, 8 Jan 2016 23:33:45 +0100
Subject: [PATCH] Add some modifications to builds API and specs
---
lib/api/builds.rb | 2 +-
spec/requests/api/builds_spec.rb | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/api/builds.rb b/lib/api/builds.rb
index 33e6ed24101..05d1b8d92ea 100644
--- a/lib/api/builds.rb
+++ b/lib/api/builds.rb
@@ -103,7 +103,7 @@ module API
authorize_manage_builds!
build = get_build(params[:build_id])
- return not_found!(build) unless build && build.retryable?
+ return forbidden!('Build is not retryable') unless build && build.retryable?
build = Ci::Build.retry(build)
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index b6a1154cf76..799558d1bdd 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -50,7 +50,7 @@ describe API::API, api: true 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/#{project.ci_commits.first.sha}", user)
+ get api("/projects/#{project.id}/builds/commit/#{commit.sha}", 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/#{project.ci_commits.first.sha}")
+ get api("/projects/#{project.id}/builds/commit/#{commit.sha}")
expect(response.status).to eq(401)
end
@@ -99,7 +99,7 @@ describe API::API, api: true do
end
end
- describe 'GET /projects/:id/builds/:build_id/cancel' do
+ describe 'POST /projects/:id/builds/:build_id/cancel' do
context 'authorized user' do
context 'user with :manage_builds persmission' do
it 'should cancel running or pending build' do
@@ -128,7 +128,7 @@ describe API::API, api: true do
end
end
- describe 'GET /projects/:id/builds/:build_id/retry' do
+ describe 'POST /projects/:id/builds/:build_id/retry' do
context 'authorized user' do
context 'user with :manage_builds persmission' do
it 'should retry non-running build' do
--
GitLab