WebGUI now needs Test::Harness 3.17 or higher for the Survey. Fixes bug #11402.

This commit is contained in:
Colin Kuskie 2010-03-02 13:58:34 -08:00
parent 119d5137e2
commit 8128f54943
4 changed files with 11 additions and 25 deletions

View file

@ -6,6 +6,7 @@
- fixed #11449: List of macros in my config file has HASH(0x45223ab3) entry - fixed #11449: List of macros in my config file has HASH(0x45223ab3) entry
- fixed #11443: no language switch in rich edit - fixed #11443: no language switch in rich edit
- fixed #11450: How to lock yourself out of your WebGUI site... - fixed #11450: How to lock yourself out of your WebGUI site...
- fixed #11402: Survey TAP module requirements
7.8.13 7.8.13
- fixed #11418: confusing typ-o in gotcha - fixed #11418: confusing typ-o in gotcha

View file

@ -7,6 +7,11 @@ upgrading from one version to the next, or even between multiple
versions. Be sure to heed the warnings contained herein as they will versions. Be sure to heed the warnings contained herein as they will
save you many hours of grief. save you many hours of grief.
7.9.0
--------------------------------------------------------------------
* WebGUI new requires Test::Harness 3.17 or higher to enable the testing functions
the Survey.
7.8.13 7.8.13
-------------------------------------------------------------------- --------------------------------------------------------------------
* A new gotcha was not documented in the 7.8.11 release, the new required version * A new gotcha was not documented in the 7.8.11 release, the new required version

View file

@ -27,11 +27,6 @@ use Params::Validate qw(:all);
use WebGUI::Macro; use WebGUI::Macro;
Params::Validate::validation_options( on_fail => sub { WebGUI::Error::InvalidParam->throw( error => shift ) } ); Params::Validate::validation_options( on_fail => sub { WebGUI::Error::InvalidParam->throw( error => shift ) } );
my $TAP_PARSER_MISSING = <<END_WARN;
The Survey Test Suite feature requires TAP::Parser and TAP::Parser::Aggregator CPAN modules.
These will be installed as a dependency if you upgrade to Test::Harness 3.x
END_WARN
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 definition ( session, [definition] ) =head2 definition ( session, [definition] )
@ -2947,11 +2942,7 @@ sub www_runTest {
my $i18n = WebGUI::International->new($session, 'Asset_Survey'); my $i18n = WebGUI::International->new($session, 'Asset_Survey');
my $ac = $self->getAdminConsole; my $ac = $self->getAdminConsole;
eval { require TAP::Parser }; require TAP::Parser;
if ($@) {
$self->session->log->warn($TAP_PARSER_MISSING);
return $ac->render($TAP_PARSER_MISSING, $i18n->get('test results'));
}
my $testId = $session->form->get("testId"); my $testId = $session->form->get("testId");
@ -2983,11 +2974,7 @@ all interesting TAP::Parser and TAP::Parser::Result properties) and the template
sub parseTap { sub parseTap {
my ($self, $tap) = @_; my ($self, $tap) = @_;
eval { require TAP::Parser }; require TAP::Parser;
if ($@) {
$self->session->log->warn($TAP_PARSER_MISSING);
return;
}
my $parser = TAP::Parser->new( { tap => $tap } ); my $parser = TAP::Parser->new( { tap => $tap } );
# Expose TAP::Parser and TAP::Parser::Result info as template variables # Expose TAP::Parser and TAP::Parser::Result info as template variables
@ -3082,16 +3069,8 @@ sub www_runTests {
my @parsers; my @parsers;
eval { require TAP::Parser }; require TAP::Parser;
if ($@) { require TAP::Parser::Aggregator;
$self->session->log->warn($TAP_PARSER_MISSING);
return $ac->render($TAP_PARSER_MISSING, $i18n->get('test results'));
}
eval { require TAP::Parser::Aggregator };
if ($@) {
$self->session->log->warn($TAP_PARSER_MISSING);
return $ac->render($TAP_PARSER_MISSING, $i18n->get('test results'));
}
my $aggregate = TAP::Parser::Aggregator->new; my $aggregate = TAP::Parser::Aggregator->new;
$aggregate->start; $aggregate->start;

View file

@ -137,6 +137,7 @@ checkModule("JavaScript::Minifier::XS", "0.05" );
checkModule("Readonly", "1.03" ); checkModule("Readonly", "1.03" );
checkModule("Business::PayPal::API", "0.62" ); checkModule("Business::PayPal::API", "0.62" );
checkModule("Locales", "0.10" ); checkModule("Locales", "0.10" );
checkModule("Test::Harness", "3.17" );
failAndExit("Required modules are missing, running no more checks.") if $missingModule; failAndExit("Required modules are missing, running no more checks.") if $missingModule;