merge_requests_spec.rb 19.7 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 9 10
  let!(:merge_request) { create(:merge_request, :simple, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time) }
  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.seconds) }
  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 14

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

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

    context "when authenticated" do
27
      it "should return an array of all merge_requests" do
H
Hiroyuki Sato 已提交
28
        get api("/projects/#{project.id}/merge_requests", user)
29 30 31 32
        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 已提交
33
      end
34

35 36
      it "should return an array of all merge_requests" do
        get api("/projects/#{project.id}/merge_requests?state", user)
37 38 39 40
        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)
41
      end
42

43 44
      it "should return an array of open merge_requests" do
        get api("/projects/#{project.id}/merge_requests?state=opened", user)
45 46 47 48
        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)
49
      end
50

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

59 60
      it "should return an array of merged merge_requests" do
        get api("/projects/#{project.id}/merge_requests?state=merged", user)
61 62 63 64
        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)
65
      end
66 67 68 69 70 71 72 73 74

      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)
75 76 77
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
S
Stan Hu 已提交
78 79
          response_dates = json_response.map{ |merge_request| merge_request['created_at'] }
          expect(response_dates).to eq(response_dates.sort)
80
        end
D
Dmitriy Zaporozhets 已提交
81

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

91 92
        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)
93 94 95
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
S
Stan Hu 已提交
96 97
          response_dates = json_response.map{ |merge_request| merge_request['updated_at'] }
          expect(response_dates).to eq(response_dates.sort.reverse)
98
        end
D
Dmitriy Zaporozhets 已提交
99

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

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

120 121 122
    it 'should return merge_request by iid' do
      url = "/projects/#{project.id}/merge_requests?iid=#{merge_request.iid}"
      get api(url, user)
123 124 125
      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
126 127
    end

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

134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150
  describe 'GET /projects/:id/merge_request/:merge_request_id/commits' do
    context 'valid merge request' do
      before { get api("/projects/#{project.id}/merge_request/#{merge_request.id}/commits", user) }
      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
      get api("/projects/#{project.id}/merge_request/999/commits", user)
      expect(response.status).to eq(404)
    end
  end

151 152 153 154 155 156 157 158 159 160 161 162 163
  describe 'GET /projects/:id/merge_request/:merge_request_id/changes' do
    it 'should return the change information of the merge_request' do
      get api("/projects/#{project.id}/merge_request/#{merge_request.id}/changes", user)
      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
      get api("/projects/#{project.id}/merge_request/999/changes", user)
      expect(response.status).to eq(404)
    end
  end

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

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

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

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

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

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

      context 'with existing MR' do
        before do
          post api("/projects/#{project.id}/merge_requests", user),
               title: 'Test merge_request',
219
               source_branch: 'feature_conflict',
J
jubianchi 已提交
220 221 222 223 224 225 226 227 228
               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',
229
                 source_branch: 'feature_conflict',
J
jubianchi 已提交
230 231 232
                 target_branch: 'master',
                 author: user
          end.to change { MergeRequest.count }.by(0)
233
          expect(response.status).to eq(409)
J
jubianchi 已提交
234 235
        end
      end
236
    end
237

I
Izaak Alpert 已提交
238
    context 'forked projects' do
D
Dmitriy Zaporozhets 已提交
239 240 241
      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 已提交
242 243 244 245 246 247

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

      it "should return merge_request" do
H
Hiroyuki Sato 已提交
248
        post api("/projects/#{fork_project.id}/merge_requests", user2),
249 250
          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'
251 252 253
        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 已提交
254 255 256
      end

      it "should not return 422 when source_branch equals target_branch" do
257 258 259
        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 已提交
260
        post api("/projects/#{fork_project.id}/merge_requests", user2),
261
        title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id
262 263
        expect(response.status).to eq(201)
        expect(json_response['title']).to eq('Test merge_request')
I
Izaak Alpert 已提交
264 265 266
      end

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

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

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

J
jubianchi 已提交
284 285 286 287 288
      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',
289
               source_branch: 'markdown',
J
jubianchi 已提交
290 291
               author: user,
               target_project_id: fork_project.id
