merge_requests_spec.rb 17.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
I
Izaak Alpert 已提交
5
  let(:user) { create(:user) }
D
Dmitriy Zaporozhets 已提交
6
  let!(:project) {create(:project, creator_id: user.id, namespace: user.namespace) }
D
Dmitriy Zaporozhets 已提交
7
  let!(:merge_request) { create(:merge_request, :simple, author: user, assignee: user, source_project: project, target_project: project, title: "Test") }
8 9
  let!(:merge_request_closed) { create(:merge_request, state: "closed", author: user, assignee: user, source_project: project, target_project: project, title: "Closed test") }
  let!(:merge_request_merged) { create(:merge_request, state: "merged", author: user, assignee: user, source_project: project, target_project: project, title: "Merged test") }
10
  let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") }
11 12

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

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

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

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

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

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

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

      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)
73 74 75 76 77
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
          expect(json_response.last['id']).to eq(@mr_earlier.id)
          expect(json_response.first['id']).to eq(@mr_later.id)
78
        end
D
Dmitriy Zaporozhets 已提交
79

80 81
        it "should return an array of merge_requests in descending order" do
          get api("/projects/#{project.id}/merge_requests?sort=desc", user)
82 83 84 85 86
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
          expect(json_response.first['id']).to eq(@mr_later.id)
          expect(json_response.last['id']).to eq(@mr_earlier.id)
87
        end
D
Dmitriy Zaporozhets 已提交
88

89 90
        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)
91 92 93 94 95
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
          expect(json_response.last['id']).to eq(@mr_earlier.id)
          expect(json_response.first['id']).to eq(@mr_later.id)
96
        end
D
Dmitriy Zaporozhets 已提交
97

98 99
        it "should return an array of merge_requests ordered by created_at" do
          get api("/projects/#{project.id}/merge_requests?sort=created_at", user)
100 101 102 103 104
          expect(response.status).to eq(200)
          expect(json_response).to be_an Array
          expect(json_response.length).to eq(3)
          expect(json_response.last['id']).to eq(@mr_earlier.id)
          expect(json_response.first['id']).to eq(@mr_later.id)
105
        end
106
      end
V
Valeriy Sizov 已提交
107 108 109 110 111
    end
  end

  describe "GET /projects/:id/merge_request/:merge_request_id" do
    it "should return merge_request" do
H
Hiroyuki Sato 已提交
112
      get api("/projects/#{project.id}/merge_request/#{merge_request.id}", user)
113 114 115
      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 已提交
116
    end
117

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

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

132 133 134 135 136 137 138 139 140 141 142 143 144
  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 已提交
145
  describe "POST /projects/:id/merge_requests" do
I
Izaak Alpert 已提交
146 147
    context 'between branches projects' do
      it "should return merge_request" do
H
Hiroyuki Sato 已提交
148
        post api("/projects/#{project.id}/merge_requests", user),
149 150 151 152 153
             title: 'Test merge_request',
             source_branch: 'stable',
             target_branch: 'master',
             author: user,
             labels: 'label, label2'
154 155 156
        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 已提交
157
      end
158

I
Izaak Alpert 已提交
159
      it "should return 422 when source_branch equals target_branch" do
H
Hiroyuki Sato 已提交
160
        post api("/projects/#{project.id}/merge_requests", user),
161
        title: "Test merge_request", source_branch: "master", target_branch: "master", author: user
162
        expect(response.status).to eq(422)
I
Izaak Alpert 已提交
163
      end
164

I
Izaak Alpert 已提交
165
      it "should return 400 when source_branch is missing" do
H
Hiroyuki Sato 已提交
166
        post api("/projects/#{project.id}/merge_requests", user),
167
        title: "Test merge_request", target_branch: "master", author: user
168
        expect(response.status).to eq(400)
I
Izaak Alpert 已提交
169
      end
170

I
Izaak Alpert 已提交
171
      it "should return 400 when target_branch is missing" do
H
Hiroyuki Sato 已提交
172
        post api("/projects/#{project.id}/merge_requests", user),
173
        title: "Test merge_request", source_branch: "stable", author: user
174
        expect(response.status).to eq(400)
I
Izaak Alpert 已提交
175 176 177
      end

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

R
Robert Schilling 已提交
183
      it 'should return 400 on invalid label names' do
184 185 186 187 188 189
        post api("/projects/#{project.id}/merge_requests", user),
             title: 'Test merge_request',
             source_branch: 'stable',
             target_branch: 'master',
             author: user,
             labels: 'label, ?'
190 191
        expect(response.status).to eq(400)
        expect(json_response['message']['labels']['?']['title']).to eq(
R
Robert Schilling 已提交
192
          ['is invalid']
193
        )
194
      end
J
jubianchi 已提交
195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213

      context 'with existing MR' do
        before do
          post api("/projects/#{project.id}/merge_requests", user),
               title: 'Test merge_request',
               source_branch: 'stable',
               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',
                 source_branch: 'stable',
                 target_branch: 'master',
                 author: user
          end.to change { MergeRequest.count }.by(0)
214
          expect(response.status).to eq(409)
J
jubianchi 已提交
215 216
        end
      end
217
    end
218

I
Izaak Alpert 已提交
219
    context 'forked projects' do
D
Dmitriy Zaporozhets 已提交
220 221 222
      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 已提交
223 224 225 226 227 228

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

      it "should return merge_request" do
H
Hiroyuki Sato 已提交
229
        post api("/projects/#{fork_project.id}/merge_requests", user2),
230
        title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id, description: 'Test description for Test merge_request'
231 232 233
        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 已提交
