Bugzilla – Attachment 74136 Details for
Bug 20271
Merge deleted biblio, biblioitems, biblio_metadata, and items tables
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20271: fix remaining tests
Bug-20271-fix-remaining-tests.patch (text/plain), 3.94 KB, created by
Benjamin Rokseth
on 2018-04-13 07:36:05 UTC
(
hide
)
Description:
Bug 20271: fix remaining tests
Filename:
MIME Type:
Creator:
Benjamin Rokseth
Created:
2018-04-13 07:36:05 UTC
Size:
3.94 KB
patch
obsolete
>From d26864c9f06ca823227ca7dab67bf2beeec0041c Mon Sep 17 00:00:00 2001 >From: Benjamin Rokseth <benjamin.rokseth@deichman.no> >Date: Fri, 6 Apr 2018 13:03:34 +0200 >Subject: [PATCH] Bug 20271: fix remaining tests > >--- > C4/Circulation.pm | 3 +++ > t/db_dependent/Acquisition.t | 4 ++-- > t/db_dependent/Items_DelItemCheck.t | 2 +- > t/db_dependent/db_structure.t | 3 --- > t/lib/TestBuilder.pm | 10 ++++++++++ > 5 files changed, 16 insertions(+), 6 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 67ee4e5..97e669d 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1803,6 +1803,9 @@ sub AddReturn { > unless ($item) { > return ( 0, { BadBarcode => $barcode } ); # no barcode means no item or borrower. bail out. > } >+ if ($item->{deleted_at}) { >+ return ( 0, { BadBarcode => $barcode } ); >+ } > > my $itemnumber = $item->{ itemnumber }; > my $itemtype = $item->{itype}; # GetItem called effective_itemtype >diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t >index 975fb03..c5a36e9 100755 >--- a/t/db_dependent/Acquisition.t >+++ b/t/db_dependent/Acquisition.t >@@ -513,7 +513,7 @@ ok((not defined $error), "DelOrder does not fail"); > $order2 = GetOrder($order2->{ordernumber}); > ok((defined $order2->{datecancellationprinted}), "order is cancelled"); > ok((not defined $order2->{cancellationreason}), "order has no cancellation reason"); >-ok((not defined Koha::Biblios->find( $order2->{biblionumber} )), "biblio does not exist anymore"); >+ok(Koha::Biblios->find($order2->{biblionumber})->deleted_at , "biblio does not exist anymore"); > > my $order4 = GetOrder($ordernumbers[3]); > $error = DelOrder($order4->{biblionumber}, $order4->{ordernumber}, 1, "foobar"); >@@ -521,7 +521,7 @@ ok((not defined $error), "DelOrder does not fail"); > $order4 = GetOrder($order4->{ordernumber}); > ok((defined $order4->{datecancellationprinted}), "order is cancelled"); > ok(($order4->{cancellationreason} eq "foobar"), "order has cancellation reason \"foobar\""); >-ok((not defined Koha::Biblios->find( $order4->{biblionumber} )), "biblio does not exist anymore"); >+ok(Koha::Biblios->find($order4->{biblionumber})->deleted_at, "biblio does not exist anymore"); > > my $order5 = GetOrder($ordernumbers[4]); > C4::Items::AddItem( { barcode => '0102030405' }, $order5->{biblionumber} ); >diff --git a/t/db_dependent/Items_DelItemCheck.t b/t/db_dependent/Items_DelItemCheck.t >index 57514d0..0963ebd 100644 >--- a/t/db_dependent/Items_DelItemCheck.t >+++ b/t/db_dependent/Items_DelItemCheck.t >@@ -161,7 +161,7 @@ DelItemCheck( $biblio->{biblionumber}, $item->{itemnumber} ); > > my $test_item = GetItem( $item->{itemnumber} ); > >-is( $test_item->{itemnumber}, undef, >+isnt( $test_item->{deleted_at}, undef, > "DelItemCheck should delete item if ItemSafeToDelete returns true" > ); > >diff --git a/t/db_dependent/db_structure.t b/t/db_dependent/db_structure.t >index 41de507..86227fd 100644 >--- a/t/db_dependent/db_structure.t >+++ b/t/db_dependent/db_structure.t >@@ -22,9 +22,6 @@ use Koha::Database; > > my @modules = ( > [ qw( Borrower Deletedborrower ) ], >- [ qw( Biblio Deletedbiblio ) ], >- [ qw( Biblioitem Deletedbiblioitem ) ], >- [ qw( Item Deleteditem ) ], > ); > > my @keys_to_check = qw( size is_nullable data_type accessor datetime_undef_if_invalid default_value ); >diff --git a/t/lib/TestBuilder.pm b/t/lib/TestBuilder.pm >index 1aa6de9..e098ea1 100644 >--- a/t/lib/TestBuilder.pm >+++ b/t/lib/TestBuilder.pm >@@ -470,8 +470,18 @@ sub _gen_default_values { > debarred => undef, > borrowernotes => '', > }, >+ Biblio => { >+ deleted_at => undef, >+ }, >+ Biblioitems => { >+ deleted_at => undef, >+ }, >+ BiblioMetadata => { >+ deleted_at => undef, >+ }, > Item => { > more_subfields_xml => undef, >+ deleted_at => undef, > }, > Category => { > enrolmentfee => 0, >-- >2.1.4
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 20271
:
72300
|
72799
|
72800
|
73091
|
73092
|
73093
|
73535
|
73536
|
73537
|
73538
|
73539
|
73540
|
73597
|
73759
|
73760
|
73761
|
73762
|
73763
|
73764
|
73765
|
74127
|
74128
|
74129
|
74130
|
74131
|
74132
|
74133
|
74134
|
74135
|
74136
|
74137
|
74138
|
74139
|
74140
|
74141
|
74142
|
74182
|
74183
|
74184
|
74185
|
74186
|
74187
|
74188
|
74189
|
74190
|
74223
|
74407
|
74408
|
74409
|
74410
|
74411
|
74412
|
74413
|
74414
|
74415
|
74416
|
75265
|
75347
|
75894
|
75897
|
75898
|
75899
|
75910
|
75977
|
75978
|
75979
|
75980
|
75981
|
75982
|
75983
|
75984
|
75985
|
75986
|
75987
|
75988
|
75989
|
75990
|
75991
|
75992
|
75993
|
76047
|
76048
|
76255
|
76256
|
76257
|
76258
|
76259
|
76260
|
76261
|
76262
|
76263
|
76264
|
76265
|
76266
|
76267
|
76268
|
76269
|
76270
|
76271
|
76272
|
76273
|
76274
|
76275
|
76276
|
76277
|
76493
|
76494
|
76495
|
76496
|
76497
|
76498
|
76499
|
76500
|
76501
|
76502
|
76503
|
76504
|
76505
|
76506
|
76507
|
76508
|
76509
|
76510
|
76511
|
76512
|
76513
|
76514