Attachment 111974 Details for Bug 23916 – Bug 23916: (follow-up) Respond to feedback

[patch] Bug 23916: (follow-up) Respond to feedback

Bug-23916-follow-up-Respond-to-feedback.patch (text/plain), 2.95 KB, created by Andrew Isherwood on 2020-10-19 12:41:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2020-10-19 12:41:58 UTC

Size: 2.95 KB

patch

obsolete

>From 9970d19f1becc9d4aa74c32ef74991fb51fbc94b Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Mon, 19 Oct 2020 12:55:18 +0100
>Subject: [PATCH] Bug 23916: (follow-up) Respond to feedback
>
>This commit is a response to Katrin's comments in comment #62:
>
>- Fixed merge conflict
>
>It also fixes a test which now fails due to an upstream change in
>C4::Circulation
>---
> t/db_dependent/Circulation.t    |  2 +-
> t/db_dependent/Koha/Checkouts.t | 11 ++++++-----
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
>diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
>index 4db967ee19..2bcb41f01d 100755
>--- a/t/db_dependent/Circulation.t
>+++ b/t/db_dependent/Circulation.t
>@@ -4119,7 +4119,7 @@ subtest 'Checkout should correctly terminate a transfer' => sub {
>     $hold = $hold->get_from_storage;
>     is( $hold->found, undef, 'Hold is waiting' );
>     is( $hold->priority, 1, );
>-}
>+};
> 
> subtest 'AddIssue records staff who checked out item if appropriate' => sub  {
>     plan tests => 2;
>diff --git a/t/db_dependent/Koha/Checkouts.t b/t/db_dependent/Koha/Checkouts.t
>index 0ee6a4d8b7..01c97bb5b6 100755
>--- a/t/db_dependent/Koha/Checkouts.t
>+++ b/t/db_dependent/Koha/Checkouts.t
>@@ -94,6 +94,9 @@ subtest 'item' => sub {
>     is( $item->itemnumber, $item_1->itemnumber, 'Koha::Checkout->item should return the correct item' );
> };
> 
>+$retrieved_checkout_1->delete;
>+is( Koha::Checkouts->search->count, $nb_of_checkouts + 1, 'Delete should have deleted the checkout' );
>+
> subtest 'patron' => sub {
>     plan tests => 3;
>     my $patron = $builder->build_object({class=>'Koha::Patrons', value => {branchcode => $library->{branchcode}}});
>@@ -127,7 +130,7 @@ subtest 'issuer' => sub {
>     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 $item = $builder->build_sample_item;
>     my $checkout = Koha::Checkout->new({
>         borrowernumber => $patron->borrowernumber,
>         issuer         => $issuer->borrowernumber,
>@@ -141,8 +144,9 @@ subtest 'issuer' => sub {
>     is( $i->borrowernumber, $issuer->borrowernumber,
>         'Koha::Checkout->issued_by should return the correct patron' );
> 
>+    # Testing Koha::Old::Checkout->patron now
>     my $issue_id = $checkout->issue_id;
>-    C4::Circulation::MarkIssueReturned( $i->borrowernumber, $checkout->itemnumber );
>+    C4::Circulation::MarkIssueReturned( $patron->borrowernumber, $checkout->itemnumber );
>     $i->delete;
>     my $old_issue = Koha::Old::Checkouts->find($issue_id);
>     is( $old_issue->issuer, undef,
>@@ -151,8 +155,5 @@ subtest 'issuer' => sub {
> 
> };
> 
>-$retrieved_checkout_1->delete;
>-is( Koha::Checkouts->search->count, $nb_of_checkouts + 1, 'Delete should have deleted the checkout' );
>-
> $schema->storage->txn_rollback;
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23916: 94914 | 94915 | 94916 | 94917 | 94918 | 95503 | 95504 | 95505 | 95506 | 95507 | 95508 | 95509 | 97719 | 97720 | 97721 | 97722 | 97723 | 97724 | 98586 | 98587 | 98588 | 98589 | 98590 | 98591 | 98594 | 99886 | 99887 | 99888 | 99889 | 99890 | 99891 | 110649 | 110650 | 110651 | 110652 | 110653 | 110654 | 110655 | 111485 | 111486 | 111487 | 111488 | 111489 | 111490 | 111491 | 111492 | 111966 | 111967 | 111968 | 111969 | 111970 | 111971 | 111972 | 111973 | 111974 | 112248 | 112249 | 112250 | 112251 | 112252 | 112253 | 112254 | 112255 | 112256 | 112257 | 112363 | 112364 | 112365 | 112366 | 112367 | 112368 | 112369 | 112370 | 112371 | 112372 | 112373 | 113035 | 113036 | 113037 | 113038 | 113039 | 113040 | 113041 | 113042 | 113043 | 113044 | 113045 | 113316 | 113317 | 113318 | 113319 | 113320 | 113321 | 113322 | 113323 | 113324 | 113325 | 113326 | 113327 | 113367 | 113368 | 113369 | 113370 | 113371 | 113372 | 113373 | 113374 | 113375 | 113376 | 113377 | 113378 | 113379 | 113380 | 113381 | 113382 | 113396