292
          expect(response.status).to eq(422)
J
jubianchi 已提交
293
        end
I
Izaak Alpert 已提交
294

J
jubianchi 已提交
295 296 297 298
        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',
299
               source_branch: 'markdown',
J
jubianchi 已提交
300 301
               author: user2,
               target_project_id: unrelated_project.id
302
          expect(response.status).to eq(422)
J
jubianchi 已提交
303
        end
I
Izaak Alpert 已提交
304 305 306
      end

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

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

322
  describe "PUT /projects/:id/merge_request/:merge_request_id/merge" do
Z
Zeger-Jan van de Weg 已提交
323
    let(:ci_commit) { create(:ci_commit_without_jobs) }
324

325 326
    it "should return merge_request in case of success" do
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)
327

328
      expect(response.status).to eq(200)
329 330
    end

331
    it "should return 406 if branch can't be merged" do
332 333 334
      allow_any_instance_of(MergeRequest).
        to receive(:can_be_merged?).and_return(false)

335
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)
336

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

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

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

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

    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)

      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user), merge_when_build_succeeds: true

      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 已提交
373 374
  end

V
Valeriy Sizov 已提交
375 376
  describe "PUT /projects/:id/merge_request/:merge_request_id" do
    it "should return merge_request" do
H
Hiroyuki Sato 已提交
377
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title"
378 379
      expect(response.status).to eq(200)
      expect(json_response['title']).to eq('New title')
V
Valeriy Sizov 已提交
380
    end
381

382 383
    it "should return merge_request" do
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), description: "New description"
384 385
      expect(response.status).to eq(200)
      expect(json_response['description']).to eq('New description')
386 387
    end

388
    it "should return 400 when source_branch is specified" do
H
Hiroyuki Sato 已提交
389
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user),
390
      source_branch: "master", target_branch: "master"
391
      expect(response.status).to eq(400)
392 393 394
    end

    it "should return merge_request with renamed target_branch" do
H
Hiroyuki Sato 已提交
395
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), target_branch: "wiki"
396 397
      expect(response.status).to eq(200)
      expect(json_response['target_branch']).to eq('wiki')
398
    end
399

R
Robert Schilling 已提交
400
    it 'should return 400 on invalid label names' do
401 402 403 404
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}",
              user),
          title: 'new issue',
          labels: 'label, ?'
405 406
      expect(response.status).to eq(400)
      expect(json_response['message']['labels']['?']['title']).to eq(['is invalid'])
407
    end
V
Valeriy Sizov 已提交
408 409 410 411
  end

  describe "POST /projects/:id/merge_request/:merge_request_id/comments" do
    it "should return comment" do
412 413
      original_count = merge_request.notes.size

H
Hiroyuki Sato 已提交
414
      post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user), note: "My comment"
415 416
      expect(response.status).to eq(201)
      expect(json_response['note']).to eq('My comment')
417 418 419
      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 已提交
420
    end
421 422

    it "should return 400 if note is missing" do
H
Hiroyuki Sato 已提交
423
      post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
424
      expect(response.status).to eq(400)
425
    end
426 427

    it "should return 404 if note is attached to non existent merge request" do
J
jubianchi 已提交
428 429
      post api("/projects/#{project.id}/merge_request/404/comments", user),
           note: 'My comment'
430
      expect(response.status).to eq(404)
431
    end
V
Valeriy Sizov 已提交
432
  end
433 434

  describe "GET :id/merge_request/:merge_request_id/comments" do
435
    it "should return merge_request comments ordered by created_at" do
436
      get api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
437 438
      expect(response.status).to eq(200)
      expect(json_response).to be_an Array
439
      expect(json_response.length).to eq(2)
440 441
      expect(json_response.first['note']).to eq("a comment on a MR")
      expect(json_response.first['author']['id']).to eq(user.id)
442
      expect(json_response.last['note']).to eq("another comment on a MR")
443 444 445 446
    end

    it "should return a 404 error if merge_request_id not found" do
      get api("/projects/#{project.id}/merge_request/999/comments", user)
447
      expect(response.status).to eq(404)
448 449
    end
  end
450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465

  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 已提交
466
end