From 0aba2d4322f92d9a48800d6523f80978831d1f87 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 6 Oct 2021 15:45:17 +0200 Subject: [PATCH] Bug 28445: Improve robustness of tests * Could fail if not using the original sample data: build the AV we need instead of relying on what is in the DB * Libraries are ordered by name by default but if others have been added the test may fail --- t/db_dependent/Koha/Item.t | 10 +++++----- t/db_dependent/Koha/UI/Form/Builder/Item.t | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/t/db_dependent/Koha/Item.t b/t/db_dependent/Koha/Item.t index 32cad939749..b09e9e7ea60 100755 --- a/t/db_dependent/Koha/Item.t +++ b/t/db_dependent/Koha/Item.t @@ -1115,7 +1115,7 @@ subtest 'columns_to_str' => sub { my $biblio = $builder->build_sample_biblio({ frameworkcode => '' }); my $item = $builder->build_sample_item({ biblionumber => $biblio->biblionumber }); - my $itemlost = Koha::AuthorisedValues->search({ category => 'LOST' })->next->authorised_value; + my $lost_av = $builder->build_object({ class => 'Koha::AuthorisedValues', value => { category => 'LOST', authorised_value => '42' }}); my $dateaccessioned = '2020-12-15'; my $library = Koha::Libraries->search->next; my $branchcode = $library->branchcode; @@ -1138,7 +1138,7 @@ subtest 'columns_to_str' => sub { $item->update( { - itemlost => $itemlost, + itemlost => $lost_av->authorised_value, dateaccessioned => $dateaccessioned, more_subfields_xml => $some_marc_xml, } @@ -1147,9 +1147,9 @@ subtest 'columns_to_str' => sub { $item = $item->get_from_storage; my $s = $item->columns_to_str; - is( $s->{itemlost}, 'Lost' ); - is( $s->{dateaccessioned}, '2020-12-15'); - is( $s->{é}, 'value é'); + is( $s->{itemlost}, $lost_av->lib, 'Attributes linked with AV replaced with description' ); + is( $s->{dateaccessioned}, '2020-12-15', 'Date attributes iso formatted'); + is( $s->{é}, 'value é', 'subfield ok with more than a-Z'); is( $s->{è}, $library->branchname ); $cache->clear_from_cache("MarcStructure-0-"); diff --git a/t/db_dependent/Koha/UI/Form/Builder/Item.t b/t/db_dependent/Koha/UI/Form/Builder/Item.t index 413d837c8c1..386241c637f 100755 --- a/t/db_dependent/Koha/UI/Form/Builder/Item.t +++ b/t/db_dependent/Koha/UI/Form/Builder/Item.t @@ -96,7 +96,7 @@ subtest 'authorised values' => sub { subtest 'branches' => sub { plan tests => 2; my ( $subfield ) = grep { $_->{kohafield} eq 'items.homebranch' } @$subfields; - my $libraries = Koha::Libraries->search; + my $libraries = Koha::Libraries->search({}, { order_by => 'branchname' }); is_deeply( $subfield->{marc_value}->{values}, [ $libraries->get_column('branchcode') ] -- 2.25.1