5 before(:each) { ActiveRecord::Base.observers.enable(:user_observer) }
6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
7 let(:user) { create(:user) }
8 let!(:project) {create(:project_with_code, creator_id: user.id, namespace: user.namespace) }
9 let!(:merge_request) { create(:merge_request, author: user, assignee: user, source_project: project, target_project: project, title: "Test") }
11 project.team << [user, :reporters]
14 describe "GET /projects/:id/merge_requests" do
15 context "when unauthenticated" do
16 it "should return authentication error" do
17 get api("/projects/#{project.id}/merge_requests")
18 response.status.should == 401
22 context "when authenticated" do
23 it "should return an array of merge_requests" do
24 get api("/projects/#{project.id}/merge_requests", user)
25 response.status.should == 200
26 json_response.should be_an Array
27 json_response.first['title'].should == merge_request.title
32 describe "GET /projects/:id/merge_request/:merge_request_id" do
33 it "should return merge_request" do
34 get api("/projects/#{project.id}/merge_request/#{merge_request.id}", user)
35 response.status.should == 200
36 json_response['title'].should == merge_request.title
37 json_response['iid'].should == merge_request.iid
40 it "should return a 404 error if merge_request_id not found" do
41 get api("/projects/#{project.id}/merge_request/999", user)
42 response.status.should == 404
46 describe "POST /projects/:id/merge_requests" do
47 context 'between branches projects' do
48 it "should return merge_request" do
49 post api("/projects/#{project.id}/merge_requests", user),
50 title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user
51 response.status.should == 201
52 json_response['title'].should == 'Test merge_request'
55 it "should return 422 when source_branch equals target_branch" do
56 post api("/projects/#{project.id}/merge_requests", user),
57 title: "Test merge_request", source_branch: "master", target_branch: "master", author: user
58 response.status.should == 422
61 it "should return 400 when source_branch is missing" do
62 post api("/projects/#{project.id}/merge_requests", user),
63 title: "Test merge_request", target_branch: "master", author: user
64 response.status.should == 400
67 it "should return 400 when target_branch is missing" do
68 post api("/projects/#{project.id}/merge_requests", user),
69 title: "Test merge_request", source_branch: "stable", author: user
70 response.status.should == 400
73 it "should return 400 when title is missing" do
74 post api("/projects/#{project.id}/merge_requests", user),
75 target_branch: 'master', source_branch: 'stable'
76 response.status.should == 400
80 context 'forked projects' do
81 let!(:user2) {create(:user)}
82 let!(:forked_project_link) { build(:forked_project_link) }
83 let!(:fork_project) { create(:source_project_with_code, forked_project_link: forked_project_link, namespace: user2.namespace, creator_id: user2.id) }
84 let!(:unrelated_project) { create(:target_project_with_code, namespace: user2.namespace, creator_id: user2.id) }
86 before :each do |each|
87 fork_project.team << [user2, :reporters]
88 forked_project_link.forked_from_project = project
89 forked_project_link.forked_to_project = fork_project
90 forked_project_link.save!
93 it "should return merge_request" do
94 post api("/projects/#{fork_project.id}/merge_requests", user2),
95 title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id
96 response.status.should == 201
97 json_response['title'].should == 'Test merge_request'
100 it "should not return 422 when source_branch equals target_branch" do
101 project.id.should_not == fork_project.id
102 fork_project.forked?.should be_true
103 fork_project.forked_from_project.should == project
104 post api("/projects/#{fork_project.id}/merge_requests", user2),
105 title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id
106 response.status.should == 201
107 json_response['title'].should == 'Test merge_request'
110 it "should return 400 when source_branch is missing" do
111 post api("/projects/#{fork_project.id}/merge_requests", user2),
112 title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id
113 response.status.should == 400
116 it "should return 400 when target_branch is missing" do
117 post api("/projects/#{fork_project.id}/merge_requests", user2),
118 title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id
119 response.status.should == 400
122 it "should return 400 when title is missing" do
123 post api("/projects/#{fork_project.id}/merge_requests", user2),
124 target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: project.id
125 response.status.should == 400
128 it "should return 400 when target_branch is specified and not a forked project" do
129 post api("/projects/#{project.id}/merge_requests", user),
130 title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user, target_project_id: fork_project.id
131 response.status.should == 400
134 it "should return 400 when target_branch is specified and for a different fork" do
135 post api("/projects/#{fork_project.id}/merge_requests", user2),
136 title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: unrelated_project.id
137 response.status.should == 400
140 it "should return 201 when target_branch is specified and for the same project" do
141 post api("/projects/#{fork_project.id}/merge_requests", user2),
142 title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: fork_project.id
143 response.status.should == 201
148 describe "PUT /projects/:id/merge_request/:merge_request_id to close MR" do
149 it "should return merge_request" do
150 put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "close"
151 response.status.should == 200
152 json_response['state'].should == 'closed'
156 describe "PUT /projects/:id/merge_request/:merge_request_id to merge MR" do
157 it "should return merge_request" do
158 put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "merge"
159 response.status.should == 200
160 json_response['state'].should == 'merged'
164 describe "PUT /projects/:id/merge_request/:merge_request_id" do
165 it "should return merge_request" do
166 put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title"
167 response.status.should == 200
168 json_response['title'].should == 'New title'
171 it "should return 422 when source_branch and target_branch are renamed the same" do
172 put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user),
173 source_branch: "master", target_branch: "master"
174 response.status.should == 422
177 it "should return merge_request with renamed target_branch" do
178 put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), target_branch: "wiki"
179 response.status.should == 200
180 json_response['target_branch'].should == 'wiki'
184 describe "POST /projects/:id/merge_request/:merge_request_id/comments" do
185 it "should return comment" do
186 post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user), note: "My comment"
187 response.status.should == 201
188 json_response['note'].should == 'My comment'
191 it "should return 400 if note is missing" do
192 post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
193 response.status.should == 400
196 it "should return 404 if note is attached to non existent merge request" do
197 post api("/projects/#{project.id}/merge_request/111/comments", user), note: "My comment"
198 response.status.should == 404