merge_requests_spec.rb 21.1 KB
Newer Older
V
Valeriy Sizov 已提交
1 2
require "spec_helper"

J
Jeroen van Baarsen 已提交
3
describe API::API, api: true  do
V
Valeriy Sizov 已提交
4
  include ApiHelpers
S
Stan Hu 已提交
5
  let(:base_time) { Time.now }
I
Izaak Alpert 已提交
6
  let(:user) { create(:user) }
D
Dmitriy Zaporozhets 已提交
7
  let!(:project) {create(:project, creator_id: user.id, namespace: user.namespace) }
S
Stan Hu 已提交
8
  let!(:merge_request) { create(:merge_request, :simple, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time) }
G
Gabriel Mazetto 已提交
9
  let!(:merge_request_closed) { create(:merge_request, state: "closed", author: user, assignee: user, source_project: project, target_project: project, title: "Closed test", created_at: base_time + 1.second) }
S
Stan Hu 已提交
10
  let!(:merge_request_merged) { create(:merge_request, state: "merged", author: user, assignee: user, source_project: project, target_project: project, title: "Merged test", created_at: base_time + 2.seconds) }
11
  let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") }
12
  let!(:note2) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "another comment on a MR") }
13
  let(:milestone) { create(:milestone, title: '1.0.0', project: project) }
14 15

  before do
I
Izaak Alpert 已提交
16
    project.team << [user, :reporters]
17
  end
V
Valeriy Sizov 已提交
18 19 20 21

  describe "GET /projects/:id/merge_requests" do
    context "when unauthenticated" do
      it "should return authentication error" do
H
Hiroyuki Sato 已提交
22
        get api("/projects/#{project.id}/merge_requests")
23
        expect(response.status).to eq(401)
V
Valeriy Sizov 已提交
24 25 26 27
      end
    end

    context "when authenticated" do
28
      it "should return an array of all merge_requests" do
H
Hiroyuki Sato 已提交
29
        get api("/projects/#{project.id}/merge_requests", user)
30 31 32 33
        expect(response.status).to eq(200)
        expect(json_response).to be_an Array
        expect(json_response.length).to eq(3)
        expect(json_response.last['title']).to eq(merge_request.title)
V
Valeriy Sizov 已提交
34
      end
35

36 37
      it "should return an array of all merge_requests" do
        get api("/projects/#{project.id}/merge_requests?state", user)
38 39 40 41
        expect(response.status).to eq(200)
        expect(json_response).to be_an Array
        expect(json_response.length).to eq(3)
        expect(json_response.last['title']).to eq(merge_request.title)
42
      end
43

44 45
      it "should return an array of open merge_requests" do
        get api("/projects/#{project.id}/merge_requests?state=opened", user)
46 47 48 49
        expect(response.status).to eq(200)
        expect(json_response).to be_an Array
        expect(json_response.length).to eq(1)
        expect(json_response.last['title']).to eq(merge_request.title)
50
      end
51

52 53
      it "should return an array of closed merge_requests" do
        get api("/projects/#{project.id}/merge_requests?state=closed", user)
54 55
        expect(response.status).to eq(200)
        expect(json_response).to be_an Array
56 57
        expect(json_response.length).to eq(1)
        expect(json_response.first['title']).to eq(merge_request_closed.title)
58
      end
59

60 61
      it "should return an array of merged merge_requests" do
        get api("/projects/#{project.id}/merge_requests?state=merged", user)
62 63 64 65
        expect(response.status).to eq(200)
        expect(json_response).to be_an Array
        expect(json_response.length).to eq(1)
        expect(json_response.first['title']).to eq(merge_request_merged.title)
66
      end
67 68 69 70 71 72 73 74 75

      context "with ordering" do
        before do
          @mr_later = mr_with_later_created_and_updated_at_time
          @mr_earlier = mr_with_earlier_created_and_updated_at_time
        end

        it "should return an array of merge_requests in ascending order" do
          get api("/projects/#{project.id}/merge_requests?sort=asc", user)
76 77 78
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
S
Stan Hu 已提交
79 80
          response_dates = json_response.map{ |merge_request| merge_request['created_at'] }
          expect(response_dates).to eq(response_dates.sort)
81
        end
D
Dmitriy Zaporozhets 已提交
82

83 84
        it "should return an array of merge_requests in descending order" do
          get api("/projects/#{project.id}/merge_requests?sort=desc", user)
85 86 87
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
S
Stan Hu 已提交
88 89
          response_dates = json_response.map{ |merge_request| merge_request['created_at'] }
          expect(response_dates).to eq(response_dates.sort.reverse)
