Attachment 113253 Details for Bug 24786 – Bug 24786: (QA follow-up) Ensure tests pass with existing data

[patch] Bug 24786: (QA follow-up) Ensure tests pass with existing data

Bug-24786-QA-follow-up-Ensure-tests-pass-with-exis.patch (text/plain), 3.23 KB, created by Martin Renvoize (ashimema) on 2020-11-06 14:44:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-11-06 14:44:30 UTC

Size: 3.23 KB

patch

obsolete

>From bd3273cfbc785fe1b729197303703cf43ccafdef Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 6 Nov 2020 14:42:42 +0000
>Subject: [PATCH] Bug 24786: (QA follow-up) Ensure tests pass with existing
> data
>
>The tests for Koha::Template::Plugin::Registers assumed that no
>registers were pre-set in the database. This patch updates the test to
>ignore pre-existing data or take it into account in totals.
>---
> .../Koha/Template/Plugin/Registers.t          | 20 ++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
>diff --git a/t/db_dependent/Koha/Template/Plugin/Registers.t b/t/db_dependent/Koha/Template/Plugin/Registers.t
>index 7bc36e47d9..912e5b85f8 100755
>--- a/t/db_dependent/Koha/Template/Plugin/Registers.t
>+++ b/t/db_dependent/Koha/Template/Plugin/Registers.t
>@@ -70,6 +70,11 @@ subtest 'all() tests' => sub {
> 
>     $schema->storage->txn_begin;
> 
>+    my $count = Koha::Cash::Registers->search({ archived => 0 })->count;
>+    my $max_register = Koha::Cash::Registers->search( {},
>+        { order_by => { '-desc' => 'id' }, rows => 1 } )->single;
>+    my $max_id = $max_register ? $max_register->id : 0;
>+
>     my $library1 = $builder->build_object(
>         {
>             class => 'Koha::Libraries'
>@@ -80,7 +85,8 @@ subtest 'all() tests' => sub {
>             class => 'Koha::Cash::Registers',
>             value => {
>                 branch         => $library1->branchcode,
>-                branch_default => 0
>+                branch_default => 0,
>+                archived       => 0
>             }
>         }
>     );
>@@ -89,7 +95,8 @@ subtest 'all() tests' => sub {
>             class => 'Koha::Cash::Registers',
>             value => {
>                 branch         => $library1->branchcode,
>-                branch_default => 1
>+                branch_default => 1,
>+                archived       => 0
>             }
>         }
>     );
>@@ -103,7 +110,8 @@ subtest 'all() tests' => sub {
>         {
>             class => 'Koha::Cash::Registers',
>             value => {
>-                branch => $library2->branchcode
>+                branch => $library2->branchcode,
>+                archived       => 0
>             }
>         }
>     );
>@@ -114,8 +122,9 @@ subtest 'all() tests' => sub {
>     my $result = $plugin->all;
>     is( ref($result), 'ARRAY', "Return arrayref (no userenv, no filters)" );
>     is( scalar( @{$result} ),
>-        3, "Array contains all 3 registers (no userenv, no filters)" );
>+        3 + $count, "Array contains all test registers (no userenv, no filters)" );
>     for my $register ( @{$result} ) {
>+        next if $register->{id} <= $max_id;
>         is( $register->{selected}, 0, "Register is not selected (no userenv)" );
>     }
> 
>@@ -128,8 +137,9 @@ subtest 'all() tests' => sub {
>     is( ref($result), 'ARRAY',
>         "Return arrayref (userenv: branchcode, no filters)" );
>     is( scalar( @{$result} ),
>-        3, "Array contains all 3 registers (userenv: branchcode, no filters)" );
>+        3 + $count, "Array contains all test registers (userenv: branchcode, no filters)" );
>     for my $register ( @{$result} ) {
>+        next if $register->{id} <= $max_id;
>         is( $register->{selected}, 0,
>             "Register is not selected (userenv: branchcode, no filters)" );
>     }
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24786: 107145 | 107146 | 107147 | 107148 | 107149 | 107739 | 107740 | 107741 | 107742 | 107743 | 107754 | 107755 | 107756 | 107757 | 107758 | 107759 | 107957 | 107958 | 107959 | 107960 | 107961 | 107962 | 108060 | 108061 | 108062 | 108063 | 108064 | 108065 | 108066 | 108510 | 108511 | 108512 | 108513 | 108514 | 108515 | 108516 | 110162 | 110163 | 110164 | 110165 | 110166 | 110167 | 110168 | 110187 | 110188 | 110189 | 110190 | 110191 | 110192 | 110193 | 111066 | 111067 | 111068 | 111069 | 111070 | 111071 | 111072 | 111074 | 111126 | 111127 | 111128 | 111129 | 111130 | 111131 | 111132 | 111133 | 111220 | 111221 | 111222 | 111223 | 111224 | 111225 | 111226 | 111227 | 111228 | 111229 | 111230 | 111231 | 111232 | 111233 | 111234 | 111235 | 111611 | 111612 | 111613 | 111614 | 111615 | 111616 | 111617 | 111618 | 111619 | 111620 | 111623 | 111725 | 111757 | 111758 | 111759 | 111760 | 111761 | 111762 | 111763 | 111764 | 111765 | 111766 | 111767 | 111768 | 111769 | 111770 | 111776 | 111777 | 111778 | 111779 | 111780 | 111781 | 111782 | 111783 | 111784 | 111785 | 111786 | 111787 | 111788 | 112985 | 112988 | 112989 | 113226 | 113227 | 113241 | 113251 | 113253 | 113256 | 113257 | 113260