2012-10-25 06:13:01 -04:00
|
|
|
require "spec_helper"
|
|
|
|
|
2013-05-14 08:33:31 -04:00
|
|
|
describe API::API do
|
2012-10-25 06:13:01 -04:00
|
|
|
include ApiHelpers
|
2013-09-05 07:46:34 -04:00
|
|
|
before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
|
|
|
|
after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
|
2013-04-25 10:15:33 -04:00
|
|
|
let(:user) { create(:user) }
|
2013-09-05 07:46:34 -04:00
|
|
|
let!(:project) {create(:project_with_code, creator_id: user.id, namespace: user.namespace) }
|
2013-04-25 10:15:33 -04:00
|
|
|
let!(:merge_request) { create(:merge_request, author: user, assignee: user, source_project: project, target_project: project, title: "Test") }
|
|
|
|
before {
|
|
|
|
project.team << [user, :reporters]
|
|
|
|
}
|
2012-10-25 06:13:01 -04:00
|
|
|
|
|
|
|
describe "GET /projects/:id/merge_requests" do
|
|
|
|
context "when unauthenticated" do
|
|
|
|
it "should return authentication error" do
|
2013-09-21 17:46:36 -04:00
|
|
|
get api("/projects/#{project.id}/merge_requests")
|
2012-10-25 06:13:01 -04:00
|
|
|
response.status.should == 401
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when authenticated" do
|
|
|
|
it "should return an array of merge_requests" do
|
2013-09-21 17:46:36 -04:00
|
|
|
get api("/projects/#{project.id}/merge_requests", user)
|
2012-10-25 06:13:01 -04:00
|
|
|
response.status.should == 200
|
|
|
|
json_response.should be_an Array
|
|
|
|
json_response.first['title'].should == merge_request.title
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "GET /projects/:id/merge_request/:merge_request_id" do
|
|
|
|
it "should return merge_request" do
|
2013-09-21 17:46:36 -04:00
|
|
|
get api("/projects/#{project.id}/merge_request/#{merge_request.id}", user)
|
2012-10-25 06:13:01 -04:00
|
|
|
response.status.should == 200
|
|
|
|
json_response['title'].should == merge_request.title
|
|
|
|
end
|
2013-02-13 09:48:52 -05:00
|
|
|
|
|
|
|
it "should return a 404 error if merge_request_id not found" do
|
2013-09-21 17:46:36 -04:00
|
|
|
get api("/projects/#{project.id}/merge_request/999", user)
|
2013-02-13 09:48:52 -05:00
|
|
|
response.status.should == 404
|
|
|
|
end
|
2012-10-25 06:13:01 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /projects/:id/merge_requests" do
|
2013-04-25 10:15:33 -04:00
|
|
|
context 'between branches projects' do
|
|
|
|
it "should return merge_request" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{project.id}/merge_requests", user),
|
2013-04-25 10:15:33 -04:00
|
|
|
title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user
|
|
|
|
response.status.should == 201
|
|
|
|
json_response['title'].should == 'Test merge_request'
|
|
|
|
end
|
2013-02-05 11:13:47 -05:00
|
|
|
|
2013-04-25 10:15:33 -04:00
|
|
|
it "should return 422 when source_branch equals target_branch" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{project.id}/merge_requests", user),
|
2013-04-25 10:15:33 -04:00
|
|
|
title: "Test merge_request", source_branch: "master", target_branch: "master", author: user
|
|
|
|
response.status.should == 422
|
|
|
|
end
|
2013-02-05 11:13:47 -05:00
|
|
|
|
2013-04-25 10:15:33 -04:00
|
|
|
it "should return 400 when source_branch is missing" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{project.id}/merge_requests", user),
|
2013-04-25 10:15:33 -04:00
|
|
|
title: "Test merge_request", target_branch: "master", author: user
|
|
|
|
response.status.should == 400
|
|
|
|
end
|
2013-02-05 11:13:47 -05:00
|
|
|
|
2013-04-25 10:15:33 -04:00
|
|
|
it "should return 400 when target_branch is missing" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{project.id}/merge_requests", user),
|
2013-04-25 10:15:33 -04:00
|
|
|
title: "Test merge_request", source_branch: "stable", author: user
|
|
|
|
response.status.should == 400
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should return 400 when title is missing" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{project.id}/merge_requests", user),
|
2013-04-25 10:15:33 -04:00
|
|
|
target_branch: 'master', source_branch: 'stable'
|
|
|
|
response.status.should == 400
|
|
|
|
end
|
2013-02-05 11:13:47 -05:00
|
|
|
end
|
2013-02-27 09:07:42 -05:00
|
|
|
|
2013-04-25 10:15:33 -04:00
|
|
|
context 'forked projects' do
|
|
|
|
let!(:user2) {create(:user)}
|
|
|
|
let!(:forked_project_link) { build(:forked_project_link) }
|
|
|
|
let!(:fork_project) { create(:source_project_with_code, forked_project_link: forked_project_link, namespace: user2.namespace, creator_id: user2.id) }
|
2013-06-03 16:20:50 -04:00
|
|
|
let!(:unrelated_project) { create(:target_project_with_code, namespace: user2.namespace, creator_id: user2.id) }
|
2013-04-25 10:15:33 -04:00
|
|
|
|
|
|
|
before :each do |each|
|
|
|
|
fork_project.team << [user2, :reporters]
|
|
|
|
forked_project_link.forked_from_project = project
|
|
|
|
forked_project_link.forked_to_project = fork_project
|
|
|
|
forked_project_link.save!
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should return merge_request" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{fork_project.id}/merge_requests", user2),
|
2013-04-25 10:15:33 -04:00
|
|
|
title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id
|
|
|
|
response.status.should == 201
|
|
|
|
json_response['title'].should == 'Test merge_request'
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should not return 422 when source_branch equals target_branch" do
|
2013-09-21 17:46:36 -04:00
|
|
|
project.id.should_not == fork_project.id
|
2013-04-25 10:15:33 -04:00
|
|
|
fork_project.forked?.should be_true
|
|
|
|
fork_project.forked_from_project.should == project
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{fork_project.id}/merge_requests", user2),
|
2013-04-25 10:15:33 -04:00
|
|
|
title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id
|
|
|
|
response.status.should == 201
|
|
|
|
json_response['title'].should == 'Test merge_request'
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should return 400 when source_branch is missing" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{fork_project.id}/merge_requests", user2),
|
2013-04-25 10:15:33 -04:00
|
|
|
title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id
|
|
|
|
response.status.should == 400
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should return 400 when target_branch is missing" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{fork_project.id}/merge_requests", user2),
|
2013-04-25 10:15:33 -04:00
|
|
|
title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id
|
|
|
|
response.status.should == 400
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should return 400 when title is missing" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{fork_project.id}/merge_requests", user2),
|
2013-04-25 10:15:33 -04:00
|
|
|
target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: project.id
|
|
|
|
response.status.should == 400
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should return 400 when target_branch is specified and not a forked project" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{project.id}/merge_requests", user),
|
2013-06-03 16:20:50 -04:00
|
|
|
title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user, target_project_id: fork_project.id
|
2013-04-25 10:15:33 -04:00
|
|
|
response.status.should == 400
|
|
|
|
end
|
2013-06-03 16:20:50 -04:00
|
|
|
|
|
|
|
it "should return 400 when target_branch is specified and for a different fork" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{fork_project.id}/merge_requests", user2),
|
2013-06-03 16:20:50 -04:00
|
|
|
title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: unrelated_project.id
|
|
|
|
response.status.should == 400
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should return 201 when target_branch is specified and for the same project" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{fork_project.id}/merge_requests", user2),
|
2013-06-03 16:20:50 -04:00
|
|
|
title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: fork_project.id
|
|
|
|
response.status.should == 201
|
|
|
|
end
|
2013-02-27 09:07:42 -05:00
|
|
|
end
|
2012-10-25 06:13:01 -04:00
|
|
|
end
|
|
|
|
|
2013-02-18 04:07:49 -05:00
|
|
|
describe "PUT /projects/:id/merge_request/:merge_request_id to close MR" do
|
|
|
|
it "should return merge_request" do
|
2013-09-21 17:46:36 -04:00
|
|
|
put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "close"
|
2013-02-18 04:07:49 -05:00
|
|
|
response.status.should == 200
|
|
|
|
json_response['state'].should == 'closed'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "PUT /projects/:id/merge_request/:merge_request_id to merge MR" do
|
|
|
|
it "should return merge_request" do
|
2013-09-21 17:46:36 -04:00
|
|
|
put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "merge"
|
2013-02-18 04:07:49 -05:00
|
|
|
response.status.should == 200
|
|
|
|
json_response['state'].should == 'merged'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2012-10-25 06:13:01 -04:00
|
|
|
describe "PUT /projects/:id/merge_request/:merge_request_id" do
|
|
|
|
it "should return merge_request" do
|
2013-09-21 17:46:36 -04:00
|
|
|
put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title"
|
2012-10-25 06:13:01 -04:00
|
|
|
response.status.should == 200
|
2012-11-05 22:31:55 -05:00
|
|
|
json_response['title'].should == 'New title'
|
2012-10-25 06:13:01 -04:00
|
|
|
end
|
2013-02-05 11:13:47 -05:00
|
|
|
|
|
|
|
it "should return 422 when source_branch and target_branch are renamed the same" do
|
2013-09-21 17:46:36 -04:00
|
|
|
put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user),
|
2013-04-25 10:15:33 -04:00
|
|
|
source_branch: "master", target_branch: "master"
|
2013-02-05 11:13:47 -05:00
|
|
|
response.status.should == 422
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should return merge_request with renamed target_branch" do
|
2013-09-21 17:46:36 -04:00
|
|
|
put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), target_branch: "wiki"
|
2013-02-05 11:13:47 -05:00
|
|
|
response.status.should == 200
|
2013-04-25 10:15:33 -04:00
|
|
|
json_response['target_branch'].should == 'wiki'
|
2013-02-05 11:13:47 -05:00
|
|
|
end
|
2012-10-25 06:13:01 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "POST /projects/:id/merge_request/:merge_request_id/comments" do
|
|
|
|
it "should return comment" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user), note: "My comment"
|
2012-10-25 06:13:01 -04:00
|
|
|
response.status.should == 201
|
2012-11-05 22:31:55 -05:00
|
|
|
json_response['note'].should == 'My comment'
|
2012-10-25 06:13:01 -04:00
|
|
|
end
|
2013-02-05 12:37:44 -05:00
|
|
|
|
|
|
|
it "should return 400 if note is missing" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
|
2013-02-05 12:37:44 -05:00
|
|
|
response.status.should == 400
|
|
|
|
end
|
2013-02-06 08:59:47 -05:00
|
|
|
|
|
|
|
it "should return 404 if note is attached to non existent merge request" do
|
2013-09-21 17:46:36 -04:00
|
|
|
post api("/projects/#{project.id}/merge_request/111/comments", user), note: "My comment"
|
2013-02-06 08:59:47 -05:00
|
|
|
response.status.should == 404
|
|
|
|
end
|
2012-10-25 06:13:01 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
end
|