merge_requests_spec.rb 17.4 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") }
I
Izaak Alpert 已提交
11 12 13
  before {
    project.team << [user, :reporters]
  }
V
Valeriy Sizov 已提交
14 15 16 17

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

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

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

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

48 49
      it "should return an array of closed merge_requests" do
        get api("/projects/#{project.id}/merge_requests?state=closed", user)
50 51 52 53 54
        expect(response.status).to eq(200)
        expect(json_response).to be_an Array
        expect(json_response.length).to eq(2)
        expect(json_response.second['title']).to eq(merge_request_closed.title)
        expect(json_response.first['title']).to eq(merge_request_merged.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

    it "should return a 404 error if merge_request_id not found" do
H
Hiroyuki Sato 已提交
119
      get api("/projects/#{project.id}/merge_request/999", user)
120
      expect(response.status).to eq(404)
121
    end
V
Valeriy Sizov 已提交
122 123
  end

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

I
Izaak Alpert 已提交
151
      it "should return 422 when source_branch equals target_branch" do
H
Hiroyuki Sato 已提交
152
        post api("/projects/#{project.id}/merge_requests", user),
153
        title: "Test merge_request", source_branch: "master", target_branch: "master", author: user
154
        expect(response.status).to eq(422)
I
Izaak Alpert 已提交
155
      end
156

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

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

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

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

      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)
206
          expect(response.status).to eq(409)
J
jubianchi 已提交
207 208
        end
      end
209
    end
210

I
Izaak Alpert 已提交
211
    context 'forked projects' do
D
Dmitriy Zaporozhets 已提交
212 213 214
      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 已提交
215 216 217 218 219 220

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

      it "should return merge_request" do
H
Hiroyuki Sato 已提交
221
        post api("/projects/#{fork_project.id}/merge_requests", user2),
222
        title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id, description: 'Test description for Test merge_request'
223 224 225
        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 已提交
226 227 228
      end

      it "should not return 422 when source_branch equals target_branch" do
229 230 231
        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 已提交
232
        post api("/projects/#{fork_project.id}/merge_requests", user2),
233
        title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id
234 235
        expect(response.status).to eq(201)
        expect(json_response['title']).to eq('Test merge_request')
I
Izaak Alpert 已提交
236 237 238
      end

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

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

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

J
jubianchi 已提交
256 257 258 259 260 261 262 263
      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
264
          expect(response.status).to eq(422)
J
jubianchi 已提交
265
        end
I
Izaak Alpert 已提交
266

J
jubianchi 已提交
267 268 269 270 271 272 273
        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
274
          expect(response.status).to eq(422)
J
jubianchi 已提交
275
        end
I
Izaak Alpert 已提交
276 277 278
      end

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

A
Andrew8xx8 已提交
286 287
  describe "PUT /projects/:id/merge_request/:merge_request_id to close MR" do
    it "should return merge_request" do
H
Hiroyuki Sato 已提交
288
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), state_event: "close"
289 290
      expect(response.status).to eq(200)
      expect(json_response['state']).to eq('closed')
A
Andrew8xx8 已提交
291 292 293
    end
  end

294 295 296 297
  describe "PUT /projects/:id/merge_request/:merge_request_id/merge" do
    it "should return merge_request in case of success" do
      MergeRequest.any_instance.stub(can_be_merged?: true, automerge!: true)
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)
298
      expect(response.status).to eq(200)
299 300 301 302 303
    end

    it "should return 405 if branch can't be merged" do
      MergeRequest.any_instance.stub(can_be_merged?: false)
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)
304 305
      expect(response.status).to eq(405)
      expect(json_response['message']).to eq('Branch cannot be merged')
A
Andrew8xx8 已提交
306
    end
D
Dmitriy Zaporozhets 已提交
307 308 309 310

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

315 316 317 318 319 320 321
    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 已提交
322 323 324 325
    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)
326 327
      expect(response.status).to eq(401)
      expect(json_response['message']).to eq('401 Unauthorized')
D
Dmitriy Zaporozhets 已提交
328
    end
A
Andrew8xx8 已提交
329 330
  end

V
Valeriy Sizov 已提交
331 332
  describe "PUT /projects/:id/merge_request/:merge_request_id" do
    it "should return merge_request" do
H
Hiroyuki Sato 已提交
333
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title"
334 335
      expect(response.status).to eq(200)
      expect(json_response['title']).to eq('New title')
V
Valeriy Sizov 已提交
336
    end
337

338 339
    it "should return merge_request" do
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), description: "New description"
340 341
      expect(response.status).to eq(200)
      expect(json_response['description']).to eq('New description')
342 343
    end

344
    it "should return 422 when source_branch and target_branch are renamed the same" do
H
Hiroyuki Sato 已提交
345
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user),
346
      source_branch: "master", target_branch: "master"
347
      expect(response.status).to eq(422)
348 349 350
    end

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

R
Robert Schilling 已提交
356
    it 'should return 400 on invalid label names' do
357 358 359 360
      put api("/projects/#{project.id}/merge_request/#{merge_request.id}",
              user),
          title: 'new issue',
          labels: 'label, ?'
361 362
      expect(response.status).to eq(400)
      expect(json_response['message']['labels']['?']['title']).to eq(['is invalid'])
363
    end
V
Valeriy Sizov 已提交
364 365 366 367
  end

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

    it "should return 400 if note is missing" do
H
Hiroyuki Sato 已提交
374
      post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user)
375
      expect(response.status).to eq(400)
376
    end
377 378

    it "should return 404 if note is attached to non existent merge request" do
J
jubianchi 已提交
379 380
      post api("/projects/#{project.id}/merge_request/404/comments", user),
           note: 'My comment'
381
      expect(response.status).to eq(404)
382
    end
V
Valeriy Sizov 已提交
383
  end
384 385 386 387

  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)
388 389 390 391 392
      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)
393 394 395 396
    end

    it "should return a 404 error if merge_request_id not found" do
      get api("/projects/#{project.id}/merge_request/999/comments", user)
397
      expect(response.status).to eq(404)
398 399
    end
  end
400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415

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