commits_spec.rb 20.5 KB
Newer Older
1 2 3
require 'spec_helper'
require 'mime/types'

4
describe API::Commits, api: true  do
5 6 7
  include ApiHelpers
  let(:user) { create(:user) }
  let(:user2) { create(:user) }
8
  let!(:project) { create(:project, :repository, creator: user, namespace: user.namespace) }
9 10
  let!(:master) { create(:project_member, :master, user: user, project: project) }
  let!(:guest) { create(:project_member, :guest, user: user2, project: project) }
11
  let!(:note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'a comment on a commit') }
12
  let!(:another_note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'another comment on a commit') }
13 14 15

  before { project.team << [user, :reporter] }

M
Marc Siegfriedt 已提交
16
  describe "List repository commits" do
17 18 19
    context "authorized user" do
      before { project.team << [user2, :reporter] }

20
      it "returns project commits" do
21
        commit = project.repository.commit
22 23
        get api("/projects/#{project.id}/repository/commits", user)

24
        expect(response).to have_http_status(200)
25
        expect(json_response).to be_an Array
26 27 28
        expect(json_response.first['id']).to eq(commit.id)
        expect(json_response.first['committer_name']).to eq(commit.committer_name)
        expect(json_response.first['committer_email']).to eq(commit.committer_email)
29 30 31 32
      end
    end

    context "unauthorized user" do
33
      it "does not return project commits" do
34
        get api("/projects/#{project.id}/repository/commits")
Z
Z.J. van de Weg 已提交
35
        expect(response).to have_http_status(401)
36 37
      end
    end
38 39

    context "since optional parameter" do
40
      it "returns project commits since provided parameter" do
41 42 43 44 45 46 47 48 49 50 51 52
        commits = project.repository.commits("master")
        since = commits.second.created_at

        get api("/projects/#{project.id}/repository/commits?since=#{since.utc.iso8601}", user)

        expect(json_response.size).to eq 2
        expect(json_response.first["id"]).to eq(commits.first.id)
        expect(json_response.second["id"]).to eq(commits.second.id)
      end
    end

    context "until optional parameter" do
53
      it "returns project commits until provided parameter" do
54 55 56 57 58
        commits = project.repository.commits("master")
        before = commits.second.created_at

        get api("/projects/#{project.id}/repository/commits?until=#{before.utc.iso8601}", user)

59 60 61 62 63 64
        if commits.size >= 20
          expect(json_response.size).to eq(20)
        else
          expect(json_response.size).to eq(commits.size - 1)
        end

65 66 67 68 69 70
        expect(json_response.first["id"]).to eq(commits.second.id)
        expect(json_response.second["id"]).to eq(commits.third.id)
      end
    end

    context "invalid xmlschema date parameters" do
71
      it "returns an invalid parameter error message" do
72 73
        get api("/projects/#{project.id}/repository/commits?since=invalid-date", user)

Z
Z.J. van de Weg 已提交
74
        expect(response).to have_http_status(400)
75
        expect(json_response['error']).to eq('since is invalid')
76 77
      end
    end
L
Luis HGO 已提交
78 79 80 81 82 83 84 85 86 87 88

    context "path optional parameter" do
      it "returns project commits matching provided path parameter" do
        path = 'files/ruby/popen.rb'

        get api("/projects/#{project.id}/repository/commits?path=#{path}", user)

        expect(json_response.size).to eq(3)
        expect(json_response.first["id"]).to eq("570e7b2abdd848b95f2f578043fc23bd6f6fd24d")
      end
    end
89 90
  end