90
        end
D
Dmitriy Zaporozhets 已提交
91

92 93
        it "should return an array of merge_requests ordered by updated_at" do
          get api("/projects/#{project.id}/merge_requests?order_by=updated_at", user)
94 95 96
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
S
Stan Hu 已提交
97 98
          response_dates = json_response.map{ |merge_request| merge_request['updated_at'] }
          expect(response_dates).to eq(response_dates.sort.reverse)
99
        end
D
Dmitriy Zaporozhets 已提交
100

101
        it "should return an array of merge_requests ordered by created_at" do
S
Stan Hu 已提交
102
          get api("/projects/#{project.id}/merge_requests?order_by=created_at&sort=asc", user)
103 104 105
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
S
Stan Hu 已提交
106 107
          response_dates = json_response.map{ |merge_request| merge_request['created_at'] }
          expect(response_dates).to eq(response_dates.sort)
108
        end
109
      end
V
Valeriy Sizov 已提交
110 111 112
    end
  end

113
  describe "GET /projects/:id/merge_requests/:merge_request_id" do
V
Valeriy Sizov 已提交
114
    it "should return merge_request" do
115
      get api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user)
116 117 118
      expect(response.status).to eq(200)
      expect(json_response['title']).to eq(merge_request.title)
      expect(json_response['iid']).to eq(merge_request.iid)
119
      expect(json_response['merge_status']).to eq('can_be_merged')
V
Valeriy Sizov 已提交
120
    end
121

122 123 124
    it 'should return merge_request by iid' do
      url = "/projects/#{project.id}/merge_requests?iid=#{merge_request.iid}"
      get api(url, user)
125 126 127
      expect(response.status).to eq 200
      expect(json_response.first['title']).to eq merge_request.title
      expect(json_response.first['id']).to eq merge_request.id
128 129
    end

130
    it "should return a 404 error if merge_request_id not found" do
131
      get api("/projects/#{project.id}/merge_requests/999", user)
132
      expect(response.status).to eq(404)
133
    end
V
Valeriy Sizov 已提交
134 135
  end

136
  describe 'GET /projects/:id/merge_requests/:merge_request_id/commits' do
137
    context 'valid merge request' do
