@@ -, +, @@ misconfigured test plan --- t/db_dependent/www/auth_values_input_www.t | 16 +++++++++------- t/db_dependent/www/batch.t | 12 +++++++++--- t/db_dependent/www/history.t | 17 ++++++++++------- t/db_dependent/www/search_utf8.t | 7 +++++-- 4 files changed, 33 insertions(+), 19 deletions(-) --- a/t/db_dependent/www/auth_values_input_www.t +++ a/t/db_dependent/www/auth_values_input_www.t @@ -18,7 +18,7 @@ use Modern::Perl; use utf8; -use Test::More tests => 33; +use Test::More; #See plan tests => \d+ below use Test::WWW::Mechanize; use XML::Simple; use JSON; @@ -35,20 +35,22 @@ my $testdir = File::Spec->rel2abs( dirname(__FILE__) ); my $koha_conf = $ENV{KOHA_CONF}; my $xml = XMLin($koha_conf); +my $user = $ENV{KOHA_USER} || $xml->{config}->{user}; +my $password = $ENV{KOHA_PASS} || $xml->{config}->{pass}; +my $intranet = $ENV{KOHA_INTRANET_URL}; + eval{ use C4::Context; }; if ($@) { plan skip_all => "Tests skip. You must have a working Context\n"; } - -my $user = $ENV{KOHA_USER} || $xml->{config}->{user}; -my $password = $ENV{KOHA_PASS} || $xml->{config}->{pass}; -my $intranet = $ENV{KOHA_INTRANET_URL}; - -if (not defined $intranet) { +elsif (not defined $intranet) { plan skip_all => "Tests skip. You must set env. variable KOHA_INTRANET_URL to do tests\n"; } +else { + plan tests => 33; +} my $dbh = C4::Context->dbh; --- a/t/db_dependent/www/batch.t +++ a/t/db_dependent/www/batch.t @@ -20,7 +20,7 @@ use Modern::Perl; use utf8; -use Test::More tests => 26; +use Test::More; #See plan tests => \d+ below use Test::WWW::Mechanize; use XML::Simple; use JSON; @@ -46,10 +46,16 @@ my $user = $ENV{KOHA_USER} || $xml->{config}->{user}; my $password = $ENV{KOHA_PASS} || $xml->{config}->{pass}; my $intranet = $ENV{KOHA_INTRANET_URL}; -BAIL_OUT("You must set the environment variable KOHA_INTRANET_URL to ". +if (not defined $intranet) { + plan skip_all => + "You must set the environment variable KOHA_INTRANET_URL to ". "point this test to your staff client. If you do not have ". "KOHA_CONF set, you must also set KOHA_USER and KOHA_PASS for ". - "your username and password") unless $intranet; + "your username and password"; +} +else { + plan tests => 26; +} $intranet =~ s#/$##; --- a/t/db_dependent/www/history.t +++ a/t/db_dependent/www/history.t @@ -21,26 +21,29 @@ use utf8; use XML::Simple; use Encode; -use Test::More tests => 4; +use Test::More; #See plan tests => \d+ below use Test::WWW::Mechanize; my $koha_conf = $ENV{KOHA_CONF}; my $xml = XMLin($koha_conf); +my $user = $ENV{KOHA_USER} || $xml->{config}->{user}; +my $password = $ENV{KOHA_PASS} || $xml->{config}->{pass}; +my $intranet = $ENV{KOHA_INTRANET_URL}; + + eval{ use C4::Context; }; if ($@) { plan skip_all => "Tests skip. You must have a working Context\n"; } - -my $user = $ENV{KOHA_USER} || $xml->{config}->{user}; -my $password = $ENV{KOHA_PASS} || $xml->{config}->{pass}; -my $intranet = $ENV{KOHA_INTRANET_URL}; - -if (not defined $intranet) { +elsif (not defined $intranet) { plan skip_all => "Tests skip. You must set env. variable KOHA_INTRANET_URL to do tests\n"; } +else { + plan tests => 4; +} $intranet =~ s#/$##; --- a/t/db_dependent/www/search_utf8.t +++ a/t/db_dependent/www/search_utf8.t @@ -18,7 +18,7 @@ use Modern::Perl; use utf8; -use Test::More tests => 66; +use Test::More; #See plan tests => \d+ below use Test::WWW::Mechanize; use Data::Dumper; use XML::Simple; @@ -66,9 +66,12 @@ if ( not defined $intranet ) { plan skip_all => "Tests skip. You must set env. variable KOHA_INTRANET_URL to do tests\n"; } # test KOHA_OPAC_URL is set -if ( not defined $opac ) { +elsif ( not defined $opac ) { plan skip_all => "Tests skip. You must set env. variable KOHA_OPAC_URL to do tests\n"; } +else { + plan tests => 66; +} $intranet =~ s#/$##; $opac =~ s#/$##; --