From 8bb4e19c8adaab2efc71edfd3cd8c894b0c31da7 Mon Sep 17 00:00:00 2001 From: Ere Maijala Date: Wed, 27 Feb 2019 15:59:23 +0200 Subject: [PATCH] Bug 20664: (follow-up) Fix tests on rebase --- t/db_dependent/Items.t | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/t/db_dependent/Items.t b/t/db_dependent/Items.t index a838d00fba..ba8e332820 100755 --- a/t/db_dependent/Items.t +++ b/t/db_dependent/Items.t @@ -1021,6 +1021,7 @@ subtest 'tests for GetMarcItem' => sub { restricted => 1, itemcallnumber => "", cn_sort => "", + itype => 'itemtype' } }); my $get_itemnumber = $item1->itemnumber; @@ -1067,7 +1068,7 @@ subtest 'tests for GetMarcItemFields' => sub { withdrawn => 0, } }); - push @items, GetItem( $item1->itemnumber ); + push @items, Koha::Items->find( $item1->itemnumber )->unblessed; my $item2 = $builder->build_object({ class => 'Koha::Items', value => { @@ -1082,7 +1083,7 @@ subtest 'tests for GetMarcItemFields' => sub { withdrawn => 0, } }); - push @items, GetItem( $item2->itemnumber ); + push @items, Koha::Items->find( $item2->itemnumber )->unblessed; my $item3 = $builder->build_object({ class => 'Koha::Items', value => { @@ -1097,13 +1098,13 @@ subtest 'tests for GetMarcItemFields' => sub { withdrawn => 1, } }); - push @items, GetItem( $item3->itemnumber ); + push @items, Koha::Items->find( $item3->itemnumber )->unblessed; #Get the marc for our items individually for comparison later my $item1_marc = C4::Items::GetMarcItem( $biblio->{biblionumber}, $item1->itemnumber ); my $item2_marc = C4::Items::GetMarcItem( $biblio->{biblionumber}, $item2->itemnumber ); my $item3_marc = C4::Items::GetMarcItem( $biblio->{biblionumber}, $item3->itemnumber ); - my ($itemtag, $item_num_subfield )=C4::Biblio::GetMarcFromKohaField("items.itemnumber"); #get itemnumber tag + my ($itemtag, $item_num_subfield ) = C4::Biblio::GetMarcFromKohaField("items.itemnumber"); #get itemnumber tag $item1_marc->field($itemtag)->delete_subfield(code => $item_num_subfield); #and remove it $item2_marc->field($itemtag)->delete_subfield(code => $item_num_subfield); #because it won't match -- 2.17.1