From 441585a6cc402340977948338dddc6090c1b541f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 14 Dec 2017 16:01:33 -0300 Subject: [PATCH] Bug 19776: (follow-up) remove dup category_type keys The previous patch was obviously wrong, the category_type key appeared twice. categories.category_type is a varchar(1) and 'P' is not 'X'. Signed-off-by: Jonathan Druart --- t/db_dependent/Circulation.t | 2 +- t/db_dependent/Circulation/MarkIssueReturned.t | 2 +- t/db_dependent/Circulation/NoIssuesChargeGuarantees.t | 2 +- t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 2 +- t/db_dependent/Circulation/dateexpiry.t | 2 +- t/db_dependent/DecreaseLoanHighHolds.t | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index 1eb4fbc29a..4da9557c81 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -63,7 +63,7 @@ my $itemtype = $builder->build( value => { notforloan => undef, rentalcharge => 0, defaultreplacecost => undef, processfee => undef } } )->{itemtype}; -my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'NOT_X', category_type => 'P', enrolmentfee => 0 } }); +my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'P', enrolmentfee => 0 } }); my $CircControl = C4::Context->preference('CircControl'); my $HomeOrHoldingBranch = C4::Context->preference('HomeOrHoldingBranch'); diff --git a/t/db_dependent/Circulation/MarkIssueReturned.t b/t/db_dependent/Circulation/MarkIssueReturned.t index f13ba74ed4..d23290b7ef 100644 --- a/t/db_dependent/Circulation/MarkIssueReturned.t +++ b/t/db_dependent/Circulation/MarkIssueReturned.t @@ -39,7 +39,7 @@ my $library = $builder->build({ source => 'Branch' }); C4::Context->_new_userenv('xxx'); C4::Context->set_userenv(0,0,0,'firstname','surname', $library->{branchcode}, $library->{branchname}, '', '', ''); -my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'NOT_X', category_type => 'P', enrolmentfee => 0 } }); +my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'P', enrolmentfee => 0 } }); my $patron = $builder->build({ source => 'Borrower', value => { branchcode => $library->{branchcode}, categorycode => $patron_category->{categorycode} } } ); my $biblioitem = $builder->build( { source => 'Biblioitem' } ); diff --git a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t index 7551004360..0fe338b2de 100644 --- a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t +++ b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t @@ -42,7 +42,7 @@ my $item = $builder->build( } ); -my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'NOT_X', category_type => 'P', enrolmentfee => 0 } }); +my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'P', enrolmentfee => 0 } }); my $patron = $builder->build( { source => 'Borrower', diff --git a/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t b/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t index cdd8ad48fd..1cb1a65d1d 100644 --- a/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t +++ b/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t @@ -50,7 +50,7 @@ my $branch = $builder->build({ source => 'Branch', }); -my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'NOT_X', category_type => 'P', enrolmentfee => 0 } }); +my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'P', enrolmentfee => 0 } }); my $patron = $builder->build({ source => 'Borrower', value => { diff --git a/t/db_dependent/Circulation/dateexpiry.t b/t/db_dependent/Circulation/dateexpiry.t index c01d9aa333..97e22a8a5d 100644 --- a/t/db_dependent/Circulation/dateexpiry.t +++ b/t/db_dependent/Circulation/dateexpiry.t @@ -34,7 +34,7 @@ my $builder = t::lib::TestBuilder->new(); $ENV{ DEBUG } = 0; -my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'NOT_X', category_type => 'P', enrolmentfee => 0 } }); +my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'P', enrolmentfee => 0 } }); subtest 'Tests for CanBookBeIssued related to dateexpiry' => sub { plan tests => 4; diff --git a/t/db_dependent/DecreaseLoanHighHolds.t b/t/db_dependent/DecreaseLoanHighHolds.t index 52cd536061..8ebe0cab8f 100755 --- a/t/db_dependent/DecreaseLoanHighHolds.t +++ b/t/db_dependent/DecreaseLoanHighHolds.t @@ -51,7 +51,7 @@ C4::Context->_new_userenv('xxx'); C4::Context->set_userenv( 0, 0, 0, 'firstname', 'surname', $library->{branchcode}, 'Midway Public Library', '', '', '' ); is( C4::Context->userenv->{branch}, $library->{branchcode}, 'userenv set' ); -my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'NOT_X', category_type => 'P', enrolmentfee => 0 } }); +my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'P', enrolmentfee => 0 } }); my @patrons; for my $i ( 1 .. 20 ) { my $patron = Koha::Patron->new( -- 2.11.0