Attachment #98590 for bug #23916

View | Details | Raw Unified | Return to bug 23916
Collapse All | Expand All

Lines 117-122 $cache->clear_from_cache('single_holidays'); Link Here

(-)a/t/db_dependent/Circulation.t (-1 / +48 lines)
117	$dbh->do('DELETE FROM issues');	117	$dbh->do('DELETE FROM issues');
118	$dbh->do('DELETE FROM borrowers');	118	$dbh->do('DELETE FROM borrowers');
119		119
		120	# Disable recording of issuer until we're ready for it
		121	t::lib::Mocks::mock_preference('RecordIssuer', 0);
		122
		123	my $module = new Test::MockModule('C4::Context');
		124
120	my $library = $builder->build({	125	my $library = $builder->build({
121	source => 'Branch',	126	source => 'Branch',
122	});	127	});
Lines 3368-3374 subtest 'Incremented fee tests' => sub { Link Here
3368	my $library =	3373	my $library =
3369	$builder->build_object( { class => 'Koha::Libraries' } )->store;	3374	$builder->build_object( { class => 'Koha::Libraries' } )->store;
3370		3375
3371	my $module = new Test::MockModule('C4::Context');
3372	$module->mock( 'userenv', sub { { branch => $library->id } } );	3376	$module->mock( 'userenv', sub { { branch => $library->id } } );
3373		3377
3374	my $patron = $builder->build_object(	3378	my $patron = $builder->build_object(
Lines 3647-3652 subtest "Test Backdating of Returns" => sub { Link Here
3647	is( $accountline->amount+0, 0, 'Fee amount was reduced to 0' );	3651	is( $accountline->amount+0, 0, 'Fee amount was reduced to 0' );
3648	};	3652	};
3649		3653
		3654	subtest 'AddIssue records issuer if appropriate' => sub {
		3655	plan tests => 2;
		3656
		3657	$module->mock( 'userenv', sub { { branch => $library->{id} } } );
		3658
		3659	my $library =
		3660	$builder->build_object( { class => 'Koha::Libraries' } )->store;
		3661	my $patron = $builder->build_object(
		3662	{
		3663	class => 'Koha::Patrons',
		3664	value => { categorycode => $patron_category->{categorycode} }
		3665	}
		3666	)->store;
		3667	my $issuer = $builder->build_object(
		3668	{
		3669	class => 'Koha::Patrons',
		3670	value => { categorycode => $patron_category->{categorycode} }
		3671	}
		3672	)->store;
		3673	my $item = $builder->build_sample_item(
		3674	{
		3675	library => $library->{branchcode}
		3676	}
		3677	);
		3678
		3679	$module->mock( 'userenv', sub { { branch => $library->id, number => $issuer->{borrowernumber} } } );
		3680
		3681	my $dt_from = dt_from_string();
		3682	my $dt_to = dt_from_string()->add( days => 7 );
		3683
		3684	my $issue =
		3685	AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from );
		3686
		3687	is( $issue->issuer, undef, "Issuer not recorded when RecordIssuer turned off" );
		3688
		3689	t::lib::Mocks::mock_preference('RecordIssuer', 1);
		3690
		3691	my $issue2 =
		3692	AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from );
		3693
		3694	is( $issue->issuer, $issuer->{borrowernumber}, "Issuer recorded when RecordIssuer turned on" );
		3695	};
		3696
3650	$schema->storage->txn_rollback;	3697	$schema->storage->txn_rollback;
3651	C4::Context->clear_syspref_cache();	3698	C4::Context->clear_syspref_cache();
3652	$cache->clear_from_cache('single_holidays');	3699	$cache->clear_from_cache('single_holidays');





use Modern::Perl;

use Test::More tests => 8;

use C4::Circulation;
use Koha::Checkouts;

    );
};

