commits_spec.rb 21.6 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 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125

    context 'pagination' do
      it_behaves_like 'a paginated resources'

      let(:page) { 0 }
      let(:per_page) { 5 }
      let(:ref_name) { 'master' }
      let!(:request) do
        get api("/projects/#{project.id}/repository/commits?page=#{page}&per_page=#{per_page}&ref_name=#{ref_name}", user)
      end

      it 'returns the commit count in the correct header' do
        commit_count = project.repository.commit_count_for_ref(ref_name).to_s

        expect(response.headers['X-Total']).to eq(commit_count)
      end

      context 'viewing the first page' do
        it 'returns the first 5 commits' do
          commit = project.repository.commit

          expect(json_response.size).to eq(per_page)
          expect(json_response.first['id']).to eq(commit.id)
        end
      end

      context 'viewing the second page' do
        let(:page) { 1 }

        it 'returns the second 5 commits' do
          commit = project.repository.commits('HEAD', offset: per_page * page).first

          expect(json_response.size).to eq(per_page)
          expect(json_response.first['id']).to eq(commit.id)
        end
      end
    end
126 127
  end

M
Marc Siegfriedt 已提交
128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146
  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
        {
147
          branch: 'master',
M
Marc Siegfriedt 已提交
148 149 150 151 152 153 154 155 156 157 158 159
          commit_message: message,
          actions: [
            {
              action: 'create',
              file_path: 'files/ruby/popen.rb',
              content: 'puts 8'
            }
          ]
        }
      end
      let!(:valid_c_params) do
        {
160
          branch: 'master',
M
Marc Siegfriedt 已提交
161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176
          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)
177 178
        expect(json_response['committer_name']).to eq(user.name)
        expect(json_response['committer_email']).to eq(user.email)
M
Marc Siegfriedt 已提交
179 180 181 182 183 184 185
      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
186 187

      context 'with project path in URL' do
188
        let(:url) { "/projects/#{project.full_path.gsub('/', '%2F')}/repository/commits" }
189 190 191 192 193 194 195

        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 已提交