138
      before { get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/commits", user) }
139 140 141 142 143 144 145 146 147
      let(:commit) { merge_request.commits.first }

      it { expect(response.status).to eq 200 }
      it { expect(json_response.size).to eq(merge_request.commits.size) }
      it { expect(json_response.first['id']).to eq(commit.id) }
      it { expect(json_response.first['title']).to eq(commit.title) }
    end

    it 'returns a 404 when merge_request_id not found' do
148
      get api("/projects/#{project.id}/merge_requests/999/commits", user)
149 150 151 152
      expect(response.status).to eq(404)
    end
  end

153
  describe 'GET /projects/:id/merge_requests/:merge_request_id/changes' do
154
    it 'should return the change information of the merge_request' do
155
      get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/changes", user)
156 157 158 159 160
      expect(response.status).to eq 200
      expect(json_response['changes'].size).to eq(merge_request.diffs.size)
    end

    it 'returns a 404 when merge_request_id not found' do
161
      get api("/projects/#{project.id}/merge_requests/999/changes", user)
162 163 164 165
      expect(response.status).to eq(404)
    end
  end

V
Valeriy Sizov 已提交
166
  describe "POST /projects/:id/merge_requests" do
I
Izaak Alpert 已提交
167 168
    context 'between branches projects' do
      it "should return merge_request" do
H
Hiroyuki Sato 已提交
169
        post api("/projects/#{project.id}/merge_requests", user),
170
             title: 'Test merge_request',
171
             source_branch: 'feature_conflict',
172 173
             target_branch: 'master',
             author: user,
174 175
             labels: 'label, label2',
             milestone_id: milestone.id
176 177 178
        expect(response.status).to eq(201)
        expect(json_response['title']).to eq('Test merge_request')
        expect(json_response['labels']).to eq(['label', 'label2'])
179
        expect(json_response['milestone']['id']).to eq(milestone.id)
I
Izaak Alpert 已提交
180
      end
181

I
Izaak Alpert 已提交
182
      it "should return 422 when source_branch equals target_branch" do
H
Hiroyuki Sato 已提交
183
        post api("/projects/#{project.id}/merge_requests", user),
184
        title: "Test merge_request", source_branch: "master", target_branch: "master", author: user
185
        expect(response.status).to eq(422)
I
Izaak Alpert 已提交
186
      end
187

I
Izaak Alpert 已提交
188
      it "should return 400 when source_branch is missing" do
H
Hiroyuki Sato 已提交
189
        post api("/projects/#{project.id}/merge_requests", user),
190
        title: "Test merge_request", target_branch: "master", author: user
191
        expect(response.status).to eq(400)
I
Izaak Alpert 已提交
192
      end
193

I
Izaak Alpert 已提交
194
      it "should return 400 when target_branch is missing" do
H
Hiroyuki Sato 已提交
195
        post api("/projects/#{project.id}/merge_requests", user),
196
        title: "Test merge_request", source_branch: "markdown", author: user
197
        expect(response.status).to eq(400)
I
Izaak Alpert 已提交
198 199 200
      end

      it "should return 400 when title is missing" do
H
Hiroyuki Sato 已提交
201
        post api("/projects/#{project.id}/merge_requests", user),
202
        target_branch: 'master', source_branch: 'markdown'
203
        expect(response.status).to eq(400)
I
Izaak Alpert 已提交
204
      end
205

R
Robert Schilling 已提交
206
      it 'should return 400 on invalid label names' do
207 208
        post api("/projects/#{project.id}/merge_requests", user),
             title: 'Test merge_request',
209
             source_branch: 'markdown',
210 211 212
             target_branch: 'master',
             author: user,
             labels: 'label, ?'
213 214
        expect(response.status).to eq(400)
        expect(json_response['message']['labels']['?']['title']).to eq(
R
Robert Schilling 已提交
215
          ['is invalid']
216
        )
217
      end
J
jubianchi 已提交
218 219 220 221 222

      context 'with existing MR' do
        before do
          post api("/projects/#{project.id}/merge_requests", user),
               title: 'Test merge_request',
223
               source_branch: 'feature_conflict',
J
jubianchi 已提交
224 225 226 227 228 229 230 231 232
               target_branch: 'master',
               author: user
          @mr = MergeRequest.all.last
        end

        it 'should return 409 when MR already exists for source/target' do
          expect do
            post api("/projects/#{project.id}/merge_requests", user),
                 title: 'New test merge_request',
233
                 source_branch: 'feature_conflict',
J
jubianchi 已提交
234 235 236
                 target_branch: 'master',
                 author: user
          end.to change { MergeRequest.count }.by(0)
237
          expect(response.status).to eq(409)
J
jubianchi 已提交
238 239
        end
      end
240
    end
241

I
Izaak Alpert 已提交
242
    context 'forked projects' do
D
Dmitriy Zaporozhets 已提交
243 244 245
      let!(:user2) { create(:user) }
      let!(:fork_project) { create(:project, forked_from_project: project,  namespace: user2.namespace, creator_id: user2.id) }
      let!(:unrelated_project) { create(:project,  namespace: create(:user).namespace, creator_id: user2.id) }
I
Izaak Alpert 已提交
246 247 248 249 250 251

      before :each do |each|
        fork_project.team << [user2, :reporters]
      end

      it "should return merge_request" do
H
Hiroyuki Sato 已提交
252
        post api("/projects/#{fork_project.id}/merge_requests", user2),
253 254
          title: 'Test merge_request', source_branch: "feature_conflict", target_branch: "master",
          author: user2, target_project_id: project.id, description: 'Test description for Test merge_request'
255 256 257
        expect(response.status).to eq(201)
        expect(json_response['title']).to eq('Test merge_request')
        expect(json_response['description']).to eq('Test description for Test merge_request')
I
Izaak Alpert 已提交
258 259 260
      end

      it "should not return 422 when source_branch equals target_branch" do
261 262 263
        expect(project.id).not_to eq(fork_project.id)
        expect(fork_project.forked?).to be_truthy
        expect(fork_project.forked_from_project).to eq(project)
H
Hiroyuki Sato 已提交
264
        post api("/projects/#{fork_project.id}/merge_requests", user2),
265
        title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id
266 267
        expect(response.status).to eq(201)
        expect(json_response['title']).to eq('Test merge_request')
I
Izaak Alpert 已提交
268 269 270
      end

      it "should return 400 when source_branch is missing" do
H
Hiroyuki Sato 已提交
271
        post api("/projects/#{fork_project.id}/merge_requests", user2),
272
        title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id
273
        expect(response.status).to eq(400)
I
Izaak Alpert 已提交
274 275 276
      end

      it "should return 400 when target_branch is missing" do
H
Hiroyuki Sato 已提交
277
        post api("/projects/#{fork_project.id}/merge_requests", user2),
278
        title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id
279
        expect(response.status).to eq(400)
I
Izaak Alpert 已提交
280 281 282
      end

      it "should return 400 when title is missing" do
H
Hiroyuki Sato 已提交
283
        post api("/projects/#{fork_project.id}/merge_requests", user2),
284
        target_branch: 'master', source_branch: 'markdown', author: user2, target_project_id: project.id
285
        expect(response.status).to eq(400)
I
Izaak Alpert 已提交
286 287
      end

J
jubianchi 已提交
288 289 290 291 292
      context 'when target_branch is specified' do
        it 'should return 422 if not a forked project' do
          post api("/projects/#{project.id}/merge_requests", user),
               title: 'Test merge_request',
               target_branch: 'master',
293
               source_branch: 'markdown',
J
jubianchi 已提交
294 295
               author: user,
               target_project_id: fork_project.id
296
          expect(response.status).to eq(422)
J
jubianchi 已提交
297
        end
I
Izaak Alpert 已提交
298

J
jubianchi 已提交
299 300 301 302
        it 'should return 422 if targeting a different fork' do
          post api("/projects/#{fork_project.id}/merge_requests", user2),
               title: 'Test merge_request',
               target_branch: 'master',
303
               source_branch: 'markdown',
J
jubianchi 已提交
304 305
               author: user2,
               target_project_id: unrelated_project.id
306
          expect(response.status).to eq(422)
J
jubianchi 已提交
307
        end
I
Izaak Alpert 已提交
308 309 310
      end

      it "should return 201 when target_branch is specified and for the same project" do
H
Hiroyuki Sato 已提交
311
        post api("/projects/#{fork_project.id}/merge_requests", user2),
312
        title: 'Test merge_request', target_branch: 'master', source_branch: 'markdown', author: user2, target_project_id: fork_project.id
313
        expect(response.status).to eq(201)
I
Izaak Alpert 已提交
314
      end
315
    end
V
Valeriy Sizov 已提交
316 317
  end

318
  describe "PUT /projects/:id/merge_requests/:merge_request_id to close MR" do
A
Andrew8xx8 已提交
319
    it "should return merge_request" do
320
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), state_event: "close"
321 322
      expect(response.status).to eq(200)
      expect(json_response['state']).to eq('closed')
