Bugzilla – Attachment 128009 Details for
Bug 28445
Use the task queue for the batch delete and update items tool
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28445: Prevent UI/Form/Builder/Item.t to fail randomly
Bug-28445-Prevent-UIFormBuilderItemt-to-fail-rando.patch (text/plain), 2.93 KB, created by
Jonathan Druart
on 2021-11-25 12:56:13 UTC
(
hide
)
Description:
Bug 28445: Prevent UI/Form/Builder/Item.t to fail randomly
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2021-11-25 12:56:13 UTC
Size:
2.93 KB
patch
obsolete
>From 12dbe27d692f93efe16c22ffcccb9655a7779a0d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 25 Nov 2021 13:53:55 +0100 >Subject: [PATCH] Bug 28445: Prevent UI/Form/Builder/Item.t to fail randomly > >MySQL and Perl don't order strings with _ identically which cause a >mismatch when comparing the itemtypes. >--- > t/db_dependent/Koha/UI/Form/Builder/Item.t | 32 ++++++++++++---------- > 1 file changed, 18 insertions(+), 14 deletions(-) > >diff --git a/t/db_dependent/Koha/UI/Form/Builder/Item.t b/t/db_dependent/Koha/UI/Form/Builder/Item.t >index 514cfb279d4..369f9b03989 100755 >--- a/t/db_dependent/Koha/UI/Form/Builder/Item.t >+++ b/t/db_dependent/Koha/UI/Form/Builder/Item.t >@@ -45,6 +45,16 @@ $cache->clear_from_cache("MarcSubfieldStructure-"); > # 952$t is linked with items.copynumber and is not repeatable > setup_mss(); > >+# FIXME Later in this script we are comparing itemtypes, ordered by their description. >+# MySQL and Perl don't sort _ identically. >+# If you have one itemtype BK and another one B_K, MySQL will sort B_K first when Perl will sort it last >+my @itemtypes = Koha::ItemTypes->search->as_list; >+for my $itemtype ( @itemtypes ) { >+ my $d = $itemtype->description; >+ $d =~ s|_||g; >+ $itemtype->description($d)->store; >+} >+ > subtest 'authorised values' => sub { > #plan tests => 1; > >@@ -111,29 +121,23 @@ subtest 'authorised values' => sub { > subtest 'itemtypes' => sub { > plan tests => 2; > my ($subfield) = grep { $_->{kohafield} eq 'items.itype' } @$subfields; >- my $itemtypes = Koha::ItemTypes->search; >+ my @itemtypes = Koha::ItemTypes->search->as_list; > > my $expected = [ > "", >- map { $_->itemtype } >- # We need to sort using uc or perl won't be case insensitive >- sort { uc($a->translated_description) cmp uc($b->translated_description) } >- $itemtypes->as_list >- ]; >+ map { $_->itemtype } >+ # We need to sort using uc or perl won't be case insensitive >+ sort { uc($a->translated_description) cmp uc($b->translated_description) } >+ @itemtypes >+ ]; > is_deeply( > $subfield->{marc_value}->{values}, > $expected, > "Item types should be sorted by description and an empty entry should be shown" >- ) >- or diag("Itemtypes details: " . Dumper( >- $subfield->{marc_value}->{values}, >- $expected, >- { map { $_->itemtype => $_->translated_description } $itemtypes->as_list }, >- $Koha::Schema::Result::Itemtype::LANGUAGE, >- )); >+ ); > > is_deeply( $subfield->{marc_value}->{labels}, >- { map { $_->itemtype => $_->description } $itemtypes->as_list }, >+ { map { $_->itemtype => $_->description } @itemtypes}, > 'Labels should be correctly displayed' > ); > }; >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28445
:
121372
|
123221
|
123222
|
123223
|
123224
|
123225
|
123226
|
123227
|
123228
|
123229
|
123239
|
123240
|
125801
|
125802
|
125803
|
125804
|
125805
|
125808
|
125810
|
125811
|
125812
|
125817
|
125865
|
126046
|
126047
|
126136
|
126137
|
126138
|
126139
|
126140
|
126141
|
126142
|
126217
|
126218
|
126219
|
126223
|
126328
|
126329
|
126330
|
126331
|
126332
|
126333
|
126334
|
126335
|
126336
|
126337
|
126338
|
126339
|
126352
|
126353
|
126354
|
126355
|
126356
|
126357
|
126358
|
126359
|
126360
|
126361
|
126362
|
126363
|
126364
|
126365
|
126366
|
126367
|
126374
|
126375
|
126376
|
126377
|
126378
|
126379
|
126380
|
126381
|
126382
|
126383
|
126384
|
126385
|
126386
|
126387
|
126388
|
126389
|
127033
|
127037
|
127038
|
127039
|
128007
|
128008
| 128009