Merge remote-tracking branch 'origin/new/bug_929'

[koha_fer] / C4 / SIP / t / 06patron_enable.t

diff --git a/C4/SIP/t/06patron_enable.t b/C4/SIP/t/06patron_enable.t
index 56486c0..065727d 100644 (file)
--- a/C4/SIP/t/06patron_enable.t
+++ b/C4/SIP/t/06patron_enable.t
@@ -7,21 +7,21 @@ use Clone qw(clone);
 
 use Sip::Constants qw(:all);
 
-use SIPtest qw($datepat $textpat);
+use SIPtest qw(:basic :user1);
 
 my $patron_enable_test_template = {
     id => 'Patron Enable: valid patron',
-    msg => "2520060102    084238AOUWOLS|AAdjfiander|",
+    msg => "2520060102    084238AOUWOLS|AA$user_barcode|",
     pat => qr/^26 {4}[ Y]{10}000$datepat/,
     fields => [
               $SIPtest::field_specs{(FID_INST_ID)},
               $SIPtest::field_specs{(FID_SCREEN_MSG)},
               $SIPtest::field_specs{(FID_PRINT_LINE)},
               { field    => FID_PATRON_ID,
-                pat      => qr/^djfiander$/,
+                pat      => qr/^$user_barcode$/,
                 required => 1, },
               { field    => FID_PERSONAL_NAME,
-                pat      => qr/^David J\. Fiander$/,
+                pat      => qr/^$user_fullname$/,
                 required => 1, },
               { field    => FID_VALID_PATRON,
                 pat      => qr/^Y$/,
@@ -33,16 +33,16 @@ my $patron_enable_test_template = {
 # ensure that he was properly enabled.
 my $patron_disable_test_template = {
     id => 'Patron Enable: block patron (prep to test enabling)',
-    msg => "01N20060102    084238AOUWOLS|ALHe's a jerk|AAdjfiander|",
+    msg => "01N20060102    084238AO$instid|ALBlocked patron for SIP test.|AA$user_barcode|",
     # response to block patron is a patron status message
     pat => qr/^24Y{4}[ Y]{10}000$datepat/,
     fields => [
               $SIPtest::field_specs{(FID_INST_ID)},
               { field    => FID_PATRON_ID,
-                pat      => qr/^djfiander$/,
+                pat      => qr/^$user_barcode$/,
                 required => 1, },
               { field    => FID_PERSONAL_NAME,
-                pat      => qr/^David J\. Fiander$/,
+                pat      => qr/^$user_fullname$/,
                 required => 1, },
               { field    => FID_VALID_PATRON,
                 pat      => qr/^Y$/,
@@ -62,7 +62,7 @@ my $test;
 # Valid patron, valid password
 $test = clone($patron_enable_test_template);
 $test->{id} = "Patron Enable: valid patron, valid password";
-$test->{msg} .= FID_PATRON_PWD . '6789|';
+$test->{msg} .= FID_PATRON_PWD . "$user_pin|";
 $test->{pat} = qr/^26 {4}[ Y]{10}000$datepat/;
 delete $test->{fields};
 $test->{fields} = [
@@ -70,10 +70,10 @@ $test->{fields} = [
                   $SIPtest::field_specs{(FID_SCREEN_MSG)},
                   $SIPtest::field_specs{(FID_PRINT_LINE)},
                   { field    => FID_PATRON_ID,
-                    pat      => qr/^djfiander$/,
+                    pat      => qr/^$user_barcode$/,
                     required => 1, },
                   { field    => FID_PERSONAL_NAME,
-                    pat      => qr/^David J\. Fiander$/,
+                    pat      => qr/^$user_fullname$/,
                     required => 1, },
                   { field    => FID_VALID_PATRON,
                     pat      => qr/^Y$/,
@@ -97,10 +97,10 @@ $test->{fields} = [
                   $SIPtest::field_specs{(FID_SCREEN_MSG)},
                   $SIPtest::field_specs{(FID_PRINT_LINE)},
                   { field    => FID_PATRON_ID,
-                    pat      => qr/^djfiander$/,
+                    pat      => qr/^$user_barcode$/,
                     required => 1, },
                   { field    => FID_PERSONAL_NAME,
-                    pat      => qr/^David J\. Fiander$/,
+                    pat      => qr/^$user_fullname$/,
                     required => 1, },
                   { field    => FID_VALID_PATRON,
                     pat      => qr/^Y$/,
@@ -118,7 +118,7 @@ push @tests, $patron_enable_test_template;
 # Invalid patron
 $test = clone($patron_enable_test_template);
 $test->{id} =~ s/valid/invalid/;
-$test->{msg} =~ s/AAdjfiander\|/AAberick|/;
+$test->{msg} =~ s/AA$user_barcode\|/AAbad_barcode|/;
 $test->{pat} =  qr/^26Y{4}[ Y]{10}000$datepat/;
 delete $test->{fields};
 $test->{fields} = [
@@ -126,7 +126,7 @@ $test->{fields} = [
                   $SIPtest::field_specs{(FID_SCREEN_MSG)},
                   $SIPtest::field_specs{(FID_PRINT_LINE)},
                   { field    => FID_PATRON_ID,
-                    pat      => qr/^berick$/,
+                    pat      => qr/^bad_barcode$/,
                     required => 1, },
                   { field    => FID_PERSONAL_NAME,
                     pat      => qr/^$/,