subtest 'issuer' => sub {
    plan tests => 3;
    my $patron = $builder->build_object({class=>'Koha::Patrons', value => {branchcode => $library->{branchcode}}});
    my $issuer = $builder->build_object({class=>'Koha::Patrons', value => {branchcode => $library->{branchcode}}});

    my $item = $builder->build_object( { class=> 'Koha::Items' } );
    my $checkout = Koha::Checkout->new({
        borrowernumber => $patron->borrowernumber,
        issuer         => $issuer->borrowernumber,
        itemnumber     => $item->itemnumber,
        branchcode     => $library->{branchcode},
    })->store;

    my $i = $checkout->issued_by;
    is( ref($i), 'Koha::Patron',
        'Koha::Checkout->issued_by should return a Koha::Patron' );
    is( $i->borrowernumber, $issuer->borrowernumber,
        'Koha::Checkout->issued_by should return the correct patron' );

    my $issue_id = $checkout->issue_id;
    C4::Circulation::MarkIssueReturned( $i->borrowernumber, $checkout->itemnumber );
    $i->delete;
    my $old_issue = Koha::Old::Checkouts->find($issue_id);
    is( $old_issue->issuer, undef,
        'Koha::Checkout->issuer should return undef if the patron record has been deleted'
    );

};

$retrieved_checkout_1->delete;
is( Koha::Checkouts->search->count, $nb_of_checkouts + 1, 'Delete should have deleted the checkout' );


Lines 1404-1409 subtest 'get_overdues' => sub { Link Here

(-)a/t/db_dependent/Koha/Patrons.t (-1 / +7 lines)
1404	value => { branchcode => $library->{branchcode} }	1404	value => { branchcode => $library->{branchcode} }
1405	}	1405	}
1406	);	1406	);
		1407	my $issuer = $builder->build(
		1408	{
		1409	source => 'Borrower',
		1410	value => { branchcode => $library->{branchcode} }
		1411	}
		1412	);
		1413	t::lib::Mocks::mock_userenv({ number => $issuer->{borrowernumber} });
1407		1414
1408	t::lib::Mocks::mock_preference({ branchcode => $library->{branchcode} });	1415	t::lib::Mocks::mock_preference({ branchcode => $library->{branchcode} });
1409		1416
1410	-

Return to bug 23916

Lines 19-25 Link Here

(-)a/t/db_dependent/Koha/Checkouts.t (-1 / +30 lines)
19		19
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Test::More tests => 7;	22	use Test::More tests => 8;
23		23
24	use C4::Circulation;	24	use C4::Circulation;
25	use Koha::Checkouts;	25	use Koha::Checkouts;
Lines 122-127 subtest 'patron' => sub { Link Here
122	);	122	);
123	};	123	};
124		124
		125	subtest 'issuer' => sub {
		126	plan tests => 3;
		127	my $patron = $builder->build_object({class=>'Koha::Patrons', value => {branchcode => $library->{branchcode}}});
		128	my $issuer = $builder->build_object({class=>'Koha::Patrons', value => {branchcode => $library->{branchcode}}});
		129
		130	my $item = $builder->build_object( { class=> 'Koha::Items' } );
		131	my $checkout = Koha::Checkout->new({
		132	borrowernumber => $patron->borrowernumber,
		133	issuer => $issuer->borrowernumber,
		134	itemnumber => $item->itemnumber,
		135	branchcode => $library->{branchcode},
		136	})->store;
		137
		138	my $i = $checkout->issued_by;
		139	is( ref($i), 'Koha::Patron',
		140	'Koha::Checkout->issued_by should return a Koha::Patron' );
		141	is( $i->borrowernumber, $issuer->borrowernumber,
		142	'Koha::Checkout->issued_by should return the correct patron' );
		143
		144	my $issue_id = $checkout->issue_id;
		145	C4::Circulation::MarkIssueReturned( $i->borrowernumber, $checkout->itemnumber );
		146	$i->delete;
		147	my $old_issue = Koha::Old::Checkouts->find($issue_id);
		148	is( $old_issue->issuer, undef,
		149	'Koha::Checkout->issuer should return undef if the patron record has been deleted'
		150	);
		151
		152	};
		153
125	$retrieved_checkout_1->delete;	154	$retrieved_checkout_1->delete;
126	is( Koha::Checkouts->search->count, $nb_of_checkouts + 1, 'Delete should have deleted the checkout' );	155	is( Koha::Checkouts->search->count, $nb_of_checkouts + 1, 'Delete should have deleted the checkout' );
127		156