Attachment 111860 Details for Bug 24083 – Bug 24083: (follow-up) Fix bad rebase

[patch] Bug 24083: (follow-up) Fix bad rebase

Bug-24083-follow-up-Fix-bad-rebase.patch (text/plain), 1.29 KB, created by Andrew Isherwood on 2020-10-16 11:20:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2020-10-16 11:20:55 UTC

Size: 1.29 KB

patch

obsolete

>From e81cbae655ea5be2bcfad2358e586e8a394f3d53 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Fri, 16 Oct 2020 12:00:10 +0100
>Subject: [PATCH] Bug 24083: (follow-up) Fix bad rebase
>
>This commit fixes a couple of lines that got missed during the last
>rebase
>---
> t/db_dependent/Circulation.t | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
>index fc35fee0a1..e90266084e 100755
>--- a/t/db_dependent/Circulation.t
>+++ b/t/db_dependent/Circulation.t
>@@ -1169,6 +1169,7 @@ subtest "CanBookBeRenewed tests" => sub {
>             }
>         }
>     );
>+    t::lib::Mocks::mock_preference('UnseenRenewals', 1);
>     $dbh->do('UPDATE issues SET unseen_renewals = 2 where borrowernumber = ? AND itemnumber = ?', undef, ($renewing_borrowernumber, $item_1->itemnumber));
>     ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $item_1->itemnumber);
>     is( $renewokay, 0, 'Cannot renew, 0 unseen renewals allowed');
>@@ -1184,6 +1185,7 @@ subtest "CanBookBeRenewed tests" => sub {
>             }
>         }
>     );
>+    t::lib::Mocks::mock_preference('UnseenRenewals', 0);
> 
>     # Test WhenLostForgiveFine and WhenLostChargeReplacementFee
>     t::lib::Mocks::mock_preference('WhenLostForgiveFine','1');
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24083: 95861 | 95862 | 95863 | 95864 | 95865 | 95866 | 95867 | 95868 | 98749 | 98750 | 98751 | 98752 | 98765 | 98766 | 98767 | 98768 | 100244 | 100245 | 100246 | 100247 | 100380 | 100381 | 100382 | 100383 | 100392 | 110607 | 110608 | 110609 | 110610 | 110611 | 111147 | 111148 | 111149 | 111150 | 111151 | 111152 | 111283 | 111284 | 111285 | 111286 | 111287 | 111288 | 111289 | 111290 | 111291 | 111292 | 111293 | 111849 | 111850 | 111851 | 111852 | 111853 | 111854 | 111855 | 111856 | 111857 | 111858 | 111859 | 111860 | 112230 | 112231 | 112232 | 112233 | 112234 | 112235 | 112236 | 112237 | 112238 | 112239 | 112240 | 112241 | 112242 | 112243 | 112410 | 112411 | 112412 | 112413 | 112414 | 112415 | 112416 | 112417 | 112418 | 112419 | 112420 | 112421 | 112422 | 112423 | 113073 | 113074 | 113075 | 113076 | 113077 | 113078 | 113079 | 113080 | 113314 | 113315 | 113484 | 113485 | 113486 | 113487 | 113488 | 113489 | 113490 | 113491 | 113492 | 113493 | 113494 | 113546 | 113556 | 113557 | 113814