Bug 32426: (follow-up) Fix for Members.t / Patrons.t

Moving and adjusting test in Member.t.

Test plan:
Run both tests.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t
index e22c31f..afb0dcb 100755 (executable)
--- a/t/db_dependent/Koha/Patrons.t
+++ b/t/db_dependent/Koha/Patrons.t
@@ -1810,7 +1810,7 @@ subtest 'Test Koha::Patrons::merge' => sub {
 };
 
 subtest '->store' => sub {
-    plan tests => 9;
+    plan tests => 11;
     my $schema = Koha::Database->new->schema;
     $schema->storage->txn_begin;
 
@@ -1824,6 +1824,10 @@ subtest '->store' => sub {
     # Clear userid and check regeneration
     $patron_2->userid(undef)->store;
     like( $patron_2->userid, qr/\w+\.\w+/, 'Userid regenerated' ); # old school userid
+    $patron_2->userid('')->store;
+    like( $patron_2->userid, qr/\w+\.\w+/, 'Userid regenerated' ); # old school userid
+    $patron_2->userid(0)->store;
+    like( $patron_2->userid, qr/\w+\.\w+/, 'Userid regenerated' ); # old school userid
 
     # Test password
     t::lib::Mocks::mock_preference( 'RequireStrongPassword', 0 );

diff --git a/t/db_dependent/Members.t b/t/db_dependent/Members.t
index 3480d29..7d9852a 100755 (executable)
--- a/t/db_dependent/Members.t
+++ b/t/db_dependent/Members.t
@@ -17,7 +17,7 @@
 
 use Modern::Perl;
 
-use Test::More tests => 54;
+use Test::More tests => 53;
 use Test::MockModule;
 use Test::Exception;
 
@@ -154,28 +154,6 @@ is( $borrower->{debarred}, '2042-01-01', 'Koha::Patron->store should correctly s
 is( $borrower->{dateexpiry}, '9999-12-31', 'Koha::Patron->store should correctly set dateexpiry if a valid date is given');
 is( $borrower->{dateenrolled}, '2015-09-06', 'Koha::Patron->store should correctly set dateenrolled if a valid date is given');
 
-subtest 'Koha::Patron->store should not update userid if not true' => sub {
-    plan tests => 3;
-
-    # TODO Move this to t/db_dependent/Koha/Patrons.t subtest ->store
-
-    $data{ cardnumber } = "234567890";
-    $data{userid} = 'a_user_id';
-    $borrowernumber = Koha::Patron->new( \%data )->store->borrowernumber;
-    my $patron = Koha::Patrons->find( $borrowernumber );
-    my $borrower = $patron->unblessed;
-
-    $patron->set( { firstname => 'Tomas', userid => '' } )->store;
-    $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
-    is ( $borrower->{userid}, $data{userid}, 'Koha::Patron->store should not update the userid with an empty string' );
-    $patron->set( { firstname => 'Tomas', userid => 0 } )->store;
-    $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
-    is ( $borrower->{userid}, $data{userid}, 'Koha::Patron->store should not update the userid with an 0');
-    $patron->set( { firstname => 'Tomas', userid => undef } )->store;
-    $borrower = Koha::Patrons->find( $borrowernumber )->unblessed;
-    is ( $borrower->{userid}, $data{userid}, 'Koha::Patron->store should not update the userid with an undefined value');
-};
-
 #Regression tests for bug 10612
 my $library3 = $builder->build({
     source => 'Branch',