Show More
@@ -362,12 +362,14 b' class TestPullrequestsView(object):' | |||
|
362 | 362 | ): |
|
363 | 363 | pull_request = pr_util.create_pull_request() |
|
364 | 364 | pull_request_id = pull_request.pull_request_id |
|
365 | target_scm = pull_request.target_repo.scm_instance() | |
|
366 | target_scm_name = target_scm.name | |
|
365 | 367 | |
|
366 | 368 | response = self.app.post( |
|
367 | 369 | route_path( |
|
368 | 370 | 'pullrequest_comment_create', |
|
369 |
repo_name= |
|
|
370 |
pull_request_id= |
|
|
371 | repo_name=target_scm_name, | |
|
372 | pull_request_id=pull_request_id, | |
|
371 | 373 | ), |
|
372 | 374 | params={ |
|
373 | 375 | 'close_pull_request': 'true', |
@@ -378,6 +380,8 b' class TestPullrequestsView(object):' | |||
|
378 | 380 | assert response.json |
|
379 | 381 | |
|
380 | 382 | pull_request = PullRequest.get(pull_request_id) |
|
383 | target_scm = pull_request.target_repo.scm_instance() | |
|
384 | target_scm_name = target_scm.name | |
|
381 | 385 | assert pull_request.is_closed() |
|
382 | 386 | |
|
383 | 387 | # check only the latest status, not the review status |
@@ -390,8 +394,8 b' class TestPullrequestsView(object):' | |||
|
390 | 394 | response = self.app.post( |
|
391 | 395 | route_path( |
|
392 | 396 | 'pullrequest_comment_edit', |
|
393 |
repo_name= |
|
|
394 |
pull_request_id= |
|
|
397 | repo_name=target_scm_name, | |
|
398 | pull_request_id=pull_request_id, | |
|
395 | 399 | comment_id=comment_id, |
|
396 | 400 | ), |
|
397 | 401 | extra_environ=xhr_header, |
@@ -403,14 +407,15 b' class TestPullrequestsView(object):' | |||
|
403 | 407 | ) |
|
404 | 408 | assert response.status_int == 403 |
|
405 | 409 | |
|
406 | def test_comment_and_comment_edit( | |
|
407 | self, pr_util, csrf_token, xhr_header | |
|
408 | ): | |
|
410 | def test_comment_and_comment_edit(self, pr_util, csrf_token, xhr_header): | |
|
409 | 411 | pull_request = pr_util.create_pull_request() |
|
412 | target_scm = pull_request.target_repo.scm_instance() | |
|
413 | target_scm_name = target_scm.name | |
|
414 | ||
|
410 | 415 | response = self.app.post( |
|
411 | 416 | route_path( |
|
412 | 417 | 'pullrequest_comment_create', |
|
413 |
repo_name= |
|
|
418 | repo_name=target_scm_name, | |
|
414 | 419 | pull_request_id=pull_request.pull_request_id), |
|
415 | 420 | params={ |
|
416 | 421 | 'csrf_token': csrf_token, |
@@ -426,7 +431,7 b' class TestPullrequestsView(object):' | |||
|
426 | 431 | self.app.post( |
|
427 | 432 | route_path( |
|
428 | 433 | 'pullrequest_comment_edit', |
|
429 |
repo_name= |
|
|
434 | repo_name=target_scm_name, | |
|
430 | 435 | pull_request_id=pull_request.pull_request_id, |
|
431 | 436 | comment_id=comment_id, |
|
432 | 437 | ), |
@@ -442,14 +447,15 b' class TestPullrequestsView(object):' | |||
|
442 | 447 | ChangesetComment.comment_id == comment_id).first().text |
|
443 | 448 | assert test_text == text_form_db |
|
444 | 449 | |
|
445 | def test_comment_and_comment_edit( | |
|
446 | self, pr_util, csrf_token, xhr_header | |
|
447 | ): | |
|
450 | def test_comment_and_comment_edit(self, pr_util, csrf_token, xhr_header): | |
|
448 | 451 | pull_request = pr_util.create_pull_request() |
|
452 | target_scm = pull_request.target_repo.scm_instance() | |
|
453 | target_scm_name = target_scm.name | |
|
454 | ||
|
449 | 455 | response = self.app.post( |
|
450 | 456 | route_path( |
|
451 | 457 | 'pullrequest_comment_create', |
|
452 |
repo_name= |
|
|
458 | repo_name=target_scm_name, | |
|
453 | 459 | pull_request_id=pull_request.pull_request_id), |
|
454 | 460 | params={ |
|
455 | 461 | 'csrf_token': csrf_token, |
@@ -465,7 +471,7 b' class TestPullrequestsView(object):' | |||
|
465 | 471 | response = self.app.post( |
|
466 | 472 | route_path( |
|
467 | 473 | 'pullrequest_comment_edit', |
|
468 |
repo_name= |
|
|
474 | repo_name=target_scm_name, | |
|
469 | 475 | pull_request_id=pull_request.pull_request_id, |
|
470 | 476 | comment_id=comment_id, |
|
471 | 477 | ), |
@@ -482,10 +488,13 b' class TestPullrequestsView(object):' | |||
|
482 | 488 | |
|
483 | 489 | def test_comment_and_try_edit_already_edited(self, pr_util, csrf_token, xhr_header): |
|
484 | 490 | pull_request = pr_util.create_pull_request() |
|
491 | target_scm = pull_request.target_repo.scm_instance() | |
|
492 | target_scm_name = target_scm.name | |
|
493 | ||
|
485 | 494 | response = self.app.post( |
|
486 | 495 | route_path( |
|
487 | 496 | 'pullrequest_comment_create', |
|
488 |
repo_name= |
|
|
497 | repo_name=target_scm_name, | |
|
489 | 498 | pull_request_id=pull_request.pull_request_id), |
|
490 | 499 | params={ |
|
491 | 500 | 'csrf_token': csrf_token, |
@@ -501,7 +510,7 b' class TestPullrequestsView(object):' | |||
|
501 | 510 | self.app.post( |
|
502 | 511 | route_path( |
|
503 | 512 | 'pullrequest_comment_edit', |
|
504 |
repo_name= |
|
|
513 | repo_name=target_scm_name, | |
|
505 | 514 | pull_request_id=pull_request.pull_request_id, |
|
506 | 515 | comment_id=comment_id, |
|
507 | 516 | ), |
@@ -517,7 +526,7 b' class TestPullrequestsView(object):' | |||
|
517 | 526 | response = self.app.post( |
|
518 | 527 | route_path( |
|
519 | 528 | 'pullrequest_comment_edit', |
|
520 |
repo_name= |
|
|
529 | repo_name=target_scm_name, | |
|
521 | 530 | pull_request_id=pull_request.pull_request_id, |
|
522 | 531 | comment_id=comment_id, |
|
523 | 532 | ), |
General Comments 0
You need to be logged in to leave comments.
Login now