From 7431adb972c226c3908dbb93b8a89c71ecbb5fb2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 20 Oct 2015 14:10:18 +0100 Subject: [PATCH] Bug 14778: Install fixtures for t/Members_AttributeTypes.t --- t/Members_AttributeTypes.t | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/t/Members_AttributeTypes.t b/t/Members_AttributeTypes.t index 152fc53..055e767 100755 --- a/t/Members_AttributeTypes.t +++ b/t/Members_AttributeTypes.t @@ -2,40 +2,43 @@ # # Tests 'fetch', 'fake db data', and 'checks for existant attributes' -use strict; -use warnings; +use Modern::Perl; use Test::MockModule; -use Test::More tests => 9; +use Test::More tests => 10; BEGIN { use_ok('C4::Members::AttributeTypes'); } -my $module = new Test::MockModule('C4::Context'); -$module->mock( - '_new_dbh', - sub { - my $dbh = DBI->connect( 'DBI:Mock:', '', '' ) - || die "Cannot create handle: $DBI::errstr\n"; - return $dbh; - } -); -my $members_attributetypes = [ +use Test::DBIx::Class { + schema_class => 'Koha::Schema', + connect_info => ['dbi:SQLite:dbname=:memory:','',''], + connect_opts => { name_sep => '.', quote_char => '`', }, + fixture_class => '::Populate', +}, 'BorrowerAttributeType', 'Category' ; + +fixtures_ok [ + Category => [ + ['categorycode'], + ['orange'], ['yellow'], + ], + BorrowerAttributeType => [ [ 'code', 'description', 'repeatable', 'unique_id', 'opac_display', 'password_allowed', 'staff_searchable', 'authorised_value_category', - 'display_checkout', 'catagory_code', + 'display_checkout', 'category_code', 'class' ], [ 'one', 'ISBN', '1', '1', '1', '1', '1', 'red', '1', 'orange', 'green' ], [ 'two', 'ISSN', '0', '0', '0', '0', '0', 'blue', '0', 'yellow', 'silver' ] -]; -my $dbh = C4::Context->dbh(); + ], +], 'add fixtures'; -$dbh->{mock_add_resultset} = $members_attributetypes; +my $db = Test::MockModule->new('Koha::Database'); +$db->mock( _new_schema => sub { return Schema(); } ); my @members_attributetypes = C4::Members::AttributeTypes::GetAttributeTypes(undef, 1); @@ -49,8 +52,6 @@ is( $members_attributetypes[0]->{'class'}, is( $members_attributetypes[1]->{'class'}, 'silver', 'Second class value is silver' ); -$dbh->{mock_add_resultset} = $members_attributetypes; - ok( C4::Members::AttributeTypes::AttributeTypeExists('one'), 'checking an attribute type exists' ); @@ -59,9 +60,7 @@ ok( "checking a attribute that isn't in the code doesn't exist" ); -$dbh->{mock_add_resultset} = $members_attributetypes; - -ok( C4::Members::AttributeTypes->fetch('ISBN'), "testing fetch feature" ); +ok( C4::Members::AttributeTypes->fetch('one'), "testing fetch feature" ); ok( !C4::Members::AttributeTypes->fetch('FAKE'), "testing fetch feature doesn't work if value not in database" ); -- 2.1.0