234 235 236
      end

      it "should not return 422 when source_branch equals target_branch" do
237 238 239
        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 已提交
240
        post api("/projects/#{fork_project.id}/merge_requests", user2),
241
        title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id
242 243
        expect(response.status).to eq(201)
        expect(json_response['title']).to eq('Test merge_request')
I
Izaak Alpert 已提交
244 245 246
      end

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

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

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

J
jubianchi 已提交
264 265 266 267 268 269 270 271
      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',
               source_branch: 'stable',
               author: user,
               target_project_id: fork_project.id
272
          expect(response.status).to eq(422)
J
jubianchi 已提交
273
        end
I
Izaak Alpert 已提交
274

J
jubianchi 已提交
275 276 277 278 279 280 281
        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',
               source_branch: 'stable',
               author: user2,
               target_project_id: unrelated_project.id
282
          expect(response.status).to eq(422)
J
jubianchi 已提交
283
        end
I
Izaak Alpert 已提交
284 285 286
      end

      it "should return 201 when target_branch is specified and for the same project" do
H
Hiroyuki Sato 已提交
287
        post api("/projects/#{fork_project.id}/merge_requests", user2),
288
        title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: fork_project.id
289
        expect(response.status).to eq(201)
I
Izaak Alpert 已提交
290
      end
291
    end
V
Valeriy Sizov 已提交
292 293
  end

A
Andrew8xx8 已提交
294 295
  describe "PUT /projects/:id/merge_request/:merge_request_id to close MR" do
    it "should return merge_request" do
H
Hiroyuki Sato 已提交
296
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "close"
297 298
      expect(response.status).to eq(200)
      expect(json_response['state']).to eq('closed')
A
Andrew8xx8 已提交
299 300 301
    end
  end

302 303
  describe "PUT /projects/:id/merge_request/:merge_request_id/merge" do
    it "should return merge_request in case of success" do
304 305 306
      allow_any_instance_of(MergeRequest).
        to receive_messages(can_be_merged?: true, automerge!: true)

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

309
      expect(response.status).to eq(200)
310 311 312
    end

    it "should return 405 if branch can't be merged" do
313 314 315
      allow_any_instance_of(MergeRequest).
        to receive(:can_be_merged?).and_return(false)

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

318 319
      expect(response.status).to eq(405)
      expect(json_response['message']).to eq('Branch cannot be merged')
A
Andrew8xx8 已提交
320
    end
D
Dmitriy Zaporozhets 已提交
321 322 323 324

    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)
325 326
      expect(response.status).to eq(405)
      expect(json_response['message']).to eq('405 Method Not Allowed')
D
Dmitriy Zaporozhets 已提交
327 328
    end

329 330 331 332 333 334 335
    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 已提交
336 337 338 339
    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)
340 341
      expect(response.status).to eq(401)
      expect(json_response['message']).to eq('401 Unauthorized')
D
Dmitriy Zaporozhets 已提交
342
    end
A
Andrew8xx8 已提交
343 344
  end

V
Valeriy Sizov 已提交
345 346
  describe "PUT /projects/:id/merge_request/:merge_request_id" do
    it "should return merge_request" do
H
Hiroyuki Sato 已提交
347
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title"
348 349
      expect(response.status).to eq(200)
      expect(json_response['title']).to eq('New title')
V
Valeriy Sizov 已提交
350
    end
351

352 353
    it "should return merge_request" do
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), description: "New description"
354 355
      expect(response.status).to eq(200)
      expect(json_response['description']).to eq('New description')
356 357
    end

358
    it "should return 400 when source_branch is specified" do
H
Hiroyuki Sato 已提交
359
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user),
360
      source_branch: "master", target_branch: "master"
361
      expect(response.status).to eq(400)
362 363 364
    end

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

R
Robert Schilling 已提交
370
    it 'should return 400 on invalid label names' do
371 372 373 374
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}",
              user),
          title: 'new issue',
          labels: 'label, ?'
375 376
      expect(response.status).to eq(400)
      expect(json_response['message']['labels']['?']['title']).to eq(['is invalid'])
377
    end
V
Valeriy Sizov 已提交
378 379 380 381
  end

  describe "POST /projects/:id/merge_request/:merge_request_id/comments" do
    it "should return comment" do
H
Hiroyuki Sato 已提交
382
      post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user), note: "My comment"
383 384
      expect(response.status).to eq(201)
      expect(json_response['note']).to eq('My comment')
V
Valeriy Sizov 已提交
385
    end
386 387

    it "should return 400 if note is missing" do
H
Hiroyuki Sato 已提交
388
      post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
389
      expect(response.status).to eq(400)
390
    end
391 392

    it "should return 404 if note is attached to non existent merge request" do
J
jubianchi 已提交
393 394
      post api("/projects/#{project.id}/merge_request/404/comments", user),
           note: 'My comment'
395
      expect(response.status).to eq(404)
396
    end
V
Valeriy Sizov 已提交
397
  end
398 399 400 401

  describe "GET :id/merge_request/:merge_request_id/comments" do
    it "should return merge_request comments" do
      get api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
402 403 404 405 406
      expect(response.status).to eq(200)
      expect(json_response).to be_an Array
      expect(json_response.length).to eq(1)
      expect(json_response.first['note']).to eq("a comment on a MR")
      expect(json_response.first['author']['id']).to eq(user.id)
407 408 409 410
    end

    it "should return a 404 error if merge_request_id not found" do
      get api("/projects/#{project.id}/merge_request/999/comments", user)
411
      expect(response.status).to eq(404)
412 413
    end
  end
414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429

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