From dda4b56c57c952fcd4ad2bc5a3840bac72e380e1 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 18 Aug 2015 16:34:25 -0300 Subject: [PATCH] Bug 14651: (regression test) fallback to bib-level if itype is undef Content-Type: text/plain; charset=utf-8 Koha::Item->effective_itemtype should fallback to biblio-level itemtype even if item-level item types are set, in the case the item has no itemtype set (bad migration, bad old code). To test: - Run $ prove t/db_dependent/Items.t => FAIL: Koha::Item->effective_itemtype doesn't work properly Edit: Added a test for a warning when falling back as per QA request and because it made a lot of sense :-D Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy --- t/db_dependent/Items.t | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/t/db_dependent/Items.t b/t/db_dependent/Items.t index b1796bc..47afb41 100755 --- a/t/db_dependent/Items.t +++ b/t/db_dependent/Items.t @@ -24,6 +24,7 @@ use C4::Branch; use Koha::Database; use Test::More tests => 8; +use Test::Warn; BEGIN { use_ok('C4::Items'); @@ -195,7 +196,7 @@ subtest 'GetItemsInfo tests' => sub { subtest q{Test Koha::Database->schema()->resultset('Item')->itemtype()} => sub { - plan tests => 2; + plan tests => 4; # Start transaction $dbh->{AutoCommit} = 0; @@ -225,6 +226,19 @@ subtest q{Test Koha::Database->schema()->resultset('Item')->itemtype()} => sub { C4::Context->set_preference( 'item-level_itypes', 1 ); ok( $item->effective_itemtype() eq 'ITEM_LEVEL', '$item->itemtype() returns items.itype when item-level_itypes is enabled' ); + # If itemtype is not defined and item-level_level item types are set + # fallback to biblio-level itemtype (Bug 14651) and warn + $item->itype( undef ); + $item->update(); + my $effective_itemtype; + warning_is { $effective_itemtype = $item->effective_itemtype() } + "item-level_itypes set but no itemtype set for item ($item->itemnumber)", + '->effective_itemtype() raises a warning when falling back to bib-level'; + + ok( defined $effective_itemtype && + $effective_itemtype eq 'BIB_LEVEL', + '$item->effective_itemtype() falls back to biblioitems.itemtype when item-level_itypes is enabled but undef' ); + $dbh->rollback; }; -- 1.7.10.4