From 24c901905d7a49cd09e277918819d91daed45215 Mon Sep 17 00:00:00 2001 From: Michal Urban Date: Wed, 15 Jun 2022 06:07:34 -0400 Subject: [PATCH] Bug 30447: Check if transfers arrived or cancelled TO test: 1 - Find a bib with a single item 2 - Browse to Circulation->Transfer 3 - Transfer the item to another branch 4 - Check the item in at current branch and cancel the transfer on the dialog 5 - Place a hold on the biblio for a patron at current branch 6 - Browse to Circulation->Holds to pull 7 - Item does not show 8 - Apply patch, restart all 9 - Browse to Circulation->Holds to pull 10 - Item shows Test in Holds.t Added test to ensure that Koha::Holds->get_items_that_can_fill returns items with datecancelled and datearrived Also cleaned up the variables in the test by removing unblessed and using the variable base forms. https://bugs.koha-community.org/show_bug.cgi?id=30447 --- t/db_dependent/Holds.t | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t index 6d176c629d..41e652c733 100755 --- a/t/db_dependent/Holds.t +++ b/t/db_dependent/Holds.t @@ -1705,13 +1705,8 @@ subtest 'ModReserve can only update expirationdate for found holds' => sub { }; -<<<<<<< HEAD subtest 'Koha::Holds->get_items_that_can_fill returns items with datecancelled or (inclusive) datearrived' => sub { plan tests => 8; -======= -subtest 'Koha::Holds->get_items_that_can_fill returns items with datecancelled and datearrived' => sub { - plan tests => 4; ->>>>>>> Added test to ensure that Koha::Holds->get_items_that_can_fill returns items with datecancelled and datearrived # biblio item with date arrived and date cancelled my $biblio1 = $builder->build_sample_biblio(); my $item1 = $builder->build_sample_item({ biblionumber => $biblio1->biblionumber }); @@ -1790,7 +1785,6 @@ subtest 'Koha::Holds->get_items_that_can_fill returns items with datecancelled a my $items_that_can_fill3 = $holds3->get_items_that_can_fill; my $items_that_can_fill4 = $holds4->get_items_that_can_fill; -<<<<<<< HEAD is($items_that_can_fill1->next->id, $item1->id, "Koha::Holds->get_items_that_can_fill returns item with defined datearrived and datecancelled"); is($items_that_can_fill1->count, 1, "Koha::Holds->get_items_that_can_fill returns 1 item with correct parameters"); is($items_that_can_fill2->next->id, $item2->id, "Koha::Holds->get_items_that_can_fill returns item with defined datearrived and undefined datecancelled"); @@ -1799,19 +1793,4 @@ subtest 'Koha::Holds->get_items_that_can_fill returns items with datecancelled a is($items_that_can_fill3->count, 1, "Koha::Holds->get_items_that_can_fill returns 1 item with correct parameters"); is($items_that_can_fill4->next, undef, "Koha::Holds->get_items_that_can_fill doesn't return item with undefined datearrived and undefined datecancelled"); is($items_that_can_fill4->count, 0, "Koha::Holds->get_items_that_can_fill returns 0 item"); -======= - # get the item number that will be compared to with the items that are called which get_items_that_can_fill returns - my %item_unblessed1 = $item1->unblessed; - # used for first test case - - my %items_that_can_fill_unblessed1 = $items_that_can_fill1->unblessed; - my %items_that_can_fill_unblessed2 = $items_that_can_fill2->unblessed; - my %items_that_can_fill_unblessed3 = $items_that_can_fill3->unblessed; - my %items_that_can_fill_unblessed4 = $items_that_can_fill4->unblessed; - - is($items_that_can_fill_unblessed1{"itemnumber"}, $item_unblessed1{"itemnumber"}, "Koha::Holds->get_items_that_can_fill returns item with defined datearrived and datecancelled"); - is($items_that_can_fill_unblessed2{"itemnumber"}, undef, "Koha::Holds->get_items_that_can_fill doesn't return item with defined datearrived and undefined datecancelled"); - is($items_that_can_fill_unblessed3{"itemnumber"}, undef, "Koha::Holds->get_items_that_can_fill doesn't return item with undefined datearrived and defined datecancelled"); - is($items_that_can_fill_unblessed3{"itemnumber"}, undef, "Koha::Holds->get_items_that_can_fill doesn't return item with undefined datearrived and undefined datecancelled"); ->>>>>>> Added test to ensure that Koha::Holds->get_items_that_can_fill returns items with datecancelled and datearrived } -- 2.25.1