diff options
author | Valeriy Sizov <vsv2711@gmail.com> | 2015-03-31 12:48:14 +0300 |
---|---|---|
committer | Valeriy Sizov <vsv2711@gmail.com> | 2015-03-31 12:48:14 +0300 |
commit | efd4c7658b41d7bdddc4efaf17ba8039c60f6c28 (patch) | |
tree | a92029864475b4531742245998c67f482f47eda4 | |
parent | 54e320ee63421ba42a15706a6b4892c502951d44 (diff) | |
parent | f80030a354de80be05852c98aa9e5fa9a6064d58 (diff) | |
download | gitlab-ci-efd4c7658b41d7bdddc4efaf17ba8039c60f6c28.tar.gz |
Merge pull request #559 from jvanbaarsen/remove-deprecated-api-point
Removed deprecated API behaviour
-rw-r--r-- | lib/api/builds.rb | 51 | ||||
-rw-r--r-- | spec/requests/api/builds_spec.rb | 36 |
2 files changed, 0 insertions, 87 deletions
diff --git a/lib/api/builds.rb b/lib/api/builds.rb index bed20ac..0f9c2a9 100644 --- a/lib/api/builds.rb +++ b/lib/api/builds.rb @@ -45,57 +45,6 @@ module API build.drop end end - - # TODO: Remove it after 5.2 release - # - # THIS API IS DEPRECATED. - # Now builds are created by commit. In order to test specific commit you - # need to create Commit entity via Commit API - # - # Create a build - # - # Parameters: - # project_id (required) - The ID of a project - # project_token (requires) - Project token - # data (required) - GitLab push data - # - # Sample GitLab push data: - # { - # "before": "95790bf891e76fee5e1747ab589903a6a1f80f22", - # "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", - # "ref": "refs/heads/master", - # "commits": [ - # { - # "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", - # "message": "Update Catalan translation to e38cb41.", - # "timestamp": "2011-12-12T14:27:31+02:00", - # "url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", - # "author": { - # "name": "Jordi Mallach", - # "email": "jordi@softcatala.org", - # } - # }, .... more commits - # ] - # } - # - # Example Request: - # POST /builds - post do - required_attributes! [:project_id, :data, :project_token] - project = Project.find(params[:project_id]) - authenticate_project_token!(project) - commit = CreateCommitService.new.execute(project, params[:data]) - - # Temporary solution to keep api compatibility - build = commit.builds.first - - if build.persisted? - present build, with: Entities::Build - else - errors = build.errors.full_messages.join(", ") - render_api_error!(errors, 400) - end - end end end end diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb index fd0e0cd..f69aac8 100644 --- a/spec/requests/api/builds_spec.rb +++ b/spec/requests/api/builds_spec.rb @@ -69,40 +69,4 @@ describe API::API do end end end - - describe "POST /builds" do - let(:data) { - { - "before" => "95790bf891e76fee5e1747ab589903a6a1f80f22", - "after" => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", - "ref" => "refs/heads/master", - "commits" => [ - { - "id" => "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", - "message" => "Update Catalan translation to e38cb41.", - "timestamp" => "2011-12-12T14:27:31+02:00", - "url" => "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327", - "author" => { - "name" => "Jordi Mallach", - "email" => "jordi@softcatala.org", - } - } - ] - } - } - - it "should create a build" do - post api("/builds"), project_id: project.id, data: data, project_token: project.token - - response.status.should == 201 - json_response['sha'].should == "da1560886d4f094c3e6c9ef40349f7d38b5d27d7" - end - - it "should return 400 error if no data passed" do - post api("/builds"), project_id: project.id, project_token: project.token - - response.status.should == 400 - json_response['message'].should == "400 (Bad request) \"data\" not given" - end - end end |