BigW Consortium Gitlab

commits_spec.rb 19.2 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] }

Marc Siegfriedt committed
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")
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)

74
        expect(response).to have_http_status(400)
75 76 77
        expect(json_response['message']).to include "\"since\" must be a timestamp in ISO 8601 format"
      end
    end
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

Marc Siegfriedt committed
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 126 127 128 129 130 131 132 133 134 135 136 137 138 139
  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
        {
          branch_name: 'master',
          commit_message: message,
          actions: [
            {
              action: 'create',
              file_path: 'files/ruby/popen.rb',
              content: 'puts 8'
            }
          ]
        }
      end
      let!(:valid_c_params) do
        {
          branch_name: 'master',
          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)
Marc Siegfriedt committed
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 151 152 153 154 155 156 157 158

      context 'with project path in URL' do
        let(:url) { "/projects/#{project.namespace.path}%2F#{project.path}/repository/commits" }

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

          expect(response).to have_http_status(201)
        end
      end
Marc Siegfriedt committed
159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 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 206 207 208 209 210 211 212 213 214 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 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 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 288 289 290 291 292 293 294 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 322 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
    end

    context :delete do
      let(:message) { 'Deleted file' }
      let!(:invalid_d_params) do
        {
          branch_name: 'markdown',
          commit_message: message,
          actions: [
            {
              action: 'delete',
              file_path: 'doc/api/projects.md'
            }
          ]
        }
      end
      let!(:valid_d_params) do
        {
          branch_name: 'markdown',
          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
        {
          branch_name: 'feature',
          commit_message: message,
          actions: [
            {
              action: 'move',
              file_path: 'CHANGELOG',
              previous_path: 'VERSION',
              content: '6.7.0.pre'
            }
          ]
        }
      end
      let!(:valid_m_params) do
        {
          branch_name: 'feature',
          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
        {
          branch_name: 'master',
          commit_message: message,
          actions: [
            {
              action: 'update',
              file_path: 'foo/bar.baz',
              content: 'puts 8'
            }
          ]
        }
      end
      let!(:valid_u_params) do
        {
          branch_name: 'master',
          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
        {
          branch_name: 'master',
          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
        {
          branch_name: 'master',
          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)
368

369
        expect(response).to have_http_status(200)
370 371
        expect(json_response['id']).to eq(project.repository.commit.id)
        expect(json_response['title']).to eq(project.repository.commit.title)
372 373 374
        expect(json_response['stats']['additions']).to eq(project.repository.commit.stats.additions)
        expect(json_response['stats']['deletions']).to eq(project.repository.commit.stats.deletions)
        expect(json_response['stats']['total']).to eq(project.repository.commit.stats.total)
375 376
      end

377
      it "returns a 404 error if not found" do
378
        get api("/projects/#{project.id}/repository/commits/invalid_sha", user)
379
        expect(response).to have_http_status(404)
380
      end
381

382
      it "returns nil for commit without CI" do
383
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
384

385
        expect(response).to have_http_status(200)
Kamil Trzcinski committed
386
        expect(json_response['status']).to be_nil
387 388
      end

389
      it "returns status for CI" do
390
        pipeline = project.ensure_pipeline('master', project.repository.commit.sha)
391 392
        pipeline.update(status: 'success')

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

395
        expect(response).to have_http_status(200)
396
        expect(json_response['status']).to eq(pipeline.status)
397
      end
398 399

      it "returns status for CI when pipeline is created" do
400
        project.ensure_pipeline('master', project.repository.commit.sha)
401 402 403 404

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

        expect(response).to have_http_status(200)
405
        expect(json_response['status']).to eq("created")
406
      end
407 408 409
    end

    context "unauthorized user" do
410
      it "does not return the selected commit" do
411
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}")
412
        expect(response).to have_http_status(401)
413 414 415 416
      end
    end
  end

Marc Siegfriedt committed
417
  describe "Get the diff of a commit" do
418 419 420
    context "authorized user" do
      before { project.team << [user2, :reporter] }

421
      it "returns the diff of the selected commit" do
422
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff", user)
423
        expect(response).to have_http_status(200)
424

425 426 427
        expect(json_response).to be_an Array
        expect(json_response.length).to be >= 1
        expect(json_response.first.keys).to include "diff"
428 429
      end

430
      it "returns a 404 error if invalid commit" do
431
        get api("/projects/#{project.id}/repository/commits/invalid_sha/diff", user)
432
        expect(response).to have_http_status(404)
433 434 435 436
      end
    end

    context "unauthorized user" do
437
      it "does not return the diff of the selected commit" do
438
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff")
439
        expect(response).to have_http_status(401)
440 441 442
      end
    end
  end
443

Marc Siegfriedt committed
444
  describe 'Get the comments of a commit' do
445
    context 'authorized user' do
446
      it 'returns merge_request comments' do
447
        get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
448
        expect(response).to have_http_status(200)
449
        expect(json_response).to be_an Array
450
        expect(json_response.length).to eq(2)
451 452
        expect(json_response.first['note']).to eq('a comment on a commit')
        expect(json_response.first['author']['id']).to eq(user.id)
453 454
      end

455
      it 'returns a 404 error if merge_request_id not found' do
456
        get api("/projects/#{project.id}/repository/commits/1234ab/comments", user)
457
        expect(response).to have_http_status(404)
458 459 460 461
      end
    end

    context 'unauthorized user' do
462
      it 'does not return the diff of the selected commit' do
463
        get api("/projects/#{project.id}/repository/commits/1234ab/comments")
464
        expect(response).to have_http_status(401)
465 466 467 468
      end
    end
  end

469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487
  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.
488
                     A cherry-pick may have already been performed with this commit, or a more recent commit may have updated some of its content.')
489 490 491 492 493 494
      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')

Robert Schilling committed
495
        post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user2), branch: protected_branch.name
496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538

        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

Marc Siegfriedt committed
539
  describe 'Post comment to commit' do
540
    context 'authorized user' do
541
      it 'returns comment' do
542
        post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user), note: 'My comment'
543
        expect(response).to have_http_status(201)
544 545 546 547
        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
548 549
      end

550
      it 'returns the inline comment' do
551 552
        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'

553
        expect(response).to have_http_status(201)
554
        expect(json_response['note']).to eq('My comment')
555
        expect(json_response['path']).to eq(project.repository.commit.raw_diffs.first.new_path)
556
        expect(json_response['line']).to eq(1)
557
        expect(json_response['line_type']).to eq('new')
558 559
      end

560
      it 'returns 400 if note is missing' do
561
        post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments", user)
562
        expect(response).to have_http_status(400)
563 564
      end

565
      it 'returns 404 if note is attached to non existent commit' do
566
        post api("/projects/#{project.id}/repository/commits/1234ab/comments", user), note: 'My comment'
567
        expect(response).to have_http_status(404)
568 569 570 571
      end
    end

    context 'unauthorized user' do
572
      it 'does not return the diff of the selected commit' do
573
        post api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/comments")
574
        expect(response).to have_http_status(401)
575 576 577
      end
    end
  end
578
end