M
Marc Siegfriedt 已提交
91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109
  describe "Create a commit with multiple files and actions" do
    let!(:url) { "/projects/#{project.id}/repository/commits" }

    it 'returns a 403 unauthorized for user without permissions' do
      post api(url, user2)

      expect(response).to have_http_status(403)
    end

    it 'returns a 400 bad request if no params are given' do
      post api(url, user)

      expect(response).to have_http_status(400)
    end

    context :create do
      let(:message) { 'Created file' }
      let!(:invalid_c_params) do
        {
110
          branch: 'master',
M
Marc Siegfriedt 已提交
111 112 113 114 115 116 117 118 119 120 121 122
          commit_message: message,
          actions: [
            {
              action: 'create',
              file_path: 'files/ruby/popen.rb',
              content: 'puts 8'
            }
          ]
        }
      end
      let!(:valid_c_params) do
        {
123
          branch: 'master',
M
Marc Siegfriedt 已提交
124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139
          commit_message: message,
          actions: [
            {
              action: 'create',
              file_path: 'foo/bar/baz.txt',
              content: 'puts 8'
            }
          ]
        }
      end

      it 'a new file in project repo' do
        post api(url, user), valid_c_params

        expect(response).to have_http_status(201)
        expect(json_response['title']).to eq(message)
140 141
        expect(json_response['committer_name']).to eq(user.name)
        expect(json_response['committer_email']).to eq(user.email)
M
Marc Siegfriedt 已提交
142 143 144 145 146 147 148
      end

      it 'returns a 400 bad request if file exists' do
        post api(url, user), invalid_c_params

        expect(response).to have_http_status(400)
      end
149 150

      context 'with project path in URL' do
151
        let(:url) { "/projects/#{project.full_path.gsub('/', '%2F')}/repository/commits" }
152 153 154 155 156 157 158

        it 'a new file in project repo' do
          post api(url, user), valid_c_params

          expect(response).to have_http_status(201)
        end
      end
M
Marc Siegfriedt 已提交
159 160 161 162 163 164
    end

    context :delete do
      let(:message) { 'Deleted file' }
      let!(:invalid_d_params) do
        {
165
          branch: 'markdown',
M
Marc Siegfriedt 已提交
166 167 168 169 170 171 172 173 174 175 176
          commit_message: message,
          actions: [
            {
              action: 'delete',
              file_path: 'doc/api/projects.md'
            }
          ]
        }
      end
      let!(:valid_d_params) do
        {
177
          branch: 'markdown',
M
Marc Siegfriedt 已提交
178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205
          commit_message: message,
          actions: [
            {
              action: 'delete',
              file_path: 'doc/api/users.md'
            }
          ]
        }
      end

      it 'an existing file in project repo' do
        post api(url, user), valid_d_params

        expect(response).to have_http_status(201)
        expect(json_response['title']).to eq(message)
      end

      it 'returns a 400 bad request if file does not exist' do
        post api(url, user), invalid_d_params

        expect(response).to have_http_status(400)
      end
    end

    context :move do
      let(:message) { 'Moved file' }
      let!(:invalid_m_params) do
        {
206
          branch: 'feature',
M
Marc Siegfriedt 已提交
207 208 209 210 211 212 213 214 215 216 217 218 219
          commit_message: message,
          actions: [
            {
              action: 'move',
              file_path: 'CHANGELOG',
              previous_path: 'VERSION',
              content: '6.7.0.pre'
            }
          ]
        }
      end
      let!(:valid_m_params) do
        {
220
          branch: 'feature',
M
Marc Siegfriedt 已提交
221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250
          commit_message: message,
          actions: [
            {
              action: 'move',
              file_path: 'VERSION.txt',
              previous_path: 'VERSION',
              content: '6.7.0.pre'
            }
          ]
        }
      end

      it 'an existing file in project repo' do
        post api(url, user), valid_m_params

        expect(response).to have_http_status(201)
        expect(json_response['title']).to eq(message)
      end

      it 'returns a 400 bad request if file does not exist' do
        post api(url, user), invalid_m_params

        expect(response).to have_http_status(400)
      end
    end

    context :update do
      let(:message) { 'Updated file' }
      let!(:invalid_u_params) do
        {
251
          branch: 'master',
M
Marc Siegfriedt 已提交
252 253 254 255 256 257 258 259 260 261 262 263
          commit_message: message,
          actions: [
            {
              action: 'update',
              file_path: 'foo/bar.baz',
              content: 'puts 8'
            }
          ]
        }
      end
      let!(:valid_u_params) do
        {
264
          branch: 'master',
M
Marc Siegfriedt 已提交
265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293
          commit_message: message,
          actions: [
            {
              action: 'update',
              file_path: 'files/ruby/popen.rb',
              content: 'puts 8'
            }
          ]
        }
      end

      it 'an existing file in project repo' do
        post api(url, user), valid_u_params

        expect(response).to have_http_status(201)
        expect(json_response['title']).to eq(message)
      end

      it 'returns a 400 bad request if file does not exist' do
        post api(url, user), invalid_u_params

        expect(response).to have_http_status(400)
      end
    end

    context "multiple operations" do
      let(:message) { 'Multiple actions' }
      let!(:invalid_mo_params) do
        {
294
          branch: 'master',
M
Marc Siegfriedt 已提交
295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321
          commit_message: message,
          actions: [
            {
              action: 'create',
              file_path: 'files/ruby/popen.rb',
              content: 'puts 8'
            },
            {
              action: 'delete',
              file_path: 'doc/api/projects.md'
            },
            {
              action: 'move',
              file_path: 'CHANGELOG',
              previous_path: 'VERSION',
              content: '6.7.0.pre'
            },
            {
              action: 'update',
              file_path: 'foo/bar.baz',
              content: 'puts 8'
            }
          ]
        }
      end
      let!(:valid_mo_params) do
        {
322
          branch: 'master',
M
Marc Siegfriedt 已提交
323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364
          commit_message: message,
          actions: [
            {
              action: 'create',
              file_path: 'foo/bar/baz.txt',
              content: 'puts 8'
            },
            {
              action: 'delete',
              file_path: 'Gemfile.zip'
            },
            {
              action: 'move',
              file_path: 'VERSION.txt',
              previous_path: 'VERSION',
              content: '6.7.0.pre'
            },
            {
              action: 'update',
              file_path: 'files/ruby/popen.rb',
              content: 'puts 8'
            }
          ]
        }
      end

      it 'are commited as one in project repo' do
        post api(url, user), valid_mo_params

        expect(response).to have_http_status(201)
        expect(json_response['title']).to eq(message)
      end

      it 'return a 400 bad request if there are any issues' do
        post api(url, user), invalid_mo_params

        expect(response).to have_http_status(400)
      end
    end
  end

  describe "Get a single commit" do
