From ef51fdd426e664e33a2e5c2a9065c253b983c171 Mon Sep 17 00:00:00 2001 From: khenn Date: Fri, 30 Oct 2009 17:19:58 -0500 Subject: [PATCH] Fixes to tests suggested by Colin. Committing upgrade script --- docs/upgrades/upgrade_7.8.2-7.8.3.pl | 12 ++++++++++++ t/Asset/Wobject/EventManagementSystem.t | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/upgrades/upgrade_7.8.2-7.8.3.pl b/docs/upgrades/upgrade_7.8.2-7.8.3.pl index b0d402b9b..5eb1224eb 100644 --- a/docs/upgrades/upgrade_7.8.2-7.8.3.pl +++ b/docs/upgrades/upgrade_7.8.2-7.8.3.pl @@ -40,9 +40,21 @@ addTrashAdminSetting($session); addPickLanguageMacro($session); installSetLanguage($session); i18nAbleToBeFriend($session); +addEMSEnhancements($session); finish($session); # this line required +#---------------------------------------------------------------------------- +sub addEMSEnhancements { + my $session = shift; + print "\tAdding EMS Enhancements, if needed... \n" unless $quiet; + my $sth = $session->db->read('describe EventManagementSystem printRemainingTicketsTemplateId'); + if (! defined $sth->hashRef) { + $session->db->write("alter table EventManagementSystem add column printRemainingTicketsTemplateId char(22) not null default 'hreA_bgxiTX-EzWCSZCZJw' after printTicketTemplateId"); + } + print "Done.\n" unless $quiet; +} + #---------------------------------------------------------------------------- sub i18nAbleToBeFriend { my $session = shift; diff --git a/t/Asset/Wobject/EventManagementSystem.t b/t/Asset/Wobject/EventManagementSystem.t index f52a620bc..06f4bf3db 100644 --- a/t/Asset/Wobject/EventManagementSystem.t +++ b/t/Asset/Wobject/EventManagementSystem.t @@ -178,7 +178,7 @@ ok( $ems->can('www_printRemainingTickets'), 'Can call print remaining tickets' ) #Test that the default template is correct my $printRemainingTicketsTemplateId = $ems->get('printRemainingTicketsTemplateId'); -ok($printRemainingTicketsTemplateId eq "hreA_bgxiTX-EzWCSZCZJw", 'Default print remaining tickets template id ok'); +is($printRemainingTicketsTemplateId, "hreA_bgxiTX-EzWCSZCZJw", 'Default print remaining tickets template id ok'); #Make sure printRemainingTickets template returns the right data my $templateMock = Test::MockObject->new({});