Attachment 113326 Details for Bug 23916 – Bug 23916: (QA follow-up) Remove stray changes and fix typo

[patch] Bug 23916: (QA follow-up) Remove stray changes and fix typo

Bug-23916-QA-follow-up-Remove-stray-changes-and-fi.patch (text/plain), 2.75 KB, created by Jonathan Druart on 2020-11-09 15:19:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-11-09 15:19:59 UTC

Size: 2.75 KB

patch

obsolete

>From 9c779e415cb58a991ae3d491adb5bafd87cc9a2c Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Sat, 24 Oct 2020 02:56:15 +0000
>Subject: [PATCH] Bug 23916: (QA follow-up) Remove stray changes and fix typo
>
>There were a couple changes that had no effect, so cleaned those up
>
>Typo 'is' for 'if'
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> C4/Circulation.pm               | 2 +-
> Koha/Patrons.pm                 | 4 +---
> t/db_dependent/Koha/Checkouts.t | 6 +++---
> 3 files changed, 5 insertions(+), 7 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 925c6f7b52..f0b8dc4d1c 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -1522,7 +1522,7 @@ sub AddIssue {
> 
>             # Get ID of logged in user.  if called from a batch job,
>             # no user session exists and C4::Context->userenv() returns
>-            # the scalar '0'. Only do this is the syspref says so
>+            # the scalar '0'. Only do this if the syspref says so
>             if ( C4::Context->preference('RecordStaffUserOnCheckout') ) {
>                 my $userenv = C4::Context->userenv();
>                 my $usernumber = (ref($userenv) eq 'HASH') ? $userenv->{'number'} : undef;
>diff --git a/Koha/Patrons.pm b/Koha/Patrons.pm
>index a958200d1b..3b3b4b1cb6 100644
>--- a/Koha/Patrons.pm
>+++ b/Koha/Patrons.pm
>@@ -195,9 +195,7 @@ sub anonymise_issue_history {
>         }
>         );
>         my $anonymous_patron = C4::Context->preference('AnonymousPatron') || undef;
>-        $nb_rows += $old_issues_to_anonymise->update( {
>-            'old_issues.borrowernumber' => $anonymous_patron
>-        } );
>+        $nb_rows += $old_issues_to_anonymise->update( { 'old_issues.borrowernumber' => $anonymous_patron } );
>     }
>     return $nb_rows;
> }
>diff --git a/t/db_dependent/Koha/Checkouts.t b/t/db_dependent/Koha/Checkouts.t
>index 01c97bb5b6..246a986eea 100755
>--- a/t/db_dependent/Koha/Checkouts.t
>+++ b/t/db_dependent/Koha/Checkouts.t
>@@ -94,9 +94,6 @@ subtest 'item' => sub {
>     is( $item->itemnumber, $item_1->itemnumber, 'Koha::Checkout->item should return the correct item' );
> };
> 
>-$retrieved_checkout_1->delete;
>-is( Koha::Checkouts->search->count, $nb_of_checkouts + 1, 'Delete should have deleted the checkout' );
>-
> subtest 'patron' => sub {
>     plan tests => 3;
>     my $patron = $builder->build_object({class=>'Koha::Patrons', value => {branchcode => $library->{branchcode}}});
>@@ -125,6 +122,9 @@ subtest 'patron' => sub {
>     );
> };
> 
>+$retrieved_checkout_1->delete;
>+is( Koha::Checkouts->search->count, $nb_of_checkouts + 1, 'Delete should have deleted the checkout' );
>+
> subtest 'issuer' => sub {
>     plan tests => 3;
>     my $patron = $builder->build_object({class=>'Koha::Patrons', value => {branchcode => $library->{branchcode}}});
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23916: 94914 | 94915 | 94916 | 94917 | 94918 | 95503 | 95504 | 95505 | 95506 | 95507 | 95508 | 95509 | 97719 | 97720 | 97721 | 97722 | 97723 | 97724 | 98586 | 98587 | 98588 | 98589 | 98590 | 98591 | 98594 | 99886 | 99887 | 99888 | 99889 | 99890 | 99891 | 110649 | 110650 | 110651 | 110652 | 110653 | 110654 | 110655 | 111485 | 111486 | 111487 | 111488 | 111489 | 111490 | 111491 | 111492 | 111966 | 111967 | 111968 | 111969 | 111970 | 111971 | 111972 | 111973 | 111974 | 112248 | 112249 | 112250 | 112251 | 112252 | 112253 | 112254 | 112255 | 112256 | 112257 | 112363 | 112364 | 112365 | 112366 | 112367 | 112368 | 112369 | 112370 | 112371 | 112372 | 112373 | 113035 | 113036 | 113037 | 113038 | 113039 | 113040 | 113041 | 113042 | 113043 | 113044 | 113045 | 113316 | 113317 | 113318 | 113319 | 113320 | 113321 | 113322 | 113323 | 113324 | 113325 | 113326 | 113327 | 113367 | 113368 | 113369 | 113370 | 113371 | 113372 | 113373 | 113374 | 113375 | 113376 | 113377 | 113378 | 113379 | 113380 | 113381 | 113382 | 113396