365
    context "authorized user" do
366
      it "returns a commit by sha" do
367
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
D
dixpac 已提交
368

Z
Z.J. van de Weg 已提交
369
        expect(response).to have_http_status(200)
370 371 372 373 374 375 376 377 378 379 380 381 382 383 384
        commit = project.repository.commit
        expect(json_response['id']).to eq(commit.id)
        expect(json_response['short_id']).to eq(commit.short_id)
        expect(json_response['title']).to eq(commit.title)
        expect(json_response['message']).to eq(commit.safe_message)
        expect(json_response['author_name']).to eq(commit.author_name)
        expect(json_response['author_email']).to eq(commit.author_email)
        expect(json_response['authored_date']).to eq(commit.authored_date.iso8601(3))
        expect(json_response['committer_name']).to eq(commit.committer_name)
        expect(json_response['committer_email']).to eq(commit.committer_email)
        expect(json_response['committed_date']).to eq(commit.committed_date.iso8601(3))
        expect(json_response['parent_ids']).to eq(commit.parent_ids)
        expect(json_response['stats']['additions']).to eq(commit.stats.additions)
        expect(json_response['stats']['deletions']).to eq(commit.stats.deletions)
        expect(json_response['stats']['total']).to eq(commit.stats.total)
385 386
      end

387
      it "returns a 404 error if not found" do
388
        get api("/projects/#{project.id}/repository/commits/invalid_sha", user)
Z
Z.J. van de Weg 已提交
389
        expect(response).to have_http_status(404)
390
      end
K
Kamil Trzcinski 已提交
391

392
      it "returns nil for commit without CI" do
K
Kamil Trzcinski 已提交
393
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
394