A
Andrew8xx8 已提交
323 324 325
    end
  end

326
  describe "PUT /projects/:id/merge_requests/:merge_request_id/merge" do
Z
Zeger-Jan van de Weg 已提交
327
    let(:ci_commit) { create(:ci_commit_without_jobs) }
328

329
    it "should return merge_request in case of success" do
330
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
331

332
      expect(response.status).to eq(200)
333 334
    end

335
    it "should return 406 if branch can't be merged" do
336 337 338
      allow_any_instance_of(MergeRequest).
        to receive(:can_be_merged?).and_return(false)

339
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
340

341
      expect(response.status).to eq(406)
342
      expect(json_response['message']).to eq('Branch cannot be merged')
A
Andrew8xx8 已提交
343
    end
D
Dmitriy Zaporozhets 已提交
344 345 346

    it "should return 405 if merge_request is not open" do
      merge_request.close
347
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
348 349
      expect(response.status).to eq(405)
      expect(json_response['message']).to eq('405 Method Not Allowed')
D
Dmitriy Zaporozhets 已提交
350 351
    end

352 353
    it "should return 405 if merge_request is a work in progress" do
      merge_request.update_attribute(:title, "WIP: #{merge_request.title}")
354
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user)
355 356 357 358
      expect(response.status).to eq(405)
      expect(json_response['message']).to eq('405 Method Not Allowed')
    end

D
Dmitriy Zaporozhets 已提交
359 360 361
    it "should return 401 if user has no permissions to merge" do
      user2 = create(:user)
      project.team << [user2, :reporter]
362
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user2)
363 364
      expect(response.status).to eq(401)
      expect(json_response['message']).to eq('401 Unauthorized')
D
Dmitriy Zaporozhets 已提交
365
    end
366 367 368 369 370

    it "enables merge when build succeeds if the ci is active" do
      allow_any_instance_of(MergeRequest).to receive(:ci_commit).and_return(ci_commit)
      allow(ci_commit).to receive(:active?).and_return(true)

371
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user), merge_when_build_succeeds: true
372 373 374 375 376

      expect(response.status).to eq(200)
      expect(json_response['title']).to eq('Test')
      expect(json_response['merge_when_build_succeeds']).to eq(true)
    end
A
Andrew8xx8 已提交
377 378
  end

379
  describe "PUT /projects/:id/merge_requests/:merge_request_id" do
380
    it "updates title and returns merge_request" do
381
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), title: "New title"
382 383
      expect(response.status).to eq(200)
      expect(json_response['title']).to eq('New title')
