Attachment 124682 Details for Bug 27945 – Bug 27945: (follow-up) Fix tests for the adjusted check

[patch] Bug 27945: (follow-up) Fix tests for the adjusted check

Bug-27945-follow-up-Fix-tests-for-the-adjusted-che.patch (text/plain), 4.27 KB, created by Marcel de Rooy on 2021-09-09 07:45:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2021-09-09 07:45:19 UTC

Size: 4.27 KB

patch

obsolete

>From 045ef4dcc71d73c07e50a99cf9a6e7225e7b3791 Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Tue, 7 Sep 2021 19:28:13 -0300
>Subject: [PATCH] Bug 27945: (follow-up) Fix tests for the adjusted check
>Content-Type: text/plain; charset=utf-8
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> t/db_dependent/ArticleRequests.t | 32 +++++++++++++++++++-------------
> 1 file changed, 19 insertions(+), 13 deletions(-)
>
>diff --git a/t/db_dependent/ArticleRequests.t b/t/db_dependent/ArticleRequests.t
>index 987de75639..a27a599f41 100644
>--- a/t/db_dependent/ArticleRequests.t
>+++ b/t/db_dependent/ArticleRequests.t
>@@ -256,7 +256,7 @@ subtest 'may_article_request' => sub {
> 
> 
> subtest 'article request limit' => sub {
>-  plan tests => 12;
>+  plan tests => 13;
> 
>   t::lib::Mocks::mock_preference('ArticleRequests', 1);
> 
>@@ -280,7 +280,7 @@ subtest 'article request limit' => sub {
>   );
>   $patron->article_requests->delete();
> 
>-  is($patron->can_request_article, 1, 'Patron can request more articles');
>+  is($patron->can_request_article, 1, 'There are no AR, so patron can request more articles');
> 
>   my $article_request_1 = Koha::ArticleRequest->new(
>     {
>@@ -291,7 +291,7 @@ subtest 'article request limit' => sub {
>     }
>   )->store();
> 
>-  is($patron->can_request_article, 0, 'Patron cannot request more articles');
>+  is($patron->can_request_article, 0, 'Limit is 1, so patron cannot request more articles');
>   is($patron->article_requests->count, 1, 'There is one current article request');
> 
>   try {
>@@ -300,38 +300,42 @@ subtest 'article request limit' => sub {
>         borrowernumber => $patron->id,
>         biblionumber   => $item->biblionumber,
>         itemnumber     => $item->itemnumber,
>-        title          => 'an second article request',
>+        title          => 'a second article request',
>       }
>     )->store();
>   }
>   catch {
>-    is(ref($_), 'Koha::Exceptions::ArticleRequest::LimitReached', 'Limit reached thrown');
>+    is(ref($_), 'Koha::Exceptions::ArticleRequest::LimitReached', 'When limit was reached and we ask for a new AR, Limit reached is thrown');
>   };
> 
>-  is($patron->can_request_article, 0, 'Patron cannot request more articles');
>+  is($patron->can_request_article, 0, 'There is still an AR, so patron cannot request more articles');
>   is($patron->article_requests->count, 1, 'There is still one article request');
> 
>-  $article_request_1->created_on(dt_from_string->add(days => -1))->store();
>+  $article_request_1->complete();
> 
>-  is($patron->can_request_article, 1, 'Patron can request more articles');
>+  is($patron->can_request_article, 0, 'AR was completed but within one day, so patron cannot request more articles');
>+
>+  $article_request_1->updated_on(dt_from_string->add(days => -2))->store();
>+
>+  is($patron->can_request_article, 1, 'There are no completed AR within one day, so patron can request more articles');
> 
>   my $article_request_3 = Koha::ArticleRequest->new(
>     {
>       borrowernumber => $patron->id,
>       biblionumber   => $item->biblionumber,
>       itemnumber     => $item->itemnumber,
>-      title          => 'an third article request',
>+      title          => 'a third article request',
>     }
>   )->store();
> 
>-  is($patron->can_request_article, 0, 'Patron cannot request more articles');
>+  is($patron->can_request_article, 0, 'A new AR was created, so patron cannot request more articles');
>   is($patron->article_requests->count, 2, 'There are 2 article requests');
> 
>   $article_request_3->cancel();
> 
>-  is($patron->can_request_article, 1, 'Patron can request more articles');
>+  is($patron->can_request_article, 1, 'New AR was cancelled, so patron can request more articles');
> 
>-  Koha::ArticleRequest->new(
>+  my $article_request_4 = Koha::ArticleRequest->new(
>     {
>       borrowernumber => $patron->id,
>       biblionumber   => $item->biblionumber,
>@@ -340,7 +344,9 @@ subtest 'article request limit' => sub {
>     }
>   )->store();
> 
>-  is($patron->can_request_article, 0, 'Patron cannot request more articles');
>+  $article_request_4->updated_on(dt_from_string->add(days => -30))->store();
>+
>+  is($patron->can_request_article, 0, 'There is an old AR but not completed or cancelled, so patron cannot request more articles');
>   is($patron->article_requests->count, 3, 'There are 3 current article requests');
> 
> };
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27945: 123217 | 123218 | 123219 | 123220 | 123714 | 123715 | 123774 | 123775 | 123776 | 123777 | 123778 | 123820 | 124066 | 124067 | 124068 | 124069 | 124070 | 124071 | 124072 | 124073 | 124074 | 124075 | 124076 | 124077 | 124078 | 124079 | 124284 | 124285 | 124633 | 124673 | 124674 | 124675 | 124676 | 124677 | 124678 | 124679 | 124680 | 124681 | 124682 | 125140 | 125142 | 125143 | 125144 | 125145 | 125146 | 125147 | 125148 | 125149 | 125150 | 125151 | 125152 | 125178 | 125179 | 125569 | 125571 | 125638 | 125690 | 125702 | 125703 | 125704 | 125705 | 125706 | 125707 | 125726 | 125741 | 125761