Z
Z.J. van de Weg 已提交
395
        expect(response).to have_http_status(200)
K
Kamil Trzcinski 已提交
396
        expect(json_response['status']).to be_nil
K
Kamil Trzcinski 已提交
397 398
      end

399
      it "returns status for CI" do
400
        pipeline = project.ensure_pipeline('master', project.repository.commit.sha)
401 402
        pipeline.update(status: 'success')

K
Kamil Trzcinski 已提交
403
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
404

Z
Z.J. van de Weg 已提交
405
        expect(response).to have_http_status(200)
406
        expect(json_response['status']).to eq(pipeline.status)
K
Kamil Trzcinski 已提交
407
      end
408 409

      it "returns status for CI when pipeline is created" do
410
        project.ensure_pipeline('master', project.repository.commit.sha)
411 412 413 414

        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)

        expect(response).to have_http_status(200)
415
        expect(json_response['status']).to eq("created")
416
      end
417 418 419
    end

    context "unauthorized user" do
420
      it "does not return the selected commit" do
421
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}")
Z
Z.J. van de Weg 已提交
422
        expect(response).to have_http_status(401)
423 424 425 426
      end
    end
  end

M
Marc Siegfriedt 已提交
427
  describe "Get the diff of a commit" do
428 429 430
    context "authorized user" do
      before { project.team << [user2, :reporter] }

431
      it "returns the diff of the selected commit" do
432
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff", user)
Z
Z.J. van de Weg 已提交
433
        expect(response).to have_http_status(200)
434

435 436 437
        expect(json_response).to be_an Array
        expect(json_response.length).to be >= 1
        expect(json_response.first.keys).to include "diff"
438 439
      end

440
      it "returns a 404 error if invalid commit" do
441
        get api("/projects/#{project.id}/repository/commits/invalid_sha/diff", user)
Z
Z.J. van de Weg 已提交
442
        expect(response).to have_http_status(404)
443 444 445 446
      end
    end

    context "unauthorized user" do
447
      it "does not return the diff of the selected commit" do
448
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff")
Z
Z.J. van de Weg 已提交
449
        expect(response).to have_http_status(401)
450 451 452
      end
    end
  end
453

M
Marc Siegfriedt 已提交
454
  describe 'Get the comments of a commit' do
455
    context 'authorized user' do
456
      it 'returns merge_request comments' do
457
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
Z
Z.J. van de Weg 已提交
458
        expect(response).to have_http_status(200)
459
        expect(response).to include_pagination_headers
460
        expect(json_response).to be_an Array
461
        expect(json_response.length).to eq(2)
462 463
        expect(json_response.first['note']).to eq('a comment on a commit')
        expect(json_response.first['author']['id']).to eq(user.id)
464 465
      end

466
      it 'returns a 404 error if merge_request_id not found' do
467
        get api("/projects/#{project.id}/repository/commits/1234ab/comments", user)
Z
Z.J. van de Weg 已提交
468
        expect(response).to have_http_status(404)
469 470 471 472
      end
    end

    context 'unauthorized user' do
473
      it 'does not return the diff of the selected commit' do
474
        get api("/projects/#{project.id}/repository/commits/1234ab/comments")
Z
Z.J. van de Weg 已提交
475
        expect(response).to have_http_status(401)
476 477
      end
    end
478 479 480 481 482 483 484 485 486 487 488 489 490 491

    context 'when the commit is present on two projects' do
      let(:forked_project) { create(:project, :repository, creator: user2, namespace: user2.namespace) }
      let!(:forked_project_note) { create(:note_on_commit, author: user2, project: forked_project, commit_id: forked_project.repository.commit.id, note: 'a comment on a commit for fork') }

      it 'returns the comments for the target project' do
        get api("/projects/#{forked_project.id}/repository/commits/#{forked_project.repository.commit.id}/comments", user2)

        expect(response).to have_http_status(200)
        expect(json_response.length).to eq(1)
        expect(json_response.first['note']).to eq('a comment on a commit for fork')
        expect(json_response.first['author']['id']).to eq(user2.id)
      end
    end
