X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2Fdb_dependent%2FMembers.t;h=6904190bc92c53e9201e7c99fb27a30a606a95d4;hb=f4251e85facb4e8597b2879dea1ea02e21d6a763;hp=b09d8871178ec547cbabdd588b47ee8c0c948a2e;hpb=16f1fffdd1f5d1c97db0bf664f83496864b7e24d;p=koha.git

diff --git a/t/db_dependent/Members.t b/t/db_dependent/Members.t
index b09d887117..6904190bc9 100755
--- a/t/db_dependent/Members.t
+++ b/t/db_dependent/Members.t
@@ -6,7 +6,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 20;
+use Test::More tests => 23;
 use Data::Dumper;
 
 BEGIN {
@@ -18,17 +18,18 @@ my $CARDNUMBER   = 'TESTCARD01';
 my $FIRSTNAME    = 'Marie';
 my $SURNAME      = 'Mcknight';
 my $CATEGORYCODE = 'S';
-my $BRANCHCODE   = 's';
+my $BRANCHCODE   = 'CPL';
 
 my $CHANGED_FIRSTNAME = "Marry Ann";
 my $EMAIL             = "Marie\@email.com";
+my $EMAILPRO          = "Marie\@work.com";
 my $ETHNICITY         = "German";
 my $PHONE             = "555-12123";
 
 # XXX should be randomised and checked against the database
 my $IMPOSSIBLE_CARDNUMBER = "XYZZZ999";
 
-my $INDEPENDENT_BRANCHES_PREF = 'IndependantBranches';
+my $INDEPENDENT_BRANCHES_PREF = 'IndependentBranches';
 
 # XXX make a non-commit transaction and rollback rather than insert/delete
 
@@ -43,7 +44,7 @@ my @USERENV = (
     'Test',
     0,
 );
-my $BRANCH_IDX = 5;
+my $BRANCH_IDX = 4;
 
 C4::Context->_new_userenv ('DUMMY_SESSION_ID');
 C4::Context->set_userenv ( @USERENV );
@@ -58,6 +59,7 @@ my %data = (
     surname => $SURNAME,
     categorycode => $CATEGORYCODE,
     branchcode => $BRANCHCODE,
+    dateofbirth => ''
 );
 
 my $addmem=AddMember(%data);
@@ -73,16 +75,20 @@ ok ( $member->{firstname}    eq $FIRSTNAME    &&
      , "Got member")
   or diag("Mismatching member details: ".Dumper(\%data, $member));
 
+is($member->{dateofbirth}, undef, "Empty dates handled correctly");
+
 $member->{firstname} = $CHANGED_FIRSTNAME;
 $member->{email}     = $EMAIL;
 $member->{ethnicity} = $ETHNICITY;
 $member->{phone}     = $PHONE;
+$member->{emailpro}  = $EMAILPRO;
 ModMember(%$member);
 my $changedmember=GetMemberDetails("",$CARDNUMBER);
 ok ( $changedmember->{firstname} eq $CHANGED_FIRSTNAME &&
      $changedmember->{email}     eq $EMAIL             &&
      $changedmember->{ethnicity} eq $ETHNICITY         &&
-     $changedmember->{phone}     eq $PHONE
+     $changedmember->{phone}     eq $PHONE             &&
+     $changedmember->{emailpro}  eq $EMAILPRO
      , "Member Changed")
   or diag("Mismatching member details: ".Dumper($member, $changedmember));
 
@@ -154,6 +160,19 @@ is ($age, "18", "Age correct");
 $age=GetAge("2011-01-19", "1992-01-19");
 is ($age, "-19", "Birthday In the Future");
 
+C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'OFF' );
+C4::Context->clear_syspref_cache();
+
+my $notice_email = GetNoticeEmailAddress($member->{'borrowernumber'});
+is ($notice_email, $EMAIL, "GetNoticeEmailAddress returns correct value when AutoEmailPrimaryAddress is off");
+
+C4::Context->set_preference( 'AutoEmailPrimaryAddress', 'emailpro' );
+C4::Context->clear_syspref_cache();
+
+$notice_email = GetNoticeEmailAddress($member->{'borrowernumber'});
+is ($notice_email, $EMAILPRO, "GetNoticeEmailAddress returns correct value when AutoEmailPrimaryAddress is emailpro");
+
+
 # clean up 
 DelMember($member->{borrowernumber});
 $results = Search($CARDNUMBER,undef,undef,undef,["cardnumber"]);