Attachment #112252 for bug #23916

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

Lines 18-24 Link Here

(-)a/t/db_dependent/Circulation.t (-2 / +49 lines)
18	use Modern::Perl;	18	use Modern::Perl;
19	use utf8;	19	use utf8;
20		20
21	use Test::More tests => 50;	21	use Test::More tests => 51;
22	use Test::Exception;	22	use Test::Exception;
23	use Test::MockModule;	23	use Test::MockModule;
24	use Test::Deep qw( cmp_deeply );	24	use Test::Deep qw( cmp_deeply );
Lines 121-126 for my $branch ( $branches->next ) { Link Here
121	$dbh->do('DELETE FROM issues');	121	$dbh->do('DELETE FROM issues');
122	$dbh->do('DELETE FROM borrowers');	122	$dbh->do('DELETE FROM borrowers');
123		123
		124	# Disable recording of issuer until we're ready for it
		125	t::lib::Mocks::mock_preference('RecordIssuer', 0);
		126
		127	my $module = new Test::MockModule('C4::Context');
		128
124	my $library = $builder->build({	129	my $library = $builder->build({
125	source => 'Branch',	130	source => 'Branch',
126	});	131	});
Lines 3313-3319 subtest 'Incremented fee tests' => sub { Link Here
3313	my $library =	3318	my $library =
3314	$builder->build_object( { class => 'Koha::Libraries' } )->store;	3319	$builder->build_object( { class => 'Koha::Libraries' } )->store;
3315		3320
3316	my $module = Test::MockModule->new('C4::Context');
3317	$module->mock( 'userenv', sub { { branch => $library->id } } );	3321	$module->mock( 'userenv', sub { { branch => $library->id } } );
3318		3322
3319	my $patron = $builder->build_object(	3323	my $patron = $builder->build_object(
Lines 4115-4120 subtest 'Checkout should correctly terminate a transfer' => sub { Link Here
4115	$hold = $hold->get_from_storage;	4119	$hold = $hold->get_from_storage;
4116	is( $hold->found, undef, 'Hold is waiting' );	4120	is( $hold->found, undef, 'Hold is waiting' );
4117	is( $hold->priority, 1, );	4121	is( $hold->priority, 1, );
		4122	}
		4123
		4124	subtest 'AddIssue records issuer if appropriate' => sub {
		4125	plan tests => 2;
		4126
		4127	$module->mock( 'userenv', sub { { branch => $library->{id} } } );
		4128
		4129	my $library =
		4130	$builder->build_object( { class => 'Koha::Libraries' } )->store;
		4131	my $patron = $builder->build_object(
		4132	{
		4133	class => 'Koha::Patrons',
		4134	value => { categorycode => $patron_category->{categorycode} }
		4135	}
		4136	)->store;
		4137	my $issuer = $builder->build_object(
		4138	{
		4139	class => 'Koha::Patrons',
		4140	value => { categorycode => $patron_category->{categorycode} }
		4141	}
		4142	)->store;
		4143	my $item = $builder->build_sample_item(
		4144	{
		4145	library => $library->{branchcode}
		4146	}
		4147	);
		4148
		4149	$module->mock( 'userenv', sub { { branch => $library->id, number => $issuer->{borrowernumber} } } );
		4150
		4151	my $dt_from = dt_from_string();
		4152	my $dt_to = dt_from_string()->add( days => 7 );
		4153
		4154	my $issue =
		4155	AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from );
		4156
		4157	is( $issue->issuer, undef, "Issuer not recorded when RecordIssuer turned off" );
		4158
		4159	t::lib::Mocks::mock_preference('RecordIssuer', 1);
		4160
		4161	my $issue2 =
		4162	AddIssue( $patron->unblessed, $item->barcode, $dt_to, undef, $dt_from );
		4163
		4164	is( $issue->issuer, $issuer->{borrowernumber}, "Issuer recorded when RecordIssuer turned on" );
4118	};	4165	};
4119		4166
4120	$schema->storage->txn_rollback;	4167	$schema->storage->txn_rollback;





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 1421-1426 subtest 'get_overdues' => sub { Link Here

(-)a/t/db_dependent/Koha/Patrons.t (-1 / +7 lines)
1421	value => { branchcode => $library->{branchcode} }	1421	value => { branchcode => $library->{branchcode} }
1422	}	1422	}
1423	);	1423	);
		1424	my $issuer = $builder->build(
		1425	{
		1426	source => 'Borrower',
		1427	value => { branchcode => $library->{branchcode} }
		1428	}
		1429	);
		1430	t::lib::Mocks::mock_userenv({ number => $issuer->{borrowernumber} });
1424		1431
1425	t::lib::Mocks::mock_preference({ branchcode => $library->{branchcode} });	1432	t::lib::Mocks::mock_preference({ branchcode => $library->{branchcode} });
1426		1433
1427	-

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