492 493
  end

494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512
  describe 'POST :id/repository/commits/:sha/cherry_pick' do
    let(:master_pickable_commit)  { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }

    context 'authorized user' do
      it 'cherry picks a commit' do
        post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'master'

        expect(response).to have_http_status(201)
        expect(json_response['title']).to eq(master_pickable_commit.title)
        expect(json_response['message']).to eq(master_pickable_commit.message)
        expect(json_response['author_name']).to eq(master_pickable_commit.author_name)
        expect(json_response['committer_name']).to eq(user.name)
      end

      it 'returns 400 if commit is already included in the target branch' do
        post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'markdown'

        expect(response).to have_http_status(400)
        expect(json_response['message']).to eq('Sorry, we cannot cherry-pick this commit automatically.
513
                     A cherry-pick may have already been performed with this commit, or a more recent commit may have updated some of its content.')
514 515 516 517 518 519
      end

      it 'returns 400 if you are not allowed to push to the target branch' do
        project.team << [user2, :developer]
        protected_branch = create(:protected_branch, project: project, name: 'feature')

R
Robert Schilling 已提交
520
        post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user2), branch: protected_branch.name
521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563

        expect(response).to have_http_status(400)
        expect(json_response['message']).to eq('You are not allowed to push into this branch')
      end

      it 'returns 400 for missing parameters' do
        post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user)

        expect(response).to have_http_status(400)
        expect(json_response['error']).to eq('branch is missing')
      end

      it 'returns 404 if commit is not found' do
        post api("/projects/#{project.id}/repository/commits/abcd0123/cherry_pick", user), branch: 'master'

        expect(response).to have_http_status(404)
        expect(json_response['message']).to eq('404 Commit Not Found')
      end

      it 'returns 404 if branch is not found' do
        post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'foo'

        expect(response).to have_http_status(404)
        expect(json_response['message']).to eq('404 Branch Not Found')
      end

      it 'returns 400 for missing parameters' do
        post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user)

        expect(response).to have_http_status(400)
        expect(json_response['error']).to eq('branch is missing')
      end
    end

    context 'unauthorized user' do
      it 'does not cherry pick the commit' do
        post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick"), branch: 'master'

        expect(response).to have_http_status(401)
      end
    end
  end

M
Marc Siegfriedt 已提交
564
  describe 'Post comment to commit' do
565
    context 'authorized user' do
566
      it 'returns comment' do
567
        post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user), note: 'My comment'
Z
Z.J. van de Weg 已提交
568
        expect(response).to have_http_status(201)
569 570 571 572
        expect(json_response['note']).to eq('My comment')
        expect(json_response['path']).to be_nil
        expect(json_response['line']).to be_nil
        expect(json_response['line_type']).to be_nil
573 574
      end

575
      it 'returns the inline comment' do
576 577
        post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user), note: 'My comment', path: project.repository.commit.raw_diffs.first.new_path, line: 1, line_type: 'new'

Z
Z.J. van de Weg 已提交
578
        expect(response).to have_http_status(201)
579
        expect(json_response['note']).to eq('My comment')
580
        expect(json_response['path']).to eq(project.repository.commit.raw_diffs.first.new_path)
581
        expect(json_response['line']).to eq(1)
582
        expect(json_response['line_type']).to eq('new')
583 584
      end

585
      it 'returns 400 if note is missing' do
586
        post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
Z
Z.J. van de Weg 已提交
587
        expect(response).to have_http_status(400)
588 589
      end

590
      it 'returns 404 if note is attached to non existent commit' do
591
        post api("/projects/#{project.id}/repository/commits/1234ab/comments", user), note: 'My comment'
Z
Z.J. van de Weg 已提交
592
        expect(response).to have_http_status(404)
593 594 595 596
      end
    end

    context 'unauthorized user' do
597
      it 'does not return the diff of the selected commit' do
598
        post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments")
Z
Z.J. van de Weg 已提交
599
        expect(response).to have_http_status(401)
600 601 602
      end
    end
  end
603
end