@@ -378,97 +378,68 @@ def mock_commit(mocker):
378
378
# Fixtures for Record(s)
379
379
@pytest .fixture
380
380
def record_with_issue_open_no_pull (request ):
381
- mock_repo_fixture = request .getfixturevalue ("mock_repo" )
382
- return Record (repo = mock_repo_fixture , issue = request .getfixturevalue ("mock_issue_open" ))
381
+ return Record (issue = request .getfixturevalue ("mock_issue_open" ))
383
382
384
383
385
384
@pytest .fixture
386
385
def record_with_issue_closed_no_pull (request ):
387
- rec = Record (
388
- repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )),
389
- issue = request .getfixturevalue ("mock_issue_closed" ),
390
- )
391
- mock_repo_fixture .full_name = "org/repo"
392
- return rec
386
+ return Record (issue = request .getfixturevalue ("mock_issue_closed" ))
393
387
394
388
395
389
@pytest .fixture
396
390
def record_with_issue_closed_one_pull (request ):
397
- rec = Record (
398
- repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )),
399
- issue = request .getfixturevalue ("mock_issue_closed" ),
400
- )
391
+ rec = Record (issue = request .getfixturevalue ("mock_issue_closed" ))
401
392
rec .register_pull_request (request .getfixturevalue ("mock_pull_closed" ))
402
- mock_repo_fixture .full_name = "org/repo"
403
393
return rec
404
394
405
395
406
396
@pytest .fixture
407
397
def record_with_issue_closed_one_pull_merged (request ):
408
- rec = Record (
409
- repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )),
410
- issue = request .getfixturevalue ("mock_issue_closed_i1_bug" ),
411
- )
398
+ rec = Record (issue = request .getfixturevalue ("mock_issue_closed_i1_bug" ))
412
399
rec .register_pull_request (request .getfixturevalue ("mock_pull_merged" ))
413
- mock_repo_fixture .full_name = "org/repo"
414
400
return rec
415
401
416
402
417
403
@pytest .fixture
418
404
def record_with_issue_closed_one_pull_merged_skip (request ):
419
405
rec = Record (
420
- repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )),
421
406
issue = request .getfixturevalue ("mock_issue_closed_i1_bug_and_skip" ),
422
407
skip = True ,
423
408
)
424
409
rec .register_pull_request (request .getfixturevalue ("mock_pull_merged" ))
425
- mock_repo_fixture .full_name = "org/repo"
426
410
return rec
427
411
428
412
429
413
@pytest .fixture
430
414
def record_with_issue_closed_two_pulls (request ):
431
- rec = Record (
432
- repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )),
433
- issue = request .getfixturevalue ("mock_issue_closed_i1_bug" ),
434
- )
415
+ rec = Record (issue = request .getfixturevalue ("mock_issue_closed_i1_bug" ))
435
416
rec .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_rls_notes_101" ))
436
417
rec .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_rls_notes_102" ))
437
- mock_repo_fixture .full_name = "org/repo"
438
418
return rec
439
419
440
420
441
421
@pytest .fixture
442
422
def record_with_issue_open_one_pull_closed (request ):
443
- rec = Record (
444
- repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )),
445
- issue = request .getfixturevalue ("mock_issue_open" ),
446
- )
423
+ rec = Record (issue = request .getfixturevalue ("mock_issue_open" ))
447
424
rec .register_pull_request (request .getfixturevalue ("mock_pull_closed" ))
448
- mock_repo_fixture .full_name = "org/repo"
449
425
return rec
450
426
451
427
452
428
@pytest .fixture
453
429
def record_with_issue_open_two_pulls_closed (request ):
454
- rec = Record (
455
- repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )),
456
- issue = request .getfixturevalue ("mock_issue_open" ),
457
- )
430
+ rec = Record (issue = request .getfixturevalue ("mock_issue_open" ))
458
431
rec .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_rls_notes_101" ))
459
432
rec .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_rls_notes_102" ))
460
- mock_repo_fixture .full_name = "org/repo"
461
433
return rec
462
434
463
435
464
436
@pytest .fixture
465
437
def record_with_two_issue_open_two_pulls_closed (request ):
466
- rec1 = Record (repo = ( mock_repo_fixture := request . getfixturevalue ( "mock_repo" )) )
438
+ rec1 = Record ()
467
439
rec1 .register_pull_request (request .getfixturevalue ("mock_pull_merged_with_rls_notes_101" ))
468
440
469
- rec2 = Record (repo = mock_repo_fixture )
441
+ rec2 = Record ()
470
442
rec2 .register_pull_request (request .getfixturevalue ("mock_pull_merged_with_rls_notes_102" ))
471
- mock_repo_fixture .full_name = "org/repo"
472
443
473
444
records = {}
474
445
records [rec1 .number ] = rec1
@@ -479,38 +450,31 @@ def record_with_two_issue_open_two_pulls_closed(request):
479
450
480
451
@pytest .fixture
481
452
def record_with_issue_closed_one_pull_no_rls_notes (request ):
482
- rec = Record (
483
- repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )),
484
- issue = request .getfixturevalue ("mock_issue_closed" ),
485
- )
453
+ rec = Record (issue = request .getfixturevalue ("mock_issue_closed" ))
486
454
rec .register_pull_request (mock_pull_closed_fixture := request .getfixturevalue ("mock_pull_no_rls_notes" ))
487
455
mock_pull_closed_fixture .body = "Fixed bug"
488
- mock_repo_fixture .full_name = "org/repo"
489
456
return rec
490
457
491
458
492
459
@pytest .fixture
493
460
def record_with_no_issue_one_pull_merged (request ):
494
- record = Record (repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )))
495
- mock_repo_fixture .full_name = "org/repo"
461
+ record = Record ()
496
462
record .register_pull_request (request .getfixturevalue ("mock_pull_merged" ))
497
463
record .register_commit (request .getfixturevalue ("mock_commit" ))
498
464
return record
499
465
500
466
501
467
@pytest .fixture
502
468
def record_with_no_issue_one_pull_open (request ):
503
- record = Record (repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )))
504
- mock_repo_fixture .full_name = "org/repo"
469
+ record = Record ()
505
470
record .register_pull_request (request .getfixturevalue ("mock_pull_open" ))
506
471
record .register_commit (request .getfixturevalue ("mock_commit" ))
507
472
return record
508
473
509
474
510
475
@pytest .fixture
511
476
def record_with_no_issue_one_pull_merged_with_issue_mentioned (request ):
512
- record = Record (repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )))
513
- mock_repo_fixture .full_name = "org/repo"
477
+ record = Record ()
514
478
mock_pull_merged_fixture = request .getfixturevalue ("mock_pull_merged" )
515
479
mock_pull_merged_fixture .body = "Release Notes:\n - Fixed bug\n - Improved performance\n \n Fixes #123"
516
480
record .register_pull_request (mock_pull_merged_fixture )
@@ -520,27 +484,23 @@ def record_with_no_issue_one_pull_merged_with_issue_mentioned(request):
520
484
521
485
@pytest .fixture
522
486
def record_with_no_issue_one_pull_closed (request ):
523
- record = Record (repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )))
524
- mock_repo_fixture .full_name = "org/repo"
525
- mock_repo_fixture .draft = False
487
+ record = Record ()
526
488
record .register_pull_request (request .getfixturevalue ("mock_pull_closed" ))
527
489
record .register_commit (request .getfixturevalue ("mock_commit" ))
528
490
return record
529
491
530
492
531
493
@pytest .fixture
532
494
def record_with_no_issue_one_pull_closed_with_skip_label (request ):
533
- record = Record (repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )), skip = True )
534
- mock_repo_fixture .full_name = "org/repo"
535
- mock_repo_fixture .draft = False
495
+ record = Record (skip = True )
536
496
record .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_skip_label" ))
537
497
record .register_commit (request .getfixturevalue ("mock_commit" ))
538
498
return record
539
499
540
500
541
501
@pytest .fixture
542
502
def record_with_no_issue_one_pull_closed_no_rls_notes (request ):
543
- record = Record (repo = request . getfixturevalue ( "mock_repo" ) )
503
+ record = Record ()
544
504
record .register_pull_request (request .getfixturevalue ("mock_pull_no_rls_notes" ))
545
505
return record
546
506
0 commit comments