@@ -378,97 +378,68 @@ def mock_commit(mocker):
378378# Fixtures for Record(s)
379379@pytest .fixture
380380def 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" ))
383382
384383
385384@pytest .fixture
386385def 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" ))
393387
394388
395389@pytest .fixture
396390def 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" ))
401392 rec .register_pull_request (request .getfixturevalue ("mock_pull_closed" ))
402- mock_repo_fixture .full_name = "org/repo"
403393 return rec
404394
405395
406396@pytest .fixture
407397def 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" ))
412399 rec .register_pull_request (request .getfixturevalue ("mock_pull_merged" ))
413- mock_repo_fixture .full_name = "org/repo"
414400 return rec
415401
416402
417403@pytest .fixture
418404def record_with_issue_closed_one_pull_merged_skip (request ):
419405 rec = Record (
420- repo = (mock_repo_fixture := request .getfixturevalue ("mock_repo" )),
421406 issue = request .getfixturevalue ("mock_issue_closed_i1_bug_and_skip" ),
422407 skip = True ,
423408 )
424409 rec .register_pull_request (request .getfixturevalue ("mock_pull_merged" ))
425- mock_repo_fixture .full_name = "org/repo"
426410 return rec
427411
428412
429413@pytest .fixture
430414def 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" ))
435416 rec .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_rls_notes_101" ))
436417 rec .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_rls_notes_102" ))
437- mock_repo_fixture .full_name = "org/repo"
438418 return rec
439419
440420
441421@pytest .fixture
442422def 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" ))
447424 rec .register_pull_request (request .getfixturevalue ("mock_pull_closed" ))
448- mock_repo_fixture .full_name = "org/repo"
449425 return rec
450426
451427
452428@pytest .fixture
453429def 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" ))
458431 rec .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_rls_notes_101" ))
459432 rec .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_rls_notes_102" ))
460- mock_repo_fixture .full_name = "org/repo"
461433 return rec
462434
463435
464436@pytest .fixture
465437def record_with_two_issue_open_two_pulls_closed (request ):
466- rec1 = Record (repo = ( mock_repo_fixture := request . getfixturevalue ( "mock_repo" )) )
438+ rec1 = Record ()
467439 rec1 .register_pull_request (request .getfixturevalue ("mock_pull_merged_with_rls_notes_101" ))
468440
469- rec2 = Record (repo = mock_repo_fixture )
441+ rec2 = Record ()
470442 rec2 .register_pull_request (request .getfixturevalue ("mock_pull_merged_with_rls_notes_102" ))
471- mock_repo_fixture .full_name = "org/repo"
472443
473444 records = {}
474445 records [rec1 .number ] = rec1
@@ -479,38 +450,31 @@ def record_with_two_issue_open_two_pulls_closed(request):
479450
480451@pytest .fixture
481452def 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" ))
486454 rec .register_pull_request (mock_pull_closed_fixture := request .getfixturevalue ("mock_pull_no_rls_notes" ))
487455 mock_pull_closed_fixture .body = "Fixed bug"
488- mock_repo_fixture .full_name = "org/repo"
489456 return rec
490457
491458
492459@pytest .fixture
493460def 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 ()
496462 record .register_pull_request (request .getfixturevalue ("mock_pull_merged" ))
497463 record .register_commit (request .getfixturevalue ("mock_commit" ))
498464 return record
499465
500466
501467@pytest .fixture
502468def 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 ()
505470 record .register_pull_request (request .getfixturevalue ("mock_pull_open" ))
506471 record .register_commit (request .getfixturevalue ("mock_commit" ))
507472 return record
508473
509474
510475@pytest .fixture
511476def 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 ()
514478 mock_pull_merged_fixture = request .getfixturevalue ("mock_pull_merged" )
515479 mock_pull_merged_fixture .body = "Release Notes:\n - Fixed bug\n - Improved performance\n \n Fixes #123"
516480 record .register_pull_request (mock_pull_merged_fixture )
@@ -520,27 +484,23 @@ def record_with_no_issue_one_pull_merged_with_issue_mentioned(request):
520484
521485@pytest .fixture
522486def 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 ()
526488 record .register_pull_request (request .getfixturevalue ("mock_pull_closed" ))
527489 record .register_commit (request .getfixturevalue ("mock_commit" ))
528490 return record
529491
530492
531493@pytest .fixture
532494def 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 )
536496 record .register_pull_request (request .getfixturevalue ("mock_pull_closed_with_skip_label" ))
537497 record .register_commit (request .getfixturevalue ("mock_commit" ))
538498 return record
539499
540500
541501@pytest .fixture
542502def record_with_no_issue_one_pull_closed_no_rls_notes (request ):
543- record = Record (repo = request . getfixturevalue ( "mock_repo" ) )
503+ record = Record ()
544504 record .register_pull_request (request .getfixturevalue ("mock_pull_no_rls_notes" ))
545505 return record
546506
0 commit comments