Bug 18182: [QA Follow-up] Fix a few typos, consistent rollback

Since we here only use one rollback and this test does not care, it is
more consistent to keep that pattern.
Additionally, promoting two globals to our.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Marcel de Rooy 2017-03-31 13:32:55 +02:00 committed by Kyle M Hall
parent e2d14666d9
commit 5841aeb8f2
1 changed files with 5 additions and 10 deletions

View File

@ -30,9 +30,9 @@ BEGIN {
use_ok('t::lib::TestBuilder');
}
my $schema = Koha::Database->new->schema;
our $schema = Koha::Database->new->schema;
$schema->storage->txn_begin;
my $builder;
our $builder;
subtest 'Start with some trivial tests' => sub {
@ -344,14 +344,10 @@ subtest 'Default values' => sub {
is( $item->{more_subfields_xml}, 'some xml', 'Default should not overwrite assigned value' );
};
$schema->storage->txn_rollback;
subtest 'build_object() tests' => sub {
plan tests => 5;
$schema->storage->txn_begin;
$builder = t::lib::TestBuilder->new();
my $categorycode = $builder->build( { source => 'Category' } )->{categorycode};
@ -368,8 +364,8 @@ subtest 'build_object() tests' => sub {
is( ref($issuing_rule), 'Koha::IssuingRule', 'Type is correct' );
is( $issuing_rule->categorycode,
$categorycode, 'Firstname correctly set' );
is( $issuing_rule->itemtype, $itemtype, 'Firstname correctly set' );
$categorycode, 'Category code correctly set' );
is( $issuing_rule->itemtype, $itemtype, 'Item type correctly set' );
warning_is { $issuing_rule = $builder->build_object( {} ); }
{ carped => 'Missing class param' },
@ -377,7 +373,6 @@ subtest 'build_object() tests' => sub {
is( $issuing_rule, undef,
'If the class parameter is missing, undef is returned' );
$schema->storage->txn_rollback;
};
1;
$schema->storage->txn_rollback;