196 197 198 199 200 201
    end

    context :delete do
      let(:message) { 'Deleted file' }
      let!(:invalid_d_params) do
        {
202
          branch: 'markdown',
M
Marc Siegfriedt 已提交
203 204 205 206 207 208 209 210 211 212 213
          commit_message: message,
          actions: [
            {
              action: 'delete',
              file_path: 'doc/api/projects.md'
            }
          ]
        }
      end
      let!(:valid_d_params) do
        {
214
          branch: 'markdown',
M
Marc Siegfriedt 已提交
215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242
          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
        {
243
          branch: 'feature',
M
Marc Siegfriedt 已提交
244 245 246 247 248 249 250 251 252 253 254 255 256
          commit_message: message,
          actions: [
            {
              action: 'move',
              file_path: 'CHANGELOG',
              previous_path: 'VERSION',
              content: '6.7.0.pre'
            }
          ]
        }
      end
      let!(:valid_m_params) do
        {
257
          branch: 'feature',
M
Marc Siegfriedt 已提交
258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287
          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
        {
288
          branch: 'master',
M
Marc Siegfriedt 已提交
289 290 291 292 293 294 295 296 297 298 299 300
          commit_message: message,
          actions: [
            {
              action: 'update',
              file_path: 'foo/bar.baz',
              content: 'puts 8'
            }
          ]
        }
      end
      let!(:valid_u_params) do
        {
301
          branch: 'master',
M
Marc Siegfriedt 已提交
302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330
          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
        {
331
          branch: 'master',
M
Marc Siegfriedt 已提交
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
          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
        {
359
          branch: 'master',
M
Marc Siegfriedt 已提交
360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401
          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
402
    context "authorized user" do
403
      it "returns a commit by sha" do
404
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
D
dixpac 已提交
405

Z
Z.J. van de Weg 已提交
406
        expect(response).to have_http_status(200)
407 408 409 410 411 412 413 414 415 416 417 418 419 420 421
        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)
422 423
      end

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

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

Z
Z.J. van de Weg 已提交
432
        expect(response).to have_http_status(200)
K
Kamil Trzcinski 已提交
433
        expect(json_response['status']).to be_nil
K
Kamil Trzcinski 已提交
434 435
      end

436
      it "returns status for CI" do
437
        pipeline = project.ensure_pipeline('master', project.repository.commit.sha)
438 439
        pipeline.update(status: 'success')

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

Z
Z.J. van de Weg 已提交
442
        expect(response).to have_http_status(200)
443
        expect(json_response['status']).to eq(pipeline.status)
K
Kamil Trzcinski 已提交
444
      end
445 446

      it "returns status for CI when pipeline is created" do
447
        project.ensure_pipeline('master', project.repository.commit.sha)
448 449 450 451

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

        expect(response).to have_http_status(200)
452
        expect(json_response['status']).to eq("created")
453
      end
454 455 456
    end

    context "unauthorized user" do
457
      it "does not return the selected commit" do
458
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}")
Z
Z.J. van de Weg 已提交
459
        expect(response).to have_http_status(401)
460 461 462 463
      end
    end
  end

M
Marc Siegfriedt 已提交
464
  describe "Get the diff of a commit" do
465 466 467
    context "authorized user" do
      before { project.team << [user2, :reporter] }

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

472 473 474
        expect(json_response).to be_an Array
        expect(json_response.length).to be >= 1
        expect(json_response.first.keys).to include "diff"
475 476
      end

477
      it "returns a 404 error if invalid commit" do
478
        get api("/projects/#{project.id}/repository/commits/invalid_sha/diff", user)
Z
Z.J. van de Weg 已提交
479
        expect(response).to have_http_status(404)
480 481 482 483
      end
    end

    context "unauthorized user" do
484
      it "does not return the diff of the selected commit" do
485
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff")
Z
Z.J. van de Weg 已提交
486
        expect(response).to have_http_status(401)
487 488 489
      end
    end
  end
490

M
Marc Siegfriedt 已提交
491
  describe 'Get the comments of a commit' do
492
    context 'authorized user' do
493
      it 'returns merge_request comments' do
494
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
Z
Z.J. van de Weg 已提交
495
        expect(response).to have_http_status(200)
496
        expect(response).to include_pagination_headers
497
        expect(json_response).to be_an Array
498
        expect(json_response.length).to eq(2)
499 500
        expect(json_response.first['note']).to eq('a comment on a commit')
        expect(json_response.first['author']['id']).to eq(user.id)
501 502
      end

503
      it 'returns a 404 error if merge_request_id not found' do
504
        get api("/projects/#{project.id}/repository/commits/1234ab/comments", user)
Z
Z.J. van de Weg 已提交
505
        expect(response).to have_http_status(404)
506 507 508 509
      end
    end

    context 'unauthorized user' do
510
      it 'does not return the diff of the selected commit' do
511
        get api("/projects/#{project.id}/repository/commits/1234ab/comments")
Z
Z.J. van de Weg 已提交
512
        expect(response).to have_http_status(401)
513 514
      end
    end
515 516 517 518 519 520 521 522 523 524 525 526 527 528

    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
529 530
  end

531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549
  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.
550
                     A cherry-pick may have already been performed with this commit, or a more recent commit may have updated some of its content.')
551 552 553 554 555 556
      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 已提交
557
        post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user2), branch: protected_branch.name
558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600

        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 已提交
601
  describe 'Post comment to commit' do
602
    context 'authorized user' do
603
      it 'returns comment' do
604
        post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user), note: 'My comment'
Z
Z.J. van de Weg 已提交
605
        expect(response).to have_http_status(201)
606 607 608 609
        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
610 611
      end

612
      it 'returns the inline comment' do
613 614
        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 已提交
615
        expect(response).to have_http_status(201)
616
        expect(json_response['note']).to eq('My comment')
617
        expect(json_response['path']).to eq(project.repository.commit.raw_diffs.first.new_path)
618
        expect(json_response['line']).to eq(1)
619
        expect(json_response['line_type']).to eq('new')
620 621
      end

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

627
      it 'returns 404 if note is attached to non existent commit' do
628
        post api("/projects/#{project.id}/repository/commits/1234ab/comments", user), note: 'My comment'
Z
Z.J. van de Weg 已提交
629
        expect(response).to have_http_status(404)
630 631 632 633
      end
    end

    context 'unauthorized user' do
634
      it 'does not return the diff of the selected commit' do
635
        post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments")
Z
Z.J. van de Weg 已提交
636
        expect(response).to have_http_status(401)
637 638 639
      end
    end
  end
640
end