V
Valeriy Sizov 已提交
384
    end
385

386
    it "updates description and returns merge_request" do
387
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), description: "New description"
388 389
      expect(response.status).to eq(200)
      expect(json_response['description']).to eq('New description')
390 391
    end

392 393 394 395 396 397
    it "updates milestone_id and returns merge_request" do
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), milestone_id: milestone.id
      expect(response.status).to eq(200)
      expect(json_response['milestone']['id']).to eq(milestone.id)
    end

398
    it "should return 400 when source_branch is specified" do
399
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user),
400
      source_branch: "master", target_branch: "master"
401
      expect(response.status).to eq(400)
402 403 404
    end

    it "should return merge_request with renamed target_branch" do
405
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), target_branch: "wiki"
406 407
      expect(response.status).to eq(200)
      expect(json_response['target_branch']).to eq('wiki')
408
    end
409

R
Robert Schilling 已提交
410
    it 'should return 400 on invalid label names' do
411
      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}",
412 413 414
              user),
          title: 'new issue',
          labels: 'label, ?'
415 416
      expect(response.status).to eq(400)
      expect(json_response['message']['labels']['?']['title']).to eq(['is invalid'])
417
    end
V
Valeriy Sizov 已提交
418 419
  end

420
  describe "POST /projects/:id/merge_requests/:merge_request_id/comments" do
V
Valeriy Sizov 已提交
421
    it "should return comment" do
422 423
      original_count = merge_request.notes.size

424
      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/comments", user), note: "My comment"
425 426
      expect(response.status).to eq(201)
      expect(json_response['note']).to eq('My comment')
427 428 429
      expect(json_response['author']['name']).to eq(user.name)
      expect(json_response['author']['username']).to eq(user.username)
      expect(merge_request.notes.size).to eq(original_count + 1)
V
Valeriy Sizov 已提交
430
    end
431 432

    it "should return 400 if note is missing" do
433
      post api("/projects/#{project.id}/merge_requests/#{merge_request.id}/comments", user)
434
      expect(response.status).to eq(400)
435
    end
436 437

    it "should return 404 if note is attached to non existent merge request" do
438
      post api("/projects/#{project.id}/merge_requests/404/comments", user),
J
jubianchi 已提交
439
           note: 'My comment'
440
      expect(response.status).to eq(404)
441
    end
V
Valeriy Sizov 已提交
442
  end
443

444
  describe "GET :id/merge_requests/:merge_request_id/comments" do
445
    it "should return merge_request comments ordered by created_at" do
446
      get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/comments", user)
447 448
      expect(response.status).to eq(200)
      expect(json_response).to be_an Array
449
      expect(json_response.length).to eq(2)
450 451
      expect(json_response.first['note']).to eq("a comment on a MR")
      expect(json_response.first['author']['id']).to eq(user.id)
452
      expect(json_response.last['note']).to eq("another comment on a MR")
453 454 455
    end

    it "should return a 404 error if merge_request_id not found" do
456
      get api("/projects/#{project.id}/merge_requests/999/comments", user)
457
      expect(response.status).to eq(404)
458 459
    end
  end
460

461 462 463 464 465 466
  describe 'GET :id/merge_requests/:merge_request_id/closes_issues' do
    it 'returns the issue that will be closed on merge' do
      issue = create(:issue, project: project)
      mr = merge_request.tap do |mr|
        mr.update_attribute(:description, "Closes #{issue.to_reference(mr.project)}")
      end
467

468
      get api("/projects/#{project.id}/merge_requests/#{mr.id}/closes_issues", user)
469 470 471 472 473 474
      expect(response.status).to eq(200)
      expect(json_response).to be_an Array
      expect(json_response.length).to eq(1)
      expect(json_response.first['id']).to eq(issue.id)
    end

475
    it 'returns an empty array when there are no issues to be closed' do
476 477 478 479 480 481 482
      get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/closes_issues", user)
      expect(response.status).to eq(200)
      expect(json_response).to be_an Array
      expect(json_response.length).to eq(0)
    end
  end

483 484 485 486 487 488 489 490 491 492 493 494 495 496 497
  def mr_with_later_created_and_updated_at_time
    merge_request
    merge_request.created_at += 1.hour
    merge_request.updated_at += 30.minutes
    merge_request.save
    merge_request
  end

  def mr_with_earlier_created_and_updated_at_time
    merge_request_closed
    merge_request_closed.created_at -= 1.hour
    merge_request_closed.updated_at -= 30.minutes
    merge_request_closed.save
    merge_request_closed
  end
V
Valeriy Sizov 已提交
498
end