Bugzilla – Attachment 51505 Details for
Bug 14874
Add ability to search for patrons by date of birth from checkout and patron quick searches
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14874 - (followup) Refactor t/db_dependent/Utils/Datatables_Members.t to use TestBuilder
Bug-14874---followup-Refactor-tdbdependentUtilsDat.patch (text/plain), 9.52 KB, created by
Nick Clemens (kidclamp)
on 2016-05-15 15:26:03 UTC
(
hide
)
Description:
Bug 14874 - (followup) Refactor t/db_dependent/Utils/Datatables_Members.t to use TestBuilder
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2016-05-15 15:26:03 UTC
Size:
9.52 KB
patch
obsolete
>From 5b71d1701ff94b56864039c43fb173187ed6d6fc Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Sun, 15 May 2016 11:20:04 -0400 >Subject: [PATCH] Bug 14874 - (followup) Refactor > t/db_dependent/Utils/Datatables_Members.t to use TestBuilder > >To test: >1 - Apply other patches (not this one) >2 - Prove t/db_dependent/Utils/Datatables_Members.t >3 - SHould pass >4 - Apply this patch >5 - prove t/db_dependent/Utils/Datatables_Members.t >6 - All tests should continue to pass >--- > t/db_dependent/Utils/Datatables_Members.t | 175 ++++++++++++++---------------- > 1 file changed, 79 insertions(+), 96 deletions(-) > >diff --git a/t/db_dependent/Utils/Datatables_Members.t b/t/db_dependent/Utils/Datatables_Members.t >index 494a73f..8aad1b7 100644 >--- a/t/db_dependent/Utils/Datatables_Members.t >+++ b/t/db_dependent/Utils/Datatables_Members.t >@@ -28,97 +28,80 @@ use C4::Members::AttributeTypes; > use Koha::Library; > > use t::lib::Mocks; >+use t::lib::TestBuilder; >+ >+use Koha::Database; > > use_ok( "C4::Utils::DataTables::Members" ); > >-my $dbh = C4::Context->dbh; >- >-# Start transaction >-$dbh->{AutoCommit} = 0; >-$dbh->{RaiseError} = 1; >- >-# Pick a categorycode from the DB >-my @categories = C4::Category->all; >-my $categorycode = $categories[0]->categorycode; >-# Add a new branch so we control what borrowers it has >-my $branchcode = "UNC"; >-my $branch_data = { >- branchcode => $branchcode, >- branchname => 'Universidad Nacional de Cordoba', >- branchaddress1 => 'Haya de la Torre', >- branchaddress2 => 'S/N', >- branchzip => '5000', >- branchcity => 'Cordoba', >- branchstate => 'Cordoba', >- branchcountry => 'Argentina' >-}; >-Koha::Library->new( $branch_data )->store; >- >-my %john_doe = ( >- cardnumber => '123456', >- firstname => 'John', >- surname => 'Doe', >- categorycode => $categorycode, >- branchcode => $branchcode, >- dateofbirth => '1983-03-01', >- dateexpiry => '9999-12-31', >- userid => 'john.doe' >-); >+my $schema = Koha::Database->new->schema; >+$schema->storage->txn_begin; > >-my %john_smith = ( >- cardnumber => '234567', >- firstname => 'John', >- surname => 'Smith', >- categorycode => $categorycode, >- branchcode => $branchcode, >- dateofbirth => '1982-02-01', >- dateexpiry => '9999-12-31', >- userid => 'john.smith' >-); >+my $builder = t::lib::TestBuilder->new; > >-my %jane_doe = ( >- cardnumber => '345678', >- firstname => 'Jane', >- surname => 'Doe', >- categorycode => $categorycode, >- branchcode => $branchcode, >- dateofbirth => '1983-03-01', >- dateexpiry => '9999-12-31', >- userid => 'jane.doe' >-); >+my $library = $builder->build({ >+ source => "Branch", >+}); > >-my %jeanpaul_dupont = ( >- cardnumber => '456789', >- firstname => 'Jean Paul', >- surname => 'Dupont', >- categorycode => $categorycode, >- branchcode => $branchcode, >- dateofbirth => '1982-02-01', >- dateexpiry => '9999-12-31', >- userid => 'jeanpaul.dupont' >-); >+my $branchcode=$library->{branchcode}; >+ >+my $john_doe = $builder->build({ >+ source => "Borrower", >+ value => { >+ cardnumber => '123456', >+ firstname => 'John', >+ surname => 'Doe', >+ branchcode => $branchcode, >+ dateofbirth => '1983-03-01', >+ userid => 'john.doe' >+ }, >+}); > >-my %dupont_brown = ( >- cardnumber => '567890', >- firstname => 'Dupont', >- surname => 'Brown', >- categorycode => $categorycode, >- branchcode => $branchcode, >- dateofbirth => '1979-01-01', >- dateexpiry => '9999-12-31', >- userid => 'dupont.brown' >-); >+my $john_smith = $builder->build({ >+ source => "Borrower", >+ value => { >+ cardnumber => '234567', >+ firstname => 'John', >+ surname => 'Smith', >+ branchcode => $branchcode, >+ dateofbirth => '1982-02-01', >+ userid => 'john.smith' >+ }, >+}); > >-$john_doe{borrowernumber} = AddMember( %john_doe ); >-warn "Error adding John Doe, check your tests" unless $john_doe{borrowernumber}; >-$john_smith{borrowernumber} = AddMember( %john_smith ); >-warn "Error adding John Smith, check your tests" unless $john_smith{borrowernumber}; >-$jane_doe{borrowernumber} = AddMember( %jane_doe ); >-warn "Error adding Jane Doe, check your tests" unless $jane_doe{borrowernumber}; >-$jeanpaul_dupont{borrowernumber} = AddMember( %jeanpaul_dupont ); >-warn "Error adding Jean Paul Dupont, check your tests" unless $jeanpaul_dupont{borrowernumber}; >-$dupont_brown{borrowernumber} = AddMember( %dupont_brown ); >-warn "Error adding Dupont Brown, check your tests" unless $dupont_brown{borrowernumber}; >+my $jane_doe = $builder->build({ >+ source => "Borrower", >+ value => { >+ cardnumber => '345678', >+ firstname => 'Jane', >+ surname => 'Doe', >+ branchcode => $branchcode, >+ dateofbirth => '1983-03-01', >+ userid => 'jane.doe' >+ }, >+}); >+my $jeanpaul_dupont = $builder->build({ >+ source => "Borrower", >+ value => { >+ cardnumber => '456789', >+ firstname => 'Jean Paul', >+ surname => 'Dupont', >+ branchcode => $branchcode, >+ dateofbirth => '1982-02-01', >+ userid => 'jeanpaul.dupont' >+ }, >+}); >+my $dupont_brown = $builder->build({ >+ source => "Borrower", >+ value => { >+ cardnumber => '567890', >+ firstname => 'Dupont', >+ surname => 'Brown', >+ branchcode => $branchcode, >+ dateofbirth => '1979-01-01', >+ userid => 'dupont.brown' >+ }, >+}); > > # Set common datatables params > my %dt_params = ( >@@ -138,7 +121,7 @@ my $search_results = C4::Utils::DataTables::Members::search({ > is( $search_results->{ iTotalDisplayRecords }, 1, > "John Doe has only one match on $branchcode (Bug 12595)"); > >-ok( $search_results->{ patrons }[0]->{ cardnumber } eq $john_doe{ cardnumber } >+ok( $search_results->{ patrons }[0]->{ cardnumber } eq $john_doe->{ cardnumber } > && ! $search_results->{ patrons }[1], > "John Doe is the only match (Bug 12595)"); > >@@ -155,7 +138,7 @@ is( $search_results->{ iTotalDisplayRecords }, 1, > "Jane Doe has only one match on $branchcode (Bug 12595)"); > > is( $search_results->{ patrons }[0]->{ cardnumber }, >- $jane_doe{ cardnumber }, >+ $jane_doe->{ cardnumber }, > "Jane Doe is the only match (Bug 12595)"); > > # Search "John" >@@ -171,11 +154,11 @@ is( $search_results->{ iTotalDisplayRecords }, 2, > "There are two John at $branchcode"); > > is( $search_results->{ patrons }[0]->{ cardnumber }, >- $john_doe{ cardnumber }, >+ $john_doe->{ cardnumber }, > "John Doe is the first result"); > > is( $search_results->{ patrons }[1]->{ cardnumber }, >- $john_smith{ cardnumber }, >+ $john_smith->{ cardnumber }, > "John Smith is the second result"); > > # Search "Doe" >@@ -191,11 +174,11 @@ is( $search_results->{ iTotalDisplayRecords }, 2, > "There are two Doe at $branchcode"); > > is( $search_results->{ patrons }[0]->{ cardnumber }, >- $john_doe{ cardnumber }, >+ $john_doe->{ cardnumber }, > "John Doe is the first result"); > > is( $search_results->{ patrons }[1]->{ cardnumber }, >- $jane_doe{ cardnumber }, >+ $jane_doe->{ cardnumber }, > "Jane Doe is the second result"); > > # Search "Smith" as surname - there is only one occurrence of Smith >@@ -211,7 +194,7 @@ is( $search_results->{ iTotalDisplayRecords }, 1, > "There is one Smith at $branchcode when searching for surname"); > > is( $search_results->{ patrons }[0]->{ cardnumber }, >- $john_smith{ cardnumber }, >+ $john_smith->{ cardnumber }, > "John Smith is the first result"); > > # Search "Dupont" as surname - Dupont is used both as firstname and surname, we >@@ -228,7 +211,7 @@ is( $search_results->{ iTotalDisplayRecords }, 1, > "There is one Dupont at $branchcode when searching for surname"); > > is( $search_results->{ patrons }[0]->{ cardnumber }, >- $jeanpaul_dupont{ cardnumber }, >+ $jeanpaul_dupont->{ cardnumber }, > "Jean Paul Dupont is the first result"); > > # Search "Doe" as surname - Doe is used twice as surname >@@ -244,11 +227,11 @@ is( $search_results->{ iTotalDisplayRecords }, 2, > "There are two Doe at $branchcode when searching for surname"); > > is( $search_results->{ patrons }[0]->{ cardnumber }, >- $john_doe{ cardnumber }, >+ $john_doe->{ cardnumber }, > "John Doe is the first result"); > > is( $search_results->{ patrons }[1]->{ cardnumber }, >- $jane_doe{ cardnumber }, >+ $jane_doe->{ cardnumber }, > "Jane Doe is the second result"); > > # Search by userid >@@ -291,10 +274,10 @@ $attribute_type->store; > > > C4::Members::Attributes::SetBorrowerAttributes( >- $john_doe{borrowernumber}, [ { code => $attribute_type->{code}, value => 'the default value for a common user' } ] >+ $john_doe->{borrowernumber}, [ { code => $attribute_type->{code}, value => 'the default value for a common user' } ] > ); > C4::Members::Attributes::SetBorrowerAttributes( >- $jane_doe{borrowernumber}, [ { code => $attribute_type->{code}, value => 'the default value for another common user' } ] >+ $jane_doe->{borrowernumber}, [ { code => $attribute_type->{code}, value => 'the default value for another common user' } ] > ); > > t::lib::Mocks::mock_preference('ExtendedPatronAttributes', 1); >@@ -428,6 +411,6 @@ foreach my $dateformloo (@datetimeprefs){ > } > > # End >-$dbh->rollback; >+$schema->storage->txn_rollback; > > 1; >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14874
:
51503
|
51504
|
51505
|
51652
|
51653
|
51654
|
51971
|
51972
|
52079
|
52998
|
52999
|
53000
|
53001
|
55589
|
55899
|
55912
|
55913
|
55919
|
55920
|
56027
|
56028
|
57009