From d37dee3ddf97a028cc42ef15fd9f938d9b7bd89a Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Fri, 12 Dec 2014 11:51:38 -0500 Subject: [PATCH] Bug 13451: Holidays.t assumes default data This patch removes that assumption by expressly setting data to be default. TEST PLAN --------- 1) Ensure that branch code is NOT 'MPL' in the repeatable_holidays table in your database. 2) Ensure that branch codes 'MPL' and 'CPL' do not exist in the branches table in your database. 3) prove t/db_dependent/Holidays.t -- this should bomb horribly. 4) Apply patch 5) prove t/db_dependent/Holidays.t -- all tests should succeed. 6) run koha qa tests Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Tests pass without holidays in the calendar. Signed-off-by: Tomas Cohen Arazi --- t/db_dependent/Holidays.t | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/t/db_dependent/Holidays.t b/t/db_dependent/Holidays.t index 75bbc1c941..dc7e5a67cf 100755 --- a/t/db_dependent/Holidays.t +++ b/t/db_dependent/Holidays.t @@ -7,6 +7,7 @@ use DateTime::TimeZone; use C4::Context; use Koha::DateUtils; use Test::More tests => 12; +use C4::Branch; BEGIN { use_ok('Koha::Calendar'); } BEGIN { use_ok('C4::Calendar'); } @@ -16,6 +17,38 @@ my $dbh = C4::Context->dbh(); $dbh->{AutoCommit} = 0; $dbh->{RaiseError} = 1; +# Add branches if they don't exist +if (not defined GetBranchDetail('CPL')) { + ModBranch({add => 1, branchcode => 'CPL', branchname => 'Centerville'}); +} +if (not defined GetBranchDetail('MPL')) { + ModBranch({add => 1, branchcode => 'MPL', branchname => 'Midway'}); +} + +# Make the repeatable_holidays table ONLY the default data. +$dbh->do("DELETE FROM repeatable_holidays"); +C4::Calendar->new( branchcode => 'MPL' )->insert_week_day_holiday( + weekday => 0, + title => '', + description => 'Sundays', +); +my $holiday2add = dt_from_string("2015-01-01"); +C4::Calendar->new( branchcode => 'MPL' )->insert_day_month_holiday( + day => $holiday2add->day(), + month => $holiday2add->month(), + year => $holiday2add->year(), + title => '', + description => "New Year's Day", +); +$holiday2add = dt_from_string("2014-12-25"); +C4::Calendar->new( branchcode => 'MPL' )->insert_day_month_holiday( + day => $holiday2add->day(), + month => $holiday2add->month(), + year => $holiday2add->year(), + title => '', + description => 'Christmas', +); + my $branchcode = 'MPL'; my $koha_calendar = Koha::Calendar->new( branchcode => $branchcode ); @@ -72,3 +105,5 @@ C4::Calendar->new( branchcode => 'CPL' )->insert_single_holiday( ); is( Koha::Calendar->new( branchcode => 'CPL' )->is_holiday( $today ), 1, "Today is a holiday for CPL" ); is( Koha::Calendar->new( branchcode => 'MPL' )->is_holiday( $today ), 0, "Today is not a holiday for MPL"); + +